From 6780a46a66f5ad0e8f7dfb258051fce01bd17717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Sat, 23 Apr 2022 21:41:02 +0200
Subject: [PATCH] update priorities in translated files
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/documentation.de.po | 1364 +++++++++++++--------------
po/documentation.es.po | 1364 +++++++++++++--------------
po/documentation.es_MX.po | 1364 +++++++++++++--------------
po/documentation.fr.po | 1590 ++++++++++++++++++--------------
po/documentation.hu.po | 1364 +++++++++++++--------------
po/documentation.id.po | 1364 +++++++++++++--------------
po/documentation.is.po | 1364 +++++++++++++--------------
po/documentation.it.po | 1364 +++++++++++++--------------
po/documentation.ja.po | 1415 ++++++++++++++--------------
po/documentation.ko.po | 1364 +++++++++++++--------------
po/documentation.mr.po | 1364 +++++++++++++--------------
po/documentation.nb_NO.po | 1364 +++++++++++++--------------
po/documentation.nl.po | 1364 +++++++++++++--------------
po/documentation.pl.po | 1364 +++++++++++++--------------
po/documentation.pt_BR.po | 1498 ++++++++++++++++--------------
po/documentation.pt_PT.po | 1364 +++++++++++++--------------
po/documentation.ro.po | 1364 +++++++++++++--------------
po/documentation.ru.po | 1364 +++++++++++++--------------
po/documentation.sk.po | 1364 +++++++++++++--------------
po/documentation.tr.po | 1364 +++++++++++++--------------
po/documentation.uk.po | 1364 +++++++++++++--------------
po/documentation.zh_HANS-CN.po | 1364 +++++++++++++--------------
po/documentation.zh_HANT.po | 1364 +++++++++++++--------------
23 files changed, 16047 insertions(+), 15736 deletions(-)
diff --git a/po/documentation.de.po b/po/documentation.de.po
index 6fa913e..4faba44 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -6492,7 +6492,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NAME"
@@ -6504,7 +6504,7 @@ msgstr "git-add - F체gt Datei-Inhalte zum Index hinzu"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "횥BERSICHT"
@@ -6532,7 +6532,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "BESCHREIBUNG"
@@ -7246,7 +7246,7 @@ msgstr "횆ndern des Inhalts von Kontextzeilen oder entfernen von Zeilen"
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
@@ -7258,13 +7258,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Teil der linkgit:git[1] Suite"
@@ -19056,7 +19056,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -21099,19 +21099,19 @@ msgstr "git-config - Repositoryeigene oder globale Optionen auslesen und setzen"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr "git-diff-tree �� Vergleicht Inhalt und Modus von Blobs, die 체ber zwei Baumobjekte gefunden wurden"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -21120,25 +21120,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr "Den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen."
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, fuzzy, priority:100
+#, fuzzy, priority:80
#| msgid "SHA1 identifier of a git tag object."
msgid "The id of a tree object."
msgstr "SHA1 eines git-Markierungobjektes."
@@ -21151,109 +21151,109 @@ msgstr "<Pfad>..."
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21649,283 +21649,283 @@ msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcor
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr "--progress=<Anz>"
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr "--export-marks=<Datei>"
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr "--import-marks=<Datei>"
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21934,55 +21934,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21992,31 +21992,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -22026,261 +22026,261 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr "--import-marks-if-exists=<Datei>"
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "--exclude-from=<file>"
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr "--exclude-from=<Datei>"
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "--recurse-submodules[=<pathspec]"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--recurse-submodules[=<Pfadspezifikation]"
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr "--active-branches=<Anz>"
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr "--big-file-threshold=<Anz>"
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -22292,19 +22292,19 @@ msgstr "--depth=<Anz>"
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr "--export-pack-edges=<Datei>"
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -22316,435 +22316,435 @@ msgstr "--max-pack-size=<Anz>"
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, fuzzy, priority:100
+#, fuzzy, priority:90
#| msgid "linkgit:git-add[1]"
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-add[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr "TECHNISCHER HINTERGRUND"
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "DATE FORMATS"
msgid "INPUT FORMAT"
msgstr "DATUMSFORMATE"
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22761,241 +22761,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr "Jeder g체ltige Git SHA-1-Ausdruck, der zu einem Commit f체hrt. Siehe \"REVISIONEN SPEZIFIZIEREN\" in linkgit:gitrevisions[7] f체r weitere Details."
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -23003,259 +23003,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -23263,73 +23263,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -23341,55 +23341,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -23398,25 +23398,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -23424,19 +23424,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23446,43 +23446,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23490,31 +23490,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23524,25 +23524,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23552,19 +23552,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23572,31 +23572,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23604,67 +23604,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23672,286 +23672,286 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "--force"
msgid "force"
msgstr "--force"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "Notes"
msgid "notes"
msgstr "Notes"
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "COMMANDS"
msgid "RESPONSES TO COMMANDS"
msgstr "COMMANDS"
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23960,49 +23960,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -24022,7 +24022,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -24031,7 +24031,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -24042,13 +24042,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -24063,13 +24063,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -24078,19 +24078,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -24105,309 +24105,309 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "<newbranch>"
msgid "per branch"
msgstr "<newbranch>"
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "Interactive mode"
msgid "per active tree"
msgstr "Interaktiver Modus"
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -60277,1271 +60277,1271 @@ msgstr "Erzeugt ein Baumobjekt, welches das Unterverzeichnis `<Pr채fix>` darstel
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "gitglossary - A GIT Glossary"
msgid "gitglossary - A Git Glossary"
msgstr "gitglossary - Ein GIT-Glossar"
#. type: Plain text
#: en/gitglossary.txt:11
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "*\n"
msgid "*\n"
msgstr "*\n"
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], link:everyday.html[T채gliches git], link:user-manual.html[The Git User's Manual]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--branch <branch>"
msgid "[[def_branch]]branch"
msgstr "--branch <Branch>"
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--subdirectory-filter <directory>"
msgid "[[def_directory]]directory"
msgstr "--subdirectory-filter <Verzeichnis>"
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "glob"
msgstr "<Blob>"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "Includes"
msgid "exclude"
msgstr "Dateieinbettungen"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "List references in a remote repository."
msgid "[[def_remote]]remote repository"
msgstr "Referenzen in einem Remote-Repository auflisten."
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "List or delete (if used with -d) the remote-tracking branches."
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr "Auflisten oder L철schen (wenn die '-d' Option gleichzeitig verwendet wird) der Referenzen auf fernen Entwicklungszweige (remote-tracking branches)."
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 4176431..ff3ed10 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -6402,7 +6402,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NOMBRE"
@@ -6414,7 +6414,7 @@ msgstr "git add: a챰adir contenido de un archivo al 챠ndice"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "SINOPSIS"
@@ -6442,7 +6442,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "DESCRIPCI횙N"
@@ -7142,7 +7142,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7154,13 +7154,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18667,7 +18667,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20694,19 +20694,19 @@ msgstr "Configurar repositorio u opciones globales"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20715,25 +20715,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol"
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20745,109 +20745,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "recurse into sub-trees"
msgstr "recurrir en sub찼rboles"
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21205,283 +21205,283 @@ msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcor
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21490,55 +21490,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21548,31 +21548,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21582,259 +21582,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr "--import-marks-if-exists=<fichero>"
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr "--rewrite-submodules-from=<nombre>:<fichero>"
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nombre>:<fichero>"
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr "--active-branches=<n>"
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr "--big-file-threshold=<n>"
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21846,19 +21846,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21870,433 +21870,433 @@ msgstr "--max-pack-size=<n>"
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr "Ver linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr "COSTO DE DESARROLLO"
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr "DISCUSI횙N T횋CNICA"
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr "Formatos de fecha"
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "`rfc2822`"
msgstr "`rfc2822`"
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr "Este es el formato est찼ndar de correo electr처nico que se describe en RFC 2822."
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr "Comandos"
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22313,241 +22313,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr "Formato de datos externos"
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22555,259 +22555,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr "`100755` o` 755`: un fichero normal, pero ejecutable."
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22815,73 +22815,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22893,55 +22893,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22950,25 +22950,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22976,19 +22976,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22998,43 +22998,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23042,31 +23042,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23076,25 +23076,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23104,19 +23104,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23124,31 +23124,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23156,67 +23156,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23224,283 +23224,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr "forzar"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr "notas"
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "done"
msgstr "none"
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23509,49 +23509,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23571,7 +23571,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23580,7 +23580,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23591,13 +23591,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23612,13 +23612,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23627,19 +23627,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23654,307 +23654,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59547,1261 +59547,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, fuzzy, priority:100
+#, fuzzy, priority:310
msgid "Case insensitive match."
msgstr "b첬squeda insensible a may첬sculas"
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "glob"
msgstr "blob"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 4e30870..15c7e15 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -6399,7 +6399,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr ""
@@ -6411,7 +6411,7 @@ msgstr "git-add - Agrega el contenido de los archivos al 챠ndice"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "SINOPSIS"
@@ -6437,7 +6437,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "DESCRIPCI횙N"
@@ -7128,7 +7128,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7140,13 +7140,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18641,7 +18641,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20666,19 +20666,19 @@ msgstr "Configurar repositorio u opciones globales"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20687,25 +20687,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol"
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20717,109 +20717,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "recurse into sub-trees"
msgstr "recurrir en sub찼rboles"
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21176,283 +21176,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21461,55 +21461,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21519,31 +21519,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21553,259 +21553,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21817,19 +21817,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21841,433 +21841,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "Commands"
msgstr "comando"
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22284,241 +22284,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22526,259 +22526,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22786,73 +22786,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22864,55 +22864,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22921,25 +22921,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22947,19 +22947,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22969,43 +22969,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23013,31 +23013,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23047,25 +23047,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23075,19 +23075,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23095,31 +23095,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23127,67 +23127,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23195,283 +23195,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr "forzar"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr "listo"
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23480,49 +23480,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23542,7 +23542,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23551,7 +23551,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23562,13 +23562,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23583,13 +23583,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23598,19 +23598,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23625,307 +23625,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59487,1266 +59487,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr "Lista referencias en un repositorio remoto"
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr "actuar en ramas de traqueo remoto"
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index b0c9039..a95865c 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -3,7 +3,19 @@
# This file is distributed under the same license as the Git package.
# Jean-No챘l Avila <jn.avila@free.fr>, 2019.
msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-04-09 23:15+0200\nPO-Revision-Date: 2022-04-20 10:48+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.12-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2022-04-09 23:15+0200\n"
+"PO-Revision-Date: 2022-04-20 10:48+0000\n"
+"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language: fr\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: Weblate 4.12-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:763 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:129 en/git-status.txt:31
@@ -2760,7 +2772,14 @@ msgid ""
"\tpath = foo.inc\n"
"[remote \"origin\"]\n"
"\turl = https://example.com/git\n"
-msgstr "; inclure seulement si un fichier distant avec l'URL donn챕e existe (note\n; qu'une telle URL peut 챗tre fournie plus tard dans un fichier ou dans un fichier\n; ou dans un fichier lu apr챔s la lecture de ce fichier, comme dans cet exemple).\n[includeIf \"hasconfig:remote.*.url:https://example.com/**\"]\n\tpath = foo.inc\n[remote \"origin\"]\n\turl = https://example.com/git\n"
+msgstr ""
+"; inclure seulement si un fichier distant avec l'URL donn챕e existe (note\n"
+"; qu'une telle URL peut 챗tre fournie plus tard dans un fichier ou dans un fichier\n"
+"; ou dans un fichier lu apr챔s la lecture de ce fichier, comme dans cet exemple).\n"
+"[includeIf \"hasconfig:remote.*.url:https://example.com/**\"]\n"
+"\tpath = foo.inc\n"
+"[remote \"origin\"]\n"
+"\turl = https://example.com/git\n"
#. type: Title ~
#: en/config.txt:267
@@ -6498,7 +6517,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NOM"
@@ -6510,7 +6529,7 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
@@ -6532,7 +6551,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
@@ -7246,7 +7265,7 @@ msgstr "modification de contenu de contexte ou de lignes supprim챕es"
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
@@ -7258,13 +7277,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Fait partie de la suite linkgit:git[1]"
@@ -10212,7 +10231,23 @@ msgid ""
"'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
"'git branch' (-d | -D) [-r] <branchname>...\n"
"'git branch' --edit-description [<branchname>]\n"
-msgstr "'git branch' [--color[=<when>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<options>] | --no-column] [--sort=<key>]\n\t[--merged [<commit>]] [--no-merged) [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <objet>] [--format=<format>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<motif>...]\n'git branch' [--track [direct|inherit] | --no-track] [-f]\n\t[--recurse-submodules] <nom-de-branche> [<point-de-d챕part>]\n'git branch' (--set-upstream-to=<amont> | -u <amont>) [<nom-de-branche>]\n'git branch' --unset-upstream [<nom-de-branche>]\n'git branch' (-m | -M) [<anciennebranche>] <nouvellebranche>\n'git branch' (-c | -C) [<anciennebranche>] <nouvellebranche>\n'git branch' (-d | -D) [-r] <nom-de-branche>...\n'git branch' --edit-description [<nom-de-branche>]\n"
+msgstr ""
+"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
+"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
+"\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
+"\t[--merged [<commit>]] [--no-merged) [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
+"\t[--points-at <objet>] [--format=<format>]\n"
+"\t[(-r | --remotes) | (-a | --all)]\n"
+"\t[--list] [<motif>...]\n"
+"'git branch' [--track [direct|inherit] | --no-track] [-f]\n"
+"\t[--recurse-submodules] <nom-de-branche> [<point-de-d챕part>]\n"
+"'git branch' (--set-upstream-to=<amont> | -u <amont>) [<nom-de-branche>]\n"
+"'git branch' --unset-upstream [<nom-de-branche>]\n"
+"'git branch' (-m | -M) [<anciennebranche>] <nouvellebranche>\n"
+"'git branch' (-c | -C) [<anciennebranche>] <nouvellebranche>\n"
+"'git branch' (-d | -D) [-r] <nom-de-branche>...\n"
+"'git branch' --edit-description [<nom-de-branche>]\n"
#. type: Plain text
#: en/git-branch.txt:37
@@ -12688,7 +12723,13 @@ msgid ""
"\t\t [--ignore-skip-worktree-bits]\n"
"\t\t [-z] [--stdin]\n"
"\t\t [--] [<file>...]\n"
-msgstr "'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<cha챤ne>]\n\t\t [--stage=<nombre>|all]\n\t\t [--temp]\n\t\t [--ignore-skip-worktree-bits]\n\t\t [-z] [--stdin]\n\t\t [--] [<fichier>...]\n"
+msgstr ""
+"'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<cha챤ne>]\n"
+"\t\t [--stage=<nombre>|all]\n"
+"\t\t [--temp]\n"
+"\t\t [--ignore-skip-worktree-bits]\n"
+"\t\t [-z] [--stdin]\n"
+"\t\t [--] [<fichier>...]\n"
#. type: Plain text
#: en/git-checkout-index.txt:23
@@ -15007,7 +15048,16 @@ msgid ""
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
"\t [--filter=<filter> [--also-filter-submodules]] [--] <repository>\n"
"\t [<directory>]\n"
-msgstr "'git clone' [--template=<r챕pertoire-de-mod챔les>]\n\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t [-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <d챕p척t>]\n\t [--dissociate] [--separate-git-dir <r챕pertoire-git>]\n\t [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n\t [--recurse-submodules[=<sp챕c-de-chemin>]] [--[no-]shallow-submodules]\n\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t [--filter=<filtre> [--also-filter-submodules]] [--] <d챕p척t>\n\t [<r챕pertoire>]\n"
+msgstr ""
+"'git clone' [--template=<r챕pertoire-de-mod챔les>]\n"
+"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t [-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <d챕p척t>]\n"
+"\t [--dissociate] [--separate-git-dir <r챕pertoire-git>]\n"
+"\t [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n"
+"\t [--recurse-submodules[=<sp챕c-de-chemin>]] [--[no-]shallow-submodules]\n"
+"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
+"\t [--filter=<filtre> [--also-filter-submodules]] [--] <d챕p척t>\n"
+"\t [<r챕pertoire>]\n"
#. type: Plain text
#: en/git-clone.txt:30
@@ -19241,7 +19291,7 @@ msgstr "Vous pouvez sp챕cifier une liste de r챕pertoires autoris챕s. Si aucun r
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr "LIMITATIONS"
@@ -21326,19 +21376,19 @@ msgstr "Lire et 챕crire les options du d챕p척t et les options globales"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr "git-diff-tree - Compare le contenu et la mode des blobs trouv챕s via deux objets arbre"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -21350,25 +21400,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr "Comparer le contenu et le mode des blobs trouv챕s via deux objets arbre."
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr "S'il n'y a qu'un seul <arbre-esque>donn챕, le commit est compar챕 avec ses parents (voir --stdin ci-dessous)."
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr "Notez que 'git diff-tree' peut utiliser l'arbre encapsul챕 dans un objet commit."
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr "L'identifiant d'un objet arbre."
@@ -21380,109 +21430,109 @@ msgstr "<chemin>..."
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr "Si elle est fournie, les r챕sultats sont limit챕s 횪 un sous-ensemble de fichiers correspondant 횪 l'une des sp챕cifications de chemin fournies."
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr "parcourir r챕cursivement les sous-arbres"
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr "afficher l'entr챕e de l'arbre elle-m챗me ainsi que les sous-arbres. Implique -r."
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr "Quand `--root` est sp챕cifi챕, le commit initial sera montr챕 comme un gros 챕v챕nement de cr챕ation. Ceci est 챕quivalent 횪 une comparaison avec l'arbre NULL."
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr "Au lieu de comparer directement les <arbre-esque>s, utiliser la base de fusion entre les deux <arbre-esque>s comme le c척t챕 \"avant\". Il doit y avoir deux <tree-ish>s donn챕s et ils doivent tous deux 챗tre des commits."
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr "Lorsque `--stdin` est sp챕cifi챕, la commande ne prend pas d'arguments <arbre-esque> sur la ligne de commande. Au lieu de cela, elle lit les lignes contenant soit deux <arbre>, un <commit>, ou une liste de <commit> depuis son entr챕e standard. (Utilisez un espace simple comme s챕parateur)."
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr "Lorsque deux arbres sont donn챕s, comparer le premier arbre avec le second. Lorsqu'un seul commit est donn챕, il compare le commit avec ses parents. Les autres commits, lorsqu'ils sont donn챕s, sont utilis챕s comme s'ils 챕taient les parents du premier commit."
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr "Lors de la comparaison de deux arbres, l'ID des deux arbres (s챕par챕s par un espace et termin챕s par une nouvelle ligne) est affich챕 avant la diff챕rence. Lors de la comparaison de commits, l'ID du premier (ou du seul) commit, suivi d'une nouvelle ligne, est affich챕."
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr "Les drapeaux suivants affectent davantage le comportement lors de la comparaison des commits (mais pas des arbres)."
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr "Par d챕faut, 'git diff-tree --stdin' ne montre pas les diff챕rences pour les commits de fusion. Avec ce drapeau, il montre les diff챕rences de ce commit depuis tous ses parents. Voir aussi `-c`."
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr "Par d챕faut, 'git diff-tree --stdin' affiche les diff챕rences, soit sous forme lisible par la machine (sans `-p`), soit sous forme de rustine (avec `-p`). Cette sortie peut 챗tre supprim챕e. Elle n'est utile qu'avec l'option `-v`."
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr "Ce drapeau fait en sorte que 'git diff-tree --stdin' affiche 챕galement le message de validation avant les diff챕rences."
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr "'git diff-tree' produit une ligne avec l'ID de commit lorsque cela est applicable. Ce drapeau supprime la sortie de l'ID de commit."
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr "Ce drapeau change la fa챌on dont un commit de fusion est affich챕 (ce qui signifie qu'il n'est utile que lorsque la commande est donn챕e une <arbre-esque>, ou `--stdin`). Il montre les diff챕rences entre chacun des parents et le r챕sultat de la fusion simultan챕ment au lieu de montrer les diff챕rences par paire entre un parent et le r챕sultat un par un (ce que fait l'option `-m`). De plus, elle ne liste que les fichiers qui ont 챕t챕 modifi챕s depuis tous les parents."
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr "Ce drapeau change la fa챌on dont une rustine de commit de fusion est affich챕e, d'une mani챔re similaire 횪 l'option `-c`. Il implique les options `-c` et `-p` et compresse davantage la sortie de la rustine en omettant les sections inint챕ressantes dont le contenu dans les parents n'a que deux variantes et le r챕sultat de la fusion choisit l'une d'entre elles sans modification. Lorsque toutes les sections sont inint챕ressantes, le commit lui-m챗me et le message du journal de validation ne sont pas affich챕s, comme dans tout autre cas de \"diff vide\"."
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr "Cet indicateur fait en sorte que les diffs combin챕s (utilis챕s pour les commits de fusion) listent le nom du fichier de tous les parents. Il n'a donc d'effet que lorsque -c ou --cc sont sp챕cifi챕s, et n'est probablement utile que si des changements de nom de fichier sont d챕tect챕s (c.-횪-d. lorsque la d챕tection de renommage ou de copie a 챕t챕 demand챕e)."
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr "Afficher le commit lui-m챗me et le message du journal de commit m챗me si le diff lui-m챗me est vide."
@@ -21858,283 +21908,283 @@ msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcor
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr "git-fast-export - exportateur de donn챕es Git"
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr "'git fast-export [<options>]' | 'git fast-import'\n"
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr "Ce programme vide les r챕visions donn챕es dans une forme appropri챕e pour 챗tre introduite dans 'git fast-import'."
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr "Vous pouvez l'utiliser comme un remplacement de bundle lisible par l'homme (voir linkgit:git-bundle[1]), ou comme un format qui peut 챗tre 챕dit챕 avant d'챗tre envoy챕 횪 'git fast-import' afin de faire des r챕챕critures d'historique (une capacit챕 sur laquelle s'appuient des outils comme 'git filter-repo')."
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr "--progress=<n>"
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr "Ins챕rer des d챕clarations 'de progr챔s' tous les <n>objets, 횪 afficher par 'git fast-import' lors de l�셢mportation."
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr "Sp챕cifier comment traiter les 챕tiquettes sign챕es. Puisque toute transformation apr챔s l'exportation peut changer les noms des 챕tiquettes (ce qui peut 챕galement se produire lors de l'exclusion des r챕visions), les signatures ne correspondront pas."
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr "Lorsque vous demandez 횪 짬혻abandonner혻쨩 ('abort' ce qui est la valeur par d챕faut), ce programme mourra lorsqu'il rencontrera une 챕tiquette sign챕e. Avec 'strip', les 챕tiquettes seront silencieusement rendues non sign챕es, avec 'warn-strip' elles seront rendues non sign챕es mais un avertissement sera affich챕, avec 'verbatim', elles seront export챕es silencieusement et avec 'warn', elles seront export챕es, mais vous verrez un avertissement."
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr "--tag-of-filtered-object=(abort|drop|rewrite)"
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr "Sp챕cifier comment traiter les 챕tiquettes dont l'objet 챕tiquet챕 est filtr챕. Comme les r챕visions et les fichiers 횪 exporter peuvent 챗tre limit챕s par le chemin d'acc챔s, les objets 챕tiquet챕s peuvent 챗tre compl챔tement filtr챕s."
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr "Lorsqu'il est demand챕 횪 'abort' (ce qui est la valeur par d챕faut), ce programme mourra lorsqu'il rencontrera une telle 챕tiquette. Avec 'drop', il omettra ces 챕tiquettes de la sortie. Avec 'rewrite', si l'objet 챕tiquet챕 est un commit, il r챕챕crira l'챕tiquette pour 챕tiqueter un commit anc챗tre (via la r챕챕criture du parent ; voir linkgit:git-rev-list[1])."
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr "Effectuer une d챕tection de d챕placement et/ou de copie, comme d챕crit dans la page de manuel linkgit:git-diff[1], et l'utiliser pour g챕n챕rer des commandes de renommage et de copie dans le journal g챕n챕r챕."
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr "Notez que les versions pr챕c챕dentes de cette commande ne se plaignaient pas et produisaient des r챕sultats incorrects si vous donniez ces options."
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr "--export-marks=<fichier>"
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr "D챕charge la table interne des marques dans un <fichier>, une fois termin챕. Les marques sont 챕crites une par ligne comme `:markid SHA-1`. Seules les marques des r챕visions sont 챕crites ; les marques des blobs sont ignor챕es. Des moteurs peuvent utiliser ce fichier pour valider les importations apr챔s qu'elles aient 챕t챕 compl챕t챕es, ou pour sauvegarder la table des marques 횪 travers des ex챕cutions incr챕mentales. Comme <fichier> n'est ouvert et tronqu챕 qu'횪 la fin de l'op챕ration, le m챗me chemin peut aussi 챗tre donn챕 sans risque 횪 --import-marks. Le fichier ne sera pas 챕crit si aucun nouvel objet n'a 챕t챕 marqu챕/export챕."
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr "--import-marks=<fichier>"
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr "Avant de traiter toute entr챕e, charger les marques sp챕cifi챕es dans <fichier> ;. Le fichier d'entr챕e doit exister, doit 챗tre lisible, et doit utiliser le m챗me format que celui produit par --export-marks."
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr "En plus de nommer les blobs et les commits avec des identifiants de marque, vous pouvez aussi nommer les 챕tiquettes. Ceci est utile en conjonction avec `--export-marks` et `--import-marks`, et est 챕galement utile (et n챕cessaire) pour l'exportation de 챕tiquettes imbriqu챕es. Cela ne nuit pas aux autres cas et serait la valeur par d챕faut, mais beaucoup de frontends d'import rapide ne sont pas pr챕par챕s 횪 accepter les 챕tiquettes comprenant des identifiants de marque."
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr "Les commits (ou 챕tiquettes) qui ont d챕j횪 챕t챕 marqu챕s ne seront pas export챕s 횪 nouveau. Si le backend utilise un fichier --import-marks similaire, cela permet l'exportation incr챕mentale bidirectionnelle du d챕p척t en gardant les marques identiques entre les ex챕cutions."
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr "Certains anciens d챕p척ts ont des 챕tiquettes sans 챕tiqueteur. Le protocole d'importation rapide 챕tait assez strict 횪 ce sujet, et ne le permettait pas. Il faut donc simuler un 챕tiqueteur pour pouvoir importer rapidement la sortie."
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr "D챕marrer le flux avec une strophe 'feature done' et le terminer avec une commande 'done'."
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr "Ignorer la sortie des objets blob et faire plut척t r챕f챕rence aux blobs via leur hachage SHA-1 original. Ceci est utile pour r챕챕crire la structure du r챕pertoire ou l'historique d'un d챕p척t sans toucher au contenu des fichiers individuels. Notez que le flux r챕sultant ne peut 챗tre utilis챕 que par un d챕p척t qui contient d챕j횪 les objets n챕cessaires."
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr "Cette option fera en sorte que fast-export 챕mette une directive \"deleteall\" pour chaque commit suivi d'une liste compl챔te de tous les fichiers du commit (par opposition 횪 la liste des fichiers qui sont diff챕rents du premier parent du commit)."
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr "Anonymiser le contenu du d챕p척t tout en conservant la forme de l'historique et de l'arbre stock챕. Voir la section `ANONYMISATION` ci-dessous."
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr "--anonymize-map=<depuis>[:<vers>]"
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr "Convertir le jeton `<depuis>` en `<vers>` dans la sortie anonymis챕e. Si `<vers>` est omis, convertir `<depuis>` en lui-m챗me (c'est-횪-dire, ne pa l'anonymiser). Voir la section sur `ANONYMISATION` ci-dessous."
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr "Par d챕faut, l'ex챕cution d'une commande telle que `git fast-export master~5..master` n'inclura pas le commit master{tilde}5 et fera que master{tilde}4 n'aura plus master{tilde}5 comme parent (bien que l'ancien master{tilde}4 et le nouveau master{tilde}4 auront tous les m챗mes fichiers). Utilisez --reference-excluded-parents pour que le flux fasse plut척t r챕f챕rence aux commits dans la plage exclue de l'historique par leur sha1sum. Notez que le flux r챕sultant ne peut 챗tre utilis챕 que par un d챕p척t qui contient d챕j횪 les commits parents n챕cessaires."
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr "Ajouter une directive suppl챕mentaire 횪 la sortie pour les commits et les blobs, `original-oid <SHA1SUM>`. Bien que de telles directives seront probablement ignor챕es par les importateurs tels que git-fast-import, elles peuvent 챗tre utiles pour les filtres interm챕diaires (par exemple pour r챕챕crire les messages de commit qui font r챕f챕rence 횪 des commits plus anciens, ou pour d챕pouiller les blobs par id)."
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr "--reencode=(yes|no|abort)"
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr "Sp챕cifier comment g챕rer l'en-t챗te `encoding` dans les objets commit. En demandant 'abort' (짬 abandonner 쨩 qui est la valeur par d챕faut), ce programme mourra lorsqu'il rencontrera un tel objet commit. Avec 'yes', le message de livraison sera r챕-encod챕 en UTF-8. Avec 'no', l'encodage original sera pr챕serv챕."
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr "Appliquer la refspec sp챕cifi챕e 횪 chaque ref export챕e. Plusieurs d'entre elles peuvent 챗tre sp챕cifi챕es."
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr "[<git-rev-list-args>...]"
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr "Une liste d'arguments, acceptable pour 'git rev-parse' et 'git rev-list', qui sp챕cifie les objets et r챕f챕rences sp챕cifiques 횪 exporter. Par exemple, `master~10..master` provoque l'exportation de la r챕f챕rence master actuelle avec tous les objets ajout챕s depuis le commit de son 10챔me anc챗tre et (횪 moins que l'option --reference-excluded-parents soit sp챕cifi챕e) tous les fichiers communs 횪 master{tilde}9 et master{tilde}10."
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr "$ git fast-export --all | (cd /d챕p척t/vide && git fast-import)\n"
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr "Cela exportera le d챕p척t entier et l'importera dans le d챕p척t vide existant. A l'exception du r챕encodage des commits qui ne sont pas en UTF-8, ce sera un miroir un 횪 un."
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -22146,55 +22196,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr "Cela cr챕e une nouvelle branche appel챕e 'autre' 횪 partir de 'master~5..master' (c'est-횪-dire que si 'master' a un historique lin챕aire, elle prendra les 5 derniers commits)."
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr "Notez que cela suppose qu'aucun des blobs et des messages de validation r챕f챕renc챕s par cette plage de r챕vision ne contient la cha챤ne 'refs/heads/master'."
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr "ANONYMISATION"
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr "Si l'option `--anonymize` est donn챕e, git tentera de supprimer toutes les informations d'identification du d챕p척t tout en conservant suffisamment de l'arbre original et des mod챔les d'historique pour reproduire certains bugs. Le but est qu'un bug git trouv챕 sur un d챕p척t priv챕 persiste dans le d챕p척t anonymis챕, et que ce dernier puisse 챗tre partag챕 avec les d챕veloppeurs git pour aider 횪 r챕soudre le bug."
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr "Avec cette option, git remplacera tous les noms de r챕f챕rence, les chemins, le contenu des blobs, les messages de commit et d'챕tiquette, les noms et les adresses email dans la sortie avec des donn챕es anonymes. Deux instances de la m챗me cha챤ne seront remplac챕es de mani챔re 챕quivalente (par exemple, deux commits avec le m챗me auteur auront le m챗me auteur anonymis챕 dans la sortie, mais ne pr챕senteront aucune ressemblance avec la cha챤ne auteur originale). La relation entre les commits, les branches et les tags est conserv챕e, ainsi que l'horodatage des commits (mais les messages de commit et les refnames ne ressemblent pas aux originaux). La composition relative de l'arbre est conserv챕e (par exemple, si vous avez un arbre racine avec 10 fichiers et 3 arbres, la sortie le sera aussi), mais leurs noms et le contenu des fichiers seront remplac챕s."
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr "Si vous pensez avoir trouv챕 un bogue git, vous pouvez commencer par exporter un flux anonymis챕 de l'ensemble du d챕p척t :"
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr "$ git fast-export --anonymize --all >flux-anon\n"
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr "Ensuite, confirmez que le bogue persiste dans un d챕p척t cr챕챕 횪 partir de ce flux (de nombreux bogues ne le feront pas, car ils d챕pendent vraiment du contenu exact du d챕p척t) :"
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -22208,31 +22258,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr "Si le d챕p척t anonyme montre le bogue, il peut 챗tre int챕ressant de partager le `flux-anon` avec un rapport de bogue normal. Notez que le flux anonymis챕 se compresse tr챔s bien, donc le gzippage est encourag챕. Si vous voulez examiner le flux pour v챕rifier qu'il ne contient pas de donn챕es priv챕es, vous pouvez l'examiner directement avant de l'envoyer. Vous pouvez 챕galement essayer :"
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr "$ perl -pe 's/\\d+/X/g' <flux-anon | sort -u | less\n"
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr "qui montre toutes les lignes uniques (avec des nombres convertis en 짬혻X혻쨩, pour r챕duire 짬혻Utilisateur 0혻쨩, 짬혻Utilisateur 1혻쨩, etc. en 짬혻Utilisateur X혻쨩). Cela produit une sortie beaucoup plus petite, et il est g챕n챕ralement facile de confirmer rapidement qu�셢l n�셺 a pas de donn챕es priv챕es dans le flux."
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr "La reproduction de certains bogues peut n챕cessiter la r챕f챕rence 횪 des commits ou des chemins particuliers, ce qui devient difficile apr챔s que les refnames et les chemins ont 챕t챕 rendus anonymes. Vous pouvez demander 횪 ce qu'un jeton particulier soit laiss챕 tel quel ou transform챕 en une nouvelle valeur. Par exemple, si vous avez un bogue qui se reproduit avec `git rev-list sensitive -- secret.c`, vous pouvez ex챕cuter :"
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -22246,259 +22296,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr "Apr챔s avoir import챕 le flux, vous pouvez ensuite ex챕cuter 'git rev-list foo -- bar.c' dans le d챕p척t anonymis챕."
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr "Notez que les chemins et les refnames sont s챕par챕s en jetons aux fronti챔res des barres obliques. La commande ci-dessus rendrait anonyme `sousr챕p/secret.c` comme quelque chose comme `chemin123/bar.c` ; vous pourriez alors rechercher `bar.c` dans le d챕p척t anonymis챕 pour d챕terminer le nom de chemin final."
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr "Pour simplifier le r챕f챕rencement du chemin final, vous pouvez mettre en correspondance chaque composant du chemin ; ainsi, si vous anonymisez 챕galement `sousr챕p` en `r챕ppublic`, alors le chemin final sera `r챕ppublic/bar.c`."
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr "Puisque 'git fast-import' ne peut pas 챕tiqueter les arbres, vous ne pourrez pas exporter compl챔tement le d챕p척t linux.git, car il contient une 챕tiquette r챕f챕ren챌ant un arbre au lieu d'un commit."
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr "git-fast-import - moteur pour les importateurs de donn챕es Git rapides"
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr "frontal | 'git fast-import' [<options>]\n"
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr "Ce programme n'est g챕n챕ralement pas ce que l'utilisateur final veut ex챕cuter directement. La plupart des utilisateurs finaux veulent utiliser l'un des programmes frontaux existants, qui analyse un type sp챕cifique de source 챕trang챔re et alimente le contenu stock챕 dans 'git fast-import'."
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr "fast-import lit un flux mixte de commandes/donn챕es depuis l'entr챕e standard et 챕crit un ou plusieurs fichers paquets directement dans le d챕p척t actuel. Lorsque EOF est re챌u sur l'entr챕e standard, fast-import 챕crit les refs de branches et d'챕tiquettes mis 횪 jour, mettant ainsi 횪 jour le d챕p척t actuel avec les donn챕es nouvellement import챕es."
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr "Le backend fast-import lui-m챗me peut importer dans un d챕p척t vide (un d챕p척t qui a d챕j횪 챕t챕 initialis챕 par 'git init') ou mettre 횪 jour de mani챔re incr챕mentielle un d챕p척t existant peupl챕. Le fait que les importations incr챕mentales soient support챕es ou non 횪 partir d'une source 챕trang챔re particuli챔re d챕pend du programme frontal utilis챕."
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr "Forcer la mise 횪 jour des branches existantes modifi챕es, m챗me si cela entra챤ne la perte de commits (car le nouveau commit ne contient pas l'ancien)."
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr "D챕sactiver la sortie affich챕e par --stats, rendant fast-import habituellement silencieux quand il est r챕ussi. Cependant, si le flux d'importation a des directives destin챕es 횪 montrer la sortie utilisateur (par exemple les directives `progress`), les messages correspondants seront toujours affich챕s."
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr "Afficher quelques statistiques de base sur les objets que fast-import a cr챕챕s, les fichiers paquets dans lesquels ils ont 챕t챕 stock챕s, et la m챕moire utilis챕e par fast-import pendant cette ex챕cution. L'affichage de cette sortie est actuellement la valeur par d챕faut, mais peut 챗tre d챕sactiv챕 avec --quiet."
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr "De nombreuses options de ligne de commande peuvent 챗tre fournies dans le flux de fast-import lui-m챗me en utilisant les commandes `feature` ou `option`. Cependant, certaines de ces options ne sont pas s청res (par exemple, permettre 횪 fast-import d'acc챕der au syst챔me de fichiers en dehors du d챕p척t). Ces options sont d챕sactiv챕es par d챕faut, mais peuvent 챗tre autoris챕es en fournissant cette option sur la ligne de commande. Ceci n'affecte actuellement que les commandes `export-marks`, `import-marks`, et `import-marks-if-exists`."
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr "N'activez cette option que si vous faites confiance au programme qui g챕n챔re le flux d'importation rapide ! Cette option est activ챕e automatiquement pour les assistants 횪 distance qui utilisent la capacit챕 `import`, car ils sont d챕j횪 autoris챕s 횪 ex챕cuter leur propre code."
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr "Options pour les frontaux"
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr "--cat-blob-fd=<df>"
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr "횋crire les r챕ponses aux requ챗tes `get-mark`, `cat-blob`, et `ls` dans le descripteur de fichier <df> au lieu de `stdout`. Permet 횪 la sortie `progress` destin챕e 횪 l'utilisateur final d'챗tre s챕par챕e des autres sorties."
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr "--date-format=<fmt>"
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr "Sp챕cifier le type de dates que le fronal fournira 횪 l'importation rapide dans les commandes `author`, `committer` et `tagger`. Voir 짬혻Formats혻쨩 de date\" ci-dessous pour plus de d챕tails sur les formats pris en charge et leur syntaxe."
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr "Terminer avec une erreur s'il n'y a pas de commande `done` 횪 la fin du flux. Cette option peut 챗tre utile pour d챕tecter les erreurs qui font que le frontal se termine avant d'avoir commenc챕 횪 챕crire un flux."
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr "Emplacement des fichiers de marques"
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr "D챕charger la table interne des marques dans un fichier, une fois termin챕. Les marques sont 챕crites une par ligne comme `:markid SHA-1`. Les frontaux peuvent utiliser ce fichier pour valider les importations apr챔s qu'elles aient 챕t챕 compl챕t챕es, ou pour sauvegarder la table des marques 횪 travers des ex챕cutions incr챕mentales. Comme <fichier> n'est ouvert et tronqu챕 qu'au point de contr척le (ou 횪 la fin de l'op챕ration), le m챗me chemin peut aussi 챗tre donn챕 sans risque 횪 --import-marks."
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr "Avant de traiter toute entr챕e, charger les marques sp챕cifi챕es dans <fichier> Le fichier d'entr챕e doit exister, doit 챗tre lisible, et doit utiliser le m챗me format que celui produit par --export-marks. Plusieurs options peuvent 챗tre fournies pour importer plus d'un ensemble de marques. Si une marque est d챕finie 횪 des valeurs diff챕rentes, le dernier fichier l'emporte."
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr "--import-marks-if-exists=<fichier>"
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr "Comme --import-marks mais au lieu de faire une erreur, ignore silencieusement le fichier s�셢l n�셞xiste pas."
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr "Apr챔s avoir sp챕cifi챕 --relative-marks, les chemins sp챕cifi챕s avec --import-marks= et --export-marks= sont relatifs 횪 un r챕pertoire interne du d챕p척t actuel. Dans git-fast-import, cela signifie que les chemins sont relatifs au r챕pertoire .git/info/fast-import. Cependant, d'autres importateurs peuvent utiliser un emplacement diff챕rent."
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr "Les marques relatives et non relatives peuvent 챗tre combin챕es en entrem챗lant --(no-)-relative-marks avec les options --(import|export)-marks=."
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr "R챕챕criture de sous-module"
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr "--rewrite-submodules-from=<nom>:<fichier>"
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nom>:<fichier>"
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr "R챕챕crire les identifiants d'objets pour le sous-module sp챕cifi챕 par <nom> 횪 partir des valeurs utilis챕es dans le fichier source (from) <fichier> vers celles utilis챕es dans le fichier cible (to) <fichier>. Les marques from devraient avoir 챕t챕 cr챕챕es par `git fast-export`, et les marques cibles devraient avoir 챕t챕 cr챕챕es par `git fast-import` lors de l'importation de ce m챗me sous-module."
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr "<nom> peut 챗tre toute cha챤ne arbitraire ne contenant pas de caract챔re deux-points, mais la m챗me valeur doit 챗tre utilis챕e avec les deux options lors de la sp챕cification des marques correspondantes. Plusieurs sous-modules peuvent 챗tre sp챕cifi챕s avec des valeurs diff챕rentes pour <nom>. C'est une erreur de ne pas utiliser ces options dans les paires correspondantes."
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr "Ces options sont principalement utiles lors de la conversion d'un d챕p척t d'un algorithme de hachage 횪 un autre ; sans elles, fast-import 챕chouera s'il rencontre un sous-module car il n'a aucun moyen d'챕crire l'ID de l'objet dans le nouvel algorithme de hachage."
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr "R챕glage des performances et de la compression"
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr "--active-branches=<n>"
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr "Nombre maximal de branches 횪 maintenir actives en m챗me temps. Voir \"Utilisation de la m챕moire'' ci-dessous pour plus de d챕tails. La valeur par d챕faut est 5."
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr "--big-file-threshold=<n>"
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr "Taille maximale d'un blob pour lequel fast-import tentera de cr챕er un delta, exprim챕e en octets. La valeur par d챕faut est 512m (512 MiO). Certains importateurs peuvent souhaiter r챕duire cette valeur sur les syst챔mes dont la m챕moire est limit챕e."
@@ -22510,19 +22560,19 @@ msgstr "--depth=<n>"
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr "Profondeur delta maximale, pour la deltification des blobs et des arbres. La valeur par d챕faut est 50."
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr "--export-pack-edges=<fichier>"
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr "Apr챔s la cr챕ation d'un fichier paquet, ajouter une ligne de donn챕es dans <fichier> listant le nom de fichier du fichier paquet et le dernier commit sur chaque branche qui a 챕t챕 챕crit dans ce fichier paquet. Ces informations peuvent 챗tre utiles apr챔s l'importation de projets dont le jeu d'objets total d챕passe la limite de 4 GiO du fichier de paquet, car ces commits peuvent 챗tre utilis챕s comme points de bord pendant les appels 횪 'git pack-objects'."
@@ -22534,433 +22584,433 @@ msgstr "--max-pack-size=<n>"
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr "Taille maximale de chaque fichier paquet de sortie. La valeur par d챕faut est illimit챕e."
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr "Voir linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr "PERFORMANCE"
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr "La conception de fast-import lui permet d�셢mporter de grands projets dans un minimum d�셵tilisation de la m챕moire et de temps de traitement. En supposant que le frontal est capable de suivre fast-import et de lui fournir un flux constant de donn챕es, les importations pour les projets contenant plus de 10 ans d�셡istoire et contenant plus de 100 000 commits individuels sont g챕n챕ralement r챕alis챕es en seulement 1 횪 2 heures sur du mat챕riel assez modeste (~ 2 000 USD)."
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr "La plupart des goulets d'챕tranglement semblent se situer au niveau de l'acc챔s aux donn챕es de la source 챕trang챔re (la source ne peut tout simplement pas extraire les r챕visions assez rapidement) ou de l'E/S du disque (l'importation rapide 챕crit aussi vite que le disque peut prendre les donn챕es). Les importations s'ex챕cuteront plus rapidement si les donn챕es sources sont stock챕es sur un lecteur diff챕rent de celui du d챕p척t Git de destination (en raison d'une moindre contention des entr챕es/sorties)."
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr "CO횤T DE D횋VELOPPEMENT"
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr "Un frontal typique pour l'importation rapide a tendance 횪 peser environ 200 lignes de code Perl/Python/Ruby. La plupart des d챕veloppeurs ont pu cr챕er des importateurs fonctionnels en quelques heures seulement, m챗me s'il s'agit de leur premi챔re exposition 횪 l'importation rapide, et parfois m챗me 횪 Git. C'est une situation id챕ale, 챕tant donn챕 que la plupart des outils de conversion sont jetables (횪 utiliser une fois, et ne jamais regarder en arri챔re)."
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr "FONCTIONNEMENT EN PARALL횊LE"
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr "Comme pour 'git push' ou 'git fetch', les importations g챕r챕es par fast-import peuvent 챗tre ex챕cut챕es en toute s챕curit챕 parall챔lement 횪 des invocations parall챔les de `git repack -a -d` ou `git gc`, ou 횪 toute autre op챕ration Git (y compris 'git prune' , car les objets libres ne sont jamais utilis챕s par fast-import)."
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr "fast-import ne verrouille pas les refs de branches ou d'챕tiquettes qu'il est en train d'importer. Apr챔s l'importation, pendant sa phase de mise 횪 jour des r챕f챕rences, fast-import teste chaque r챕f챕rence de branche existante pour v챕rifier que la mise 횪 jour sera une mise 횪 jour en avance rapide (le commit stock챕 dans la r챕f챕rence est contenu dans le nouvel historique du commit 횪 챕crire). Si la mise 횪 jour n'est pas une mise 횪 jour en avance rapide, fast-import ne mettra pas 횪 jour cette r챕f챕rence et affichera un message d'avertissement. fast-import essaiera toujours de mettre 횪 jour toutes les r챕f챕rences de branche, et ne s'arr챗tera pas au premier 챕chec."
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr "Les mises 횪 jour de branche peuvent 챗tre forc챕es avec --force, mais il est recommand챕 de ne l'utiliser que sur un d챕p척t autrement calme. L'utilisation de --force n'est pas n챕cessaire pour une importation initiale dans un d챕p척t vide."
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr "DISCUSSION TECHNIQUE"
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr "fast-import suit un ensemble de branches en m챕moire. Chaque branche peut 챗tre cr챕챕e ou modifi챕e 횪 tout moment pendant le processus d'importation en envoyant une commande `commit` sur le flux d'entr챕e. Cette conception permet 횪 un programme frontal de traiter un nombre illimit챕 de branches simultan챕ment, en g챕n챕rant des commits dans l'ordre o첫 ils sont disponibles dans les donn챕es sources. Elle simplifie aussi consid챕rablement les programmes frontaux."
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr "fast-import n'utilise pas et ne modifie pas le r챕pertoire de travail actuel, ni aucun fichier qui s'y trouve. (Il met cependant 횪 jour le d챕p척t Git actuel, comme r챕f챕renc챕 par `GIT_DIR`). Par cons챕quent, un frontal d'importation peut utiliser le r챕pertoire de travail pour ses propres besoins, comme l'extraction des r챕visions de fichiers de la source 챕trang챔re. Cette ignorance du r챕pertoire de travail permet 챕galement 횪 fast-import de s'ex챕cuter tr챔s rapidement, car il n'a pas besoin d'effectuer de co청teuses op챕rations de mise 횪 jour de fichiers lorsqu'il passe d'une branche 횪 l'autre."
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr "FORMAT D'ENTR횋E"
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr "� l'exception des donn챕es de fichiers brutes (que Git n'interpr챔te pas), le format d'entr챕e de l'importation rapide est bas챕 sur le texte (ASCII). Ce format texte simplifie le d챕veloppement et le d챕bogage des programmes frontaux, en particulier lorsqu'un langage de plus haut niveau tel que Perl, Python ou Ruby est utilis챕."
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr "fast-import est tr챔s strict sur ses entr챕es. Lorsque nous disons SP ci-dessous, nous voulons dire *exactement* un espace. De m챗me, LF signifie un (et un seul) saut de ligne et HT une (et une seule) tabulation horizontale. Fournir des caract챔res d'espacement suppl챕mentaires provoquera des r챕sultats inattendus, tels que des noms de branches ou des noms de fichiers avec des espaces en t챗te ou en queue de liste dans leur nom, ou la fin pr챕matur챕e de fast-import lorsqu'il rencontre une entr챕e inattendue."
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr "Commentaires dans le flux"
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr "Pour aider 횪 d챕boguer les frontaux, fast-import ignore toute ligne commen챌ant par `#` (ASCII di챔se/hash) jusqu'횪 et y compris la ligne se terminant par `LF`. Une ligne de commentaire peut contenir n'importe quelle s챕quence d'octets qui ne contient pas de LF et peut donc 챗tre utilis챕e pour inclure toute information de d챕bogage d챕taill챕e qui pourrait 챗tre sp챕cifique au frontal et utile lors de l'inspection d'un flux de donn챕es d'importation rapide."
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr "Formats de date"
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr "Les formats de date suivants sont support챕s. Un frontal doit s챕lectionner le format qu'il utilisera pour cette importation en passant le nom du format dans l'option de ligne de commande --date-format=<fmt>."
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr "Il s'agit du format natif de Git et correspond 횪 `<temps> ; SP <d챕calage utc>`. C'est 챕galement le format par d챕faut de fast-import, si --date-format n'a pas 챕t챕 sp챕cifi챕."
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr "L'heure de l'챕v챕nement est sp챕cifi챕e par `<temps>` comme le nombre de secondes depuis l'챕poque UNIX (minuit, 1er janvier 1970, UTC) et est 챕crite comme un entier d챕cimal ASCII."
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr "Le d챕calage local est sp챕cifi챕 par `<d챕calage utc>` comme un d챕calage positif ou n챕gatif par rapport 횪 UTC. Par exemple, EST (qui est 5 heures derri챔re UTC) sera exprim챕 en `<tz>` par `-0500'' alors que UTC est ``+0000''. Le d챕calage local n'affecte pas `<temps>` il n'est utilis챕 que comme une indication pour aider les routines de formatage 횪 afficher l'horodatage."
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr "Si le d챕calage local n'est pas disponible dans le mat챕riel source, utiliser ``+0000'', ou le d챕calage local le plus courant. Par exemple, de nombreuses organisations ont un d챕p척t CVS qui n'a jamais 챕t챕 consult챕 que par des utilisateurs situ챕s au m챗me endroit et dans le m챗me fuseau horaire. Dans ce cas, on peut inf챕rer un d챕calage raisonnable par rapport 횪 UTC."
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr "Contrairement au format `rfc2822`, ce format est tr챔s strict. Toute variation dans le formatage entra챤nera le rejet de la valeur par fast-import, et certains contr척les d'int챕grit챕 des valeurs num챕riques peuvent 챕galement 챗tre effectu챕s."
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr "C'est la m챗me chose que `raw`, sauf qu'aucun contr척le d'authenticit챕 sur l'챕poque num챕rique et le d챕calage local n'est effectu챕. Cela peut 챗tre utile lorsque vous essayez de filtrer ou d'importer un historique existant avec, par exemple, des valeurs de fuseau horaire erron챕es."
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr "`rfc2822`"
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr "C'est le standard de format des courriels tel que d챕crit par la RFC 2822."
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr "Un exemple de valeur est ``Tue Feb 6 11:22:18 2007 -0500''. L'analyseur syntaxique de Git est pr챕cis, mais un peu trop indulgent. Il s'agit du m챗me analyseur que celui utilis챕 par 'git am' lors de l'application de rustines re챌ues par courrier 챕lectronique."
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr "Certaines cha챤nes malform챕es peuvent 챗tre accept챕es comme des dates valides. Dans certains de ces cas, Git sera toujours capable d'obtenir la date correcte 횪 partir de la cha챤ne malform챕e. Il existe 챕galement certains types de cha챤nes malform챕es que Git analysera de mani챔re erron챕e, tout en les consid챕rant comme valides. Les cha챤nes lourdement malform챕es seront rejet챕es."
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr "Contrairement au format `raw` ci-dessus, les informations relatives au fuseau horaire et au d챕calage UTC contenues dans une cha챤ne de date RFC 2822 sont utilis챕es pour ajuster la valeur de la date 횪 l'UTC avant le stockage. Il est donc important que ces informations soient aussi pr챕cises que possible."
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr "Si le mat챕riel source utilise des dates de type RFC 2822, le frontal devrait laisser fast-import g챕rer l'analyse et la conversion (plut척t que d'essayer de le faire lui-m챗me) car l'analyseur de Git a 챕t챕 bien test챕 sur le terrain."
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr "Les frontends devraient pr챕f챕rer le format `raw` si le mat챕riel source utilise d챕j횪 le format UNIX-epoch, si on peut l'amener 횪 donner les dates dans ce format, ou si son format est facilement convertible en ce format, car il n'y a pas d'ambigu챦t챕 dans l'analyse."
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr "Utiliser toujours l'heure et le fuseau horaire actuels. Le litt챕ral `now` doit toujours 챗tre fourni pour `<quand>`."
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr "Il s'agit d'un format jouet. L'heure et le fuseau horaire actuels de ce syst챔me sont toujours copi챕s dans la cha챤ne d'identit챕 au moment o첫 elle est cr챕챕e par fast-import. Il n'y a aucun moyen de sp챕cifier une heure ou un fuseau horaire diff챕rent."
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr "Ce format particulier est fourni car il est court 횪 mettre en 흹uvre et peut 챗tre utile 횪 un processus qui veut cr챕er un nouveau commit tout de suite, sans avoir besoin d'utiliser un r챕pertoire de travail ou 'git update-index'."
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr "Si des commandes `author` et `committer` distinctes sont utilis챕es dans un `commit`, les horodatages peuvent ne pas correspondre, car l'horloge du syst챔me sera interrog챕e deux fois (une fois pour chaque commande). La seule fa챌on de s'assurer que les informations d'identit챕 de l'auteur et du validateur ont le m챗me horodatage est d'omettre `author` (en copiant donc 횪 partir de `committer`) ou d'utiliser un format de date autre que `now`."
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr "Commandes"
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr "fast-import accepte plusieurs commandes pour mettre 횪 jour le d챕p척t actuel et contr척ler le processus d'importation en cours. Une discussion plus d챕taill챕e (avec des exemples) de chaque commande suit plus bas."
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr "Cr챕e une nouvelle branche ou met 횪 jour une branche existante en cr챕ant un nouveau commit et en mettant 횪 jour la branche pour qu'elle pointe sur le commit nouvellement cr챕챕."
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr "Cr챕e un objet 챕tiquette annot챕 횪 partir d'un commit ou d'une branche existante. Les 챕tiquettes l챕g챔res ne sont pas prises en charge par cette commande, car elles ne sont pas recommand챕es pour enregistrer des points significatifs dans le temps."
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr "R챕initialise une branche existante (ou une nouvelle branche) 횪 une r챕vision sp챕cifique. Cette commande doit 챗tre utilis챕e pour changer une branche 횪 une r챕vision sp챕cifique sans faire un commit sur celle-ci."
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr "Convertit les donn챕es brutes du fichier en un blob, pour une utilisation future dans une commande `commit`. Cette commande est facultative et n'est pas n챕cessaire pour effectuer une importation."
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr "Enregistrer qu'une marque se r챕f챔re 횪 un objet donn챕 sans cr챕er d'abord un nouvel objet. Utiliser --import-marks et se r챕f챕rer 횪 des marques manquantes fera 챕chouer l'importation rapide, donc les alias peuvent fournir un moyen de d챕finir des commits autrement 챕lagu챕s 횪 une valeur valide (par exemple, l'anc챗tre non 챕lagu챕 le plus proche)."
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr "Force fast-import 횪 fermer le fichier paquet actuel, 횪 g챕n챕rer sa somme de contr척le SHA-1 unique et son index, et 횪 d챕marrer un nouveau fichier paquet. Cette commande est facultative et n'est pas n챕cessaire pour effectuer une importation."
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr "Permet 횪 fast-import de renvoyer la ligne enti챔re vers sa propre sortie standard. Cette commande est facultative et n'est pas n챕cessaire pour effectuer une importation."
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr "Marque la fin du flux. Cette commande est facultative, sauf si la fonctionnalit챕 `done` a 챕t챕 demand챕e 횪 l'aide de l'option de ligne de commande `--done` ou de la commande `feature done`."
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr "Demande 횪 fast-import d'imprimer le SHA-1 correspondant 횪 une marque sur le descripteur de fichier d챕fini avec `--cat-blob-fd`, ou `stdout` si non sp챕cifi챕."
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr "Demande 횪 fast-import d'imprimer un blob au format 'cat-file --batch' sur le descripteur de fichier d챕fini avec `--cat-blob-fd` ou `stdout` si non sp챕cifi챕."
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr "Demande 횪 fast-import d'afficher une ligne d챕crivant une entr챕e de r챕pertoire au format 'ls-tree' sur le descripteur de fichier d챕fini avec `--cat-blob-fd`, ou `stdout` si non sp챕cifi챕."
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr "Active la fonctionnalit챕 sp챕cifi챕e. Pour cela, il faut que l'importation rapide prenne en charge la fonction sp챕cifi챕e, sinon elle s'arr챗te."
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr "Sp챕cifier n'importe laquelle des options list챕es sous OPTIONS qui ne modifient pas la s챕mantique du flux pour r챕pondre aux besoins du frontend's. Cette commande est facultative et n'est pas n챕cessaire pour effectuer une importation."
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr "Cr챕er ou mettre 횪 jour une branche avec un nouveau commit, en enregistrant une modification logique au projet."
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22973,579 +23023,594 @@ msgid ""
"\t('merge' SP <commit-ish> LF)*\n"
"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
"\tLF?\n"
-msgstr "\t'commit' SP <ref> LF\n\tmark?\n\toriginal-oid?\n\t('author' (SP <nom>)? SP LT <email> GT SP <quand> LF)?\n\t'committer' (SP <nom>)? SP LT <email> GT SP <quand> LF\n\t('encoding' SP <encodage>)?\n\tdata\n\t('from' SP <commit-esque> LF)?\n\t('merge' SP <commit-esque> LF)*\n\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n\tLF?\n"
+msgstr ""
+"\t'commit' SP <ref> LF\n"
+"\tmark?\n"
+"\toriginal-oid?\n"
+"\t('author' (SP <nom>)? SP LT <email> GT SP <quand> LF)?\n"
+"\t'committer' (SP <nom>)? SP LT <email> GT SP <quand> LF\n"
+"\t('encoding' SP <encodage>)?\n"
+"\tdata\n"
+"\t('from' SP <commit-esque> LF)?\n"
+"\t('merge' SP <commit-esque> LF)*\n"
+"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
+"\tLF?\n"
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr "o첫 `<ref>` est le nom de la branche sur laquelle le commit doit 챗tre effectu챕. Typiquement, les noms de branches sont pr챕fix챕s par `refs/heads/` dans Git, donc importer le symbole de branche CVS `RELENG-1_0` utilisera `refs/heads/RELENG-1_0` pour la valeur de `<ref>`. La valeur de `<ref>` doit 챗tre un nom de r챕f챕rence valide dans Git. Comme `LF` n'est pas valide dans un nom de r챕f챕rence Git, aucune syntaxe de citation ou d'챕chappement n'est support챕e ici."
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr "Une commande `mark` peut optionnellement appara챤tre, demandant 횪 fast-import de sauvegarder une r챕f챕rence au commit nouvellement cr챕챕 pour une utilisation future par le frontend (voir ci-dessous pour le format). Il est tr챔s courant pour les frontends de marquer chaque commit qu'ils cr챕ent, permettant ainsi la cr챕ation de branches futures 횪 partir de n'importe quel commit import챕."
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr "La commande `data` qui suit `committer` doit fournir le message de validation (voir ci-dessous la syntaxe de la commande `data`). Pour importer un message de validation vide, utilisez des donn챕es de longueur 0. Les messages de validation sont de forme libre et ne sont pas interpr챕t챕s par Git. Actuellement, ils doivent 챗tre encod챕s en UTF-8, car fast-import ne permet pas de sp챕cifier d'autres encodages."
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr "Une ou plusieurs commandes `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` et `notemodify` peuvent 챗tre incluses pour mettre 횪 jour le contenu de la branche avant de cr챕er le commit. Ces commandes peuvent 챗tre fournies dans n'importe quel ordre. Cependant, il est recommand챕 que la commande `filedeleteall` pr챕c챔de toutes les commandes `filemodify`, `filecopy`, `filerename` et `notemodify` dans le m챗me commit, car `filedeleteall` efface la branche (voir ci-dessous)."
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr "Le `LF` apr챔s la commande est facultatif (il 챕tait auparavant obligatoire). Notez que pour des raisons de compatibilit챕 ascendante, si le commit se termine par une commande `data` (c'est-횪-dire qu'il n'y a pas de commande `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `fileename`, `filedeleteall` ou `notemodify`), alors deux commandes `LF` peuvent appara챤tre 횪 la fin de la commande au lieu d'une seule."
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr "Une commande `author` peut optionnellement appara챤tre, si les informations de l'auteur peuvent diff챕rer de celles du validateur. Si `author` est omis, alors fast-import utilisera automatiquement les informations du validateur pour la partie auteur du commit. Voir ci-dessous pour une description des champs de `author`, car ils sont identiques 횪 ceux de `committer`."
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr "La commande `committer` indique qui a fait ce commit, et quand il l'a fait."
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr "Ici, `<om>` est le nom d'affichage de la personne' (par exemple ``Com M Itter'') et `<email>` est l'adresse 챕lectronique de la personne (``\\cm@example.com''). `LT` et `GT` sont les symboles litt챕raux moins que (\\x3c) et plus que (\\x3e). Ils sont n챕cessaires pour d챕limiter l'adresse 챕lectronique des autres champs de la ligne. Notez que `<nom>` et `<email>` sont de forme libre et peuvent contenir n'importe quelle s챕quence d'octets, sauf `LT`, `GT` et `LF`. Le nom est g챕n챕ralement cod챕 en UTF-8."
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr "L'heure de la modification est sp챕cifi챕e par `<quand>` en utilisant le format de date qui a 챕t챕 s챕lectionn챕 par l'option de ligne de commande --date-format=<fmt> ;. Voir \"Formats de date'' ci-dessus pour l'ensemble des formats pris en charge et leur syntaxe."
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr "La commande optionnelle `encoding` indique l'encodage du message de validation. La plupart des commits sont UTF-8 et l'encodage est omis, mais cela permet d'importer des messages de commit dans git sans les r챕-encoder au pr챕alable."
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr "La commande `from` est utilis챕e pour sp챕cifier le commit 횪 partir duquel initialiser cette branche. Cette r챕vision sera le premier anc챗tre du nouveau commit. L'챕tat de l'arbre construit 횪 partir de ce commit commencera avec l'챕tat du commit `from`, et sera modifi챕 par les modifications de contenu de ce commit."
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr "Omettre la commande `from` dans le premier commit d'une nouvelle branche fera que fast-import cr챕era ce commit sans anc챗tre. Ceci n'est g챕n챕ralement souhait챕 que pour le premier commit d'un projet. Si le frontal cr챕e tous les fichiers 횪 partir de z챕ro lors de la cr챕ation d'une nouvelle branche, une commande `merge` peut 챗tre utilis챕e 횪 la place de `from` pour commencer le commit avec un arbre vide. Omettre la commande `from` sur des branches existantes est g챕n챕ralement souhaitable, car le commit actuel sur cette branche est automatiquement suppos챕 챗tre le premier anc챗tre du nouveau commit."
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr "Comme `LF` n'est pas valide dans un refname Git ou une expression SHA-1, aucune syntaxe de citation ou d'챕chappement n'est support챕e dans `<commit-esque>`."
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr "Ici, `<commit-esque>` est l'un des 챕l챕ments suivants혻:"
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr "Le nom d'une branche existante d챕j횪 dans la table interne des branches de fast-import. Si fast-import ne conna챤t pas le nom, il est trait챕 comme une expression SHA-1."
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr "Une r챕f챕rence de marque, `:<idnum>`, o첫 `<idnum>` est le num챕ro de la marque."
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr "La raison pour laquelle fast-import utilise `:` pour indiquer une r챕f챕rence de marque est que ce caract챔re n'est pas l챕gal dans un nom de branche Git. Le caract챔re de t챗te `:` permet de distinguer facilement la marque 42 (`:42`) de la branche 42 (`42` ou `refs/heads/42`), ou d'un SHA-1 abr챕g챕 qui n'est constitu챕 que de chiffres en base 10."
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr "Les marques doivent 챗tre d챕clar챕es (via `mark`) avant de pouvoir 챗tre utilis챕es."
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr "Un commit SHA-1 complet de 40 octets ou abr챕g챕 en hexad챕cimal."
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr "Toute expression SHA-1 valide de Git qui se r챕sout en un commit. Voir \"SP횋CIFICATION DE R횋VISIONS'' in linkgit:gitrevisions[7] pour plus de d챕tails."
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr "Le SHA-1 sp챕cial nul (40 z챕ros) indique que la branche doit 챗tre supprim챕e."
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr "Le cas particulier de la reprise d'une importation incr챕mentale 횪 partir de la valeur actuelle de la branche doit 챗tre 챕crit comme suit :"
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr "\tfrom refs/heads/branch^0\n"
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr "Le suffixe `^0` est n챕cessaire car fast-import ne permet pas 횪 une branche de d챕marrer 횪 partir d'elle-m챗me, et la branche est cr챕챕e en m챕moire avant m챗me que la commande `from` ne soit lue en entr챕e. L'ajout de `^0` forcera fast-import 횪 r챕soudre le commit 횪 travers la biblioth챔que d'analyse de r챕vision de Git's, plut척t que sa table de branche interne, chargeant ainsi la valeur existante de la branche."
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr "Inclut un commit d'anc챗tre suppl챕mentaire. Le lien d'anc챗tre suppl챕mentaire ne change pas la fa챌on dont l'챕tat de l'arbre est construit 횪 ce commit. Si la commande `from` est omise lors de la cr챕ation d'une nouvelle branche, le premier commit `merge` sera le premier anc챗tre du commit actuel, et la branche commencera sans fichier. Un nombre illimit챕 de commandes `merge` par commit est autoris챕 par fast-import, 챕tablissant ainsi une fusion 횪 n voies."
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr "Ici, `<commit-esque>` est l'une des expressions de sp챕cification de commit 챕galement accept챕es par `from` (voir ci-dessus)."
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr "Inclus dans une commande `commit` pour ajouter un nouveau fichier ou modifier le contenu d'un fichier existant. Cette commande a deux moyens diff챕rents de sp챕cifier le contenu du fichier."
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr "Format externe de donn챕es"
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr "Le contenu des donn챕es pour le fichier a d챕j횪 챕t챕 fourni par une commande `blob` ant챕rieure. Le frontal a juste besoin de le connecter."
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr "\t'M' SP <mode> SP <ref-donn챕es> SP <chemin> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr "Ici, g챕n챕ralement, `<ref-donn챕es>` doit 챗tre soit une r챕f챕rence de marque (`:<idnum>`) d챕finie par une commande `blob` ant챕rieure, soit un SHA-1 complet de 40 octets d'un objet blob Git existant. Si `<mode>` est `040000``, alors `<ref-donn챕es>` doit 챗tre le SHA-1 complet sur 40 octets d'un objet arbre Git existant ou une r챕f챕rence de marque d챕finie avec `--import-marks`."
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr "Format en ligne de donn챕es"
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr "Le contenu des donn챕es du fichier n'a pas encore 챕t챕 fourni. Le frontal veut le fournir dans le cadre de cette commande de modification."
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
-msgstr "\t'M' SP <mode> SP 'inline' SP <chemin> LF\n\tdonn챕es\n"
+msgstr ""
+"\t'M' SP <mode> SP 'inline' SP <chemin> LF\n"
+"\tdonn챕es\n"
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr "Voir ci-dessous pour une description d챕taill챕e de la commande `data`."
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr "Dans les deux formats, `<mode>` est le type d'entr챕e du fichier, sp챕cifi챕 en octal. Git ne supporte que les modes suivants :"
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr "`100644` ou `644` : Un fichier normal (non ex챕cutable). La majorit챕 des fichiers dans la plupart des projets utilisent ce mode. En cas de doute, c'est ce que vous voulez."
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr "`100755` ou `755` : Un fichier normal, mais ex챕cutable."
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr "`120000` : Un lien symbolique, le contenu du fichier sera la cible du lien."
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr "`160000` : Un lien git, SHA-1 de l'objet fait r챕f챕rence 횪 un commit dans un autre d챕p척t. Les liens Git ne peuvent 챗tre sp챕cifi챕s que par SHA ou par une marque de commit. Ils sont utilis챕s pour impl챕menter des sous-modules."
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr "`040000` : Un sous-r챕pertoire. Les sous-r챕pertoires ne peuvent 챗tre sp챕cifi챕s que par SHA ou par une marque d'arbre d챕finie avec `--import-marks`."
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr "Dans les deux formats, `<chemin>` est le chemin complet du fichier 횪 ajouter (s'il n'existe pas d챕j횪) ou 횪 modifier (s'il existe d챕j횪)."
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr "Une cha챤ne de caract챔res `<chemin>` doit utiliser des s챕parateurs de r챕pertoire de style UNIX (barre oblique `/`), peut contenir n'importe quel octet autre que `LF`, et ne doit pas commencer par un double guillemet (`\"`)."
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr "Un chemin peut utiliser un guillemet de style C ; ceci est accept챕 dans tous les cas et obligatoire si le nom du fichier commence par un guillemet double ou contient `LF`. Dans le cas d'une citation de style C, le nom complet doit 챗tre entour챕 de guillemets doubles, et tout caract챔re `LF`, barre anti-oblique ou guillemet double doit 챗tre 챕chapp챕 en le faisant pr챕c챕der d'une barre anti-oblique (par exemple, `\"path/with\\n, \\\\\\\\\\ et \\\" ; in it\"`)."
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr "La valeur de `<chemin>` doit 챗tre sous forme canonique. C'est-횪-dire qu'elle ne doit pas :"
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr "contenir un composant de r챕pertoire vide (par exemple, `foo//bar` n'est pas valide),"
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr "se terminer par un s챕parateur de r챕pertoire (par exemple, `foo/` n'est pas valide),"
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr "commencer par un s챕parateur de r챕pertoire (par exemple, `/foo` n'est pas valide),"
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr "contenir le composant sp챕cial `.` ou `..` (par exemple, `foo/./bar` et `foo/../bar` sont invalides)."
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr "La racine de l'arbre peut 챗tre repr챕sent챕e par une cha챤ne vide comme `<chemin>`."
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr "Il est recommand챕 que `<chmein>` soit toujours cod챕 en UTF-8."
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr "Inclus dans une commande `commit` pour supprimer un fichier ou supprimer r챕cursivement un r챕pertoire entier de la branche. Si la suppression du fichier ou du r챕pertoire rend son r챕pertoire parent vide, le r챕pertoire parent sera automatiquement supprim챕 aussi. Cela se fait en cascade dans l'arbre jusqu'횪 ce que le premier r챕pertoire non vide ou la racine soit atteint."
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr "\t'D' SP <chemin> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr "o첫 `<chemin>` est le chemin complet du fichier ou du sous-r챕pertoire 횪 supprimer de la branche. Voir `filemodify` ci-dessus pour une description d챕taill챕e de `<chemin>`."
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr "Copie r챕cursivement un fichier ou un sous-r챕pertoire existant 횪 un emplacement diff챕rent dans la branche. Le fichier ou le r챕pertoire existant doit exister. Si la destination existe, elle sera compl챔tement remplac챕e par le contenu copi챕 depuis la source."
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr "\t'C' SP <chemin> SP <chemin> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr "ici le premier `<chemin>` est l'emplacement source et le second `<chemin>` est la destination. Voir `filemodify` ci-dessus pour une description d챕taill챕e de ce 횪 quoi `<chemin>` peut ressembler. Pour utiliser un chemin source qui contient SP, le chemin doit 챗tre cit챕."
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr "Une commande `filecopy` prend effet imm챕diatement. Une fois que l'emplacement source a 챕t챕 copi챕 vers la destination, toute commande future appliqu챕e 횪 l'emplacement source n'aura pas d'impact sur la destination de la copie."
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr "Renomme un fichier ou un sous-r챕pertoire existant 횪 un emplacement diff챕rent dans la branche. Le fichier ou le r챕pertoire existant doit exister. Si la destination existe, elle sera remplac챕e par le r챕pertoire source."
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr "\t'R' SP <chemin> SP <chemin> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr "Une commande `filerename` prend effet imm챕diatement. Une fois que l'emplacement source a 챕t챕 renomm챕 vers la destination, toute commande future appliqu챕e 횪 l'emplacement source cr챕era de nouveaux fichiers 횪 cet endroit et n'aura pas d'impact sur la destination du renommage."
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr "Notez qu'un `filerename` est identique 횪 un `filecopy` suivi d'un `filedelete` de l'emplacement source. Il y a un l챕ger avantage de performance 횪 utiliser `filerename`, mais l'avantage est si faible que cela ne vaut jamais la peine d'essayer de convertir une paire delete/add dans le mat챕riel source en un renommage pour l'importation rapide. Cette commande `filerename` est fournie juste pour simplifier les frontaux qui ont d챕j횪 des informations de renommage et ne veulent pas s'emb챗ter 횪 les d챕composer en un `filecopy` suivi d'un `filedelete`."
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr "Inclus dans une commande `commit` pour supprimer tous les fichiers (et aussi tous les r챕pertoires) de la branche. Cette commande r챕initialise la structure interne de la branche pour qu'elle ne contienne aucun fichier, ce qui permet 횪 l'interface d'ajouter ult챕rieurement tous les fichiers int챕ressants 횪 partir de z챕ro."
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr "\t'deleteall' LF\n"
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr "Cette commande est extr챗mement utile si le frontal ne sait pas (ou ne se soucie pas de savoir) quels fichiers sont actuellement sur la branche, et ne peut donc pas g챕n챕rer les commandes `filedelete` appropri챕es pour mettre 횪 jour le contenu."
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr "L'envoi d'une commande `filedeleteall` suivie des commandes `filemodify` n챕cessaires pour d챕finir le contenu correct produira les m챗mes r챕sultats que l'envoi des commandes `filemodify` et `filedelete` n챕cessaires. L'approche `filedeleteall` peut cependant demander 횪 fast-import d'utiliser un peu plus de m챕moire par branche active (moins de 1 MiB pour la plupart des gros projets) ; donc les frontaux qui peuvent facilement obtenir seulement les chemins affect챕s pour un commit sont encourag챕s 횪 le faire."
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr "Inclus dans une commande `commit` `<r챕f-notes>` pour ajouter une nouvelle note annotant un `<commit-esque>` ou changer le contenu de cette annotation. En interne, c'est similaire 횪 filemodify 100644 sur le chemin `<commit-esque>` (peut-챗tre divis챕 en sous-r챕pertoires). Il n'est pas conseill챕 d'utiliser d'autres commandes pour 챕crire dans l'arbre `<r챕f-notes>` sauf `filedeleteall` pour supprimer toutes les notes existantes dans cet arbre. Cette commande a deux moyens diff챕rents de sp챕cifier le contenu de la note."
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr "Le contenu des donn챕es pour la note a d챕j횪 챕t챕 fourni par une commande `blob` ant챕rieure. Le frontal a juste besoin de le connecter au commit qui doit 챗tre annot챕."
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr "\t'N' SP <r챕f-data> SP <commit-esque> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr "Ici, `<r챕f-data>` peut 챗tre soit une r챕f챕rence de marque (`:<idnum>`) d챕finie par une commande `blob` ant챕rieure, soit un SHA-1 complet de 40 octets d'un objet blob Git existant."
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr "Le contenu des donn챕es de la note n'a pas encore 챕t챕 fourni. Le frontal veut le fournir dans le cadre de cette commande de modification."
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
-msgstr "\t'N' SP 'inline' SP <commit-esque> LF\n\tdata\n"
+msgstr ""
+"\t'N' SP 'inline' SP <commit-esque> LF\n"
+"\tdata\n"
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr "Dans les deux formats, `<commit-esque>` est l'une des expressions de sp챕cification de commit 챕galement accept챕es par `from` (voir ci-dessus)."
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr "Fait en sorte que l'import rapide sauvegarde une r챕f챕rence 횪 l'objet courant, permettant au frontal de rappeler cet objet 횪 un moment ult챕rieur, sans conna챤tre son SHA-1. Ici, l'objet courant est la commande de cr챕ation d'objet dans laquelle la commande `mark` appara챤t. Cela peut 챗tre `commit`, `tag`, et `blob`, mais `commit` est l'usage le plus courant."
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr "\t'mark' ; SP ':' ; <idnum> ; LF\n"
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr "o첫 `<idnum>` est le num챕ro attribu챕 par le frontal 횪 cette marque. La valeur de `<idnum>` est exprim챕e sous la forme d'un nombre entier d챕cimal ASCII. La valeur 0 est r챕serv챕e et ne peut pas 챗tre utilis챕e comme marque. Seules les valeurs sup챕rieures ou 챕gales 횪 1 peuvent 챗tre utilis챕es comme marques."
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr "Les nouvelles marques sont cr챕챕es automatiquement. Les marques existantes peuvent 챗tre d챕plac챕es vers un autre objet simplement en r챕utilisant le m챗me `<idnum>` dans une autre commande `mark`."
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr "Fournit le nom de l'objet dans le syst챔me de contr척le de la source d'origine. fast-import ignorera simplement cette directive, mais les processus de filtrage qui op챔rent et modifient le flux avant de l'envoyer 횪 fast-import peuvent avoir besoin de cette information"
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr "\t'original-oid' ; SP <identifiant-objet> ; LF\n"
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr "o첫 `<identifiant-objet>` est une cha챤ne quelconque ne contenant pas LF."
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr "Cr챕e une 챕tiquette annot챕e faisant r챕f챕rence 횪 un commit sp챕cifique. Pour cr챕er des 챕tiquettes l챕g챔res (non annot챕s), voir la commande `reset` ci-dessous."
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -23553,669 +23618,703 @@ msgid ""
"\toriginal-oid?\n"
"\t'tagger' (SP <name>)? SP LT <email> GT SP <when> LF\n"
"\tdata\n"
-msgstr "\t'tag' SP <nom> LF\n\tmark?\n\t'from' SP <commit-esque> LF\n\toriginal-oid?\n\t'tagger' (SP <nom>)? SP LT <email> GT SP <quand> LF\n\t<data>\n"
+msgstr ""
+"\t'tag' SP <nom> LF\n"
+"\tmark?\n"
+"\t'from' SP <commit-esque> LF\n"
+"\toriginal-oid?\n"
+"\t'tagger' (SP <nom>)? SP LT <email> GT SP <quand> LF\n"
+"\t<data>\n"
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr "o첫 `<nom>` est le nom de l'챕tiquette 횪 cr챕er."
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr "Les noms des 챕tiquettes sont automatiquement pr챕fix챕s par `refs/tags/` lorsqu'elles sont stock챕s dans Git, ainsi l'importation du symbole de branche CVS `RELENG-1_0-FINAL` utilisera juste `RELENG-1_0-FINAL` pour `<nom>`, et fast-import 챕crira la r챕f챕rence correspondante comme `refs/tags/RELENG-1_0-FINAL`."
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr "La valeur de `<nom>` doit 챗tre un nom de r챕f챕rence valide dans Git et peut donc contenir des barres obliques. Comme `LF` n'est pas valide dans un nom de r챕f챕rence Git, aucune syntaxe de citation ou d'챕chappement n'est support챕e ici."
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr "La commande `from` est la m챗me que pour la commande `commit` ; voir ci-dessus pour plus de d챕tails."
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr "La commande `tagger` utilise le m챗me format que `committer` dans `commit` ; encore une fois, voir ci-dessus pour les d챕tails."
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr "La commande `data` qui suit `tagger` doit fournir le message d'챕tiquette annot챕e (voir ci-dessous pour la syntaxe de la commande `data`). Pour importer un message vide, utilisez des donn챕es de longueur 0. Les messages d'챕tiquette sont de forme libre et ne sont pas interpr챕t챕s par Git. Actuellement, ils doivent 챗tre encod챕s en UTF-8, car fast-import ne permet pas de sp챕cifier d'autres encodages."
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr "La signature des 챕tiquettes annot챕es pendant l'importation 횪 partir de fast-import n'est pas prise en charge. Essayer d'inclure votre propre signature PGP/GPG n'est pas recommand챕, car le frontal n'a pas (facilement) acc챔s 횪 l'ensemble des octets qui composent normalement une telle signature. Si la signature est n챕cessaire, cr챕ez des 챕tiquettes l챕g챔res depuis fast-import avec `reset`, puis cr챕ez les versions annot챕es de ces 챕tiquettes hors ligne avec le processus standard 'git tag'."
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr "Cr챕e (ou recr챕e) la branche nomm챕e, en partant 챕ventuellement d'une r챕vision sp챕cifique. La commande reset permet 횪 un frontend d'챕mettre une nouvelle commande `from` pour une branche existante, ou de cr챕er une nouvelle branche 횪 partir d'un commit existant sans cr챕er un nouveau commit."
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
"\tLF?\n"
-msgstr "\t'reset' SP <ref> LF\n\t('from' SP <commit-esque> LF)?\n\tLF?\n"
+msgstr ""
+"\t'reset' SP <ref> LF\n"
+"\t('from' SP <commit-esque> LF)?\n"
+"\tLF?\n"
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr "Pour une description d챕taill챕e de `<ref>` et `<commit-esque>` voir ci-dessus sous `commit` et `from`."
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr "Le `LF` apr챔s la commande est facultatif (il 챕tait auparavant obligatoire)."
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr "La commande `reset` peut 챕galement 챗tre utilis챕e pour cr챕er des 챕tiquettes l챕g챔res (non annot챕es). Par exemple :"
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
-msgstr "\treset refs/tags/938\n\tfrom :938\n"
+msgstr ""
+"\treset refs/tags/938\n"
+"\tfrom :938\n"
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr "cr챕erait l'챕tiquette l챕g챔re `refs/tags/938` faisant r챕f챕rence 횪 la marque de commit `:938`."
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr "Demande l'챕criture d'une r챕vision de fichier dans le fichier paquet. La r챕vision n'est connect챕e 횪 aucun commit ; cette connexion doit 챗tre form챕e dans une commande `commit` ult챕rieure en r챕f챕ren챌ant le blob par une marque assign챕e."
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
"\toriginal-oid?\n"
"\tdata\n"
-msgstr "\t'blob' LF\n\tmarque?\n\toid-original?\n\tdata\n"
+msgstr ""
+"\t'blob' LF\n"
+"\tmarque?\n"
+"\toid-original?\n"
+"\tdata\n"
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr "La commande mark est optionnelle ici car certains frontaux ont choisi de g챕n챕rer eux-m챗mes le SHA-1 de Git pour le blob et de le transmettre directement 횪 `commit`. Cependant, cela repr챕sente g챕n챕ralement plus de travail que cela n�셞n vaut la peine, car les marques sont peu co청teuses 횪 stocker et faciles 횪 utiliser."
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr "Fournit des donn챕es brutes (횪 utiliser comme contenu de blob/fichier, messages de commit ou messages de tags annot챕s) 횪 fast-import. Les donn챕es peuvent 챗tre fournies en utilisant un nombre exact d'octets ou en 챕tant d챕limit챕es par une ligne de fin. Les frontaux r챕els destin챕s 횪 des conversions de qualit챕 devraient toujours utiliser le format de comptage exact des octets, car il est plus robuste et plus performant. Le format d챕limit챕 est principalement destin챕 횪 tester l'importation rapide."
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr "Les lignes de commentaires apparaissant dans la partie `<brut>` des commandes `data` sont toujours consid챕r챕es comme faisant partie du corps des donn챕es et ne sont donc jamais ignor챕es par fast-import. Cela permet d'importer en toute s챕curit챕 tout contenu de fichier/message dont les lignes pourraient commencer par `#`."
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr "Format exact de comptage des octets"
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr "Le frontal doit sp챕cifier le nombre d'octets de donn챕es."
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
-msgstr "\t'data' SP <compte> LF\n\t<brut> LF?\n"
+msgstr ""
+"\t'data' SP <compte> LF\n"
+"\t<brut> LF?\n"
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr "o첫 `<compte>` est le nombre exact d'octets apparaissant dans `<brut>`. La valeur de `<compte>` est exprim챕e sous la forme d'un nombre entier d챕cimal ASCII. Le \"LF\" de chaque c척t챕 de \"brut\" n'est pas inclus dans \"compte\" et ne sera pas inclus dans les donn챕es import챕es."
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr "Le `LF` apr챔s `<brut>` est facultatif (il 챕tait auparavant obligatoire) mais recommand챕. Le fait de toujours l'inclure facilite le d챕bogage d'un flux d'importation rapide car la commande suivante commence toujours dans la colonne 0 de la ligne suivante, m챗me si `<brut>` ne se termine pas par un `LF`."
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr "Format d챕limit챕"
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr "Une cha챤ne de d챕limitation est utilis챕e pour marquer la fin des donn챕es. fast-import calculera la longueur en recherchant le d챕limiteur. Ce format est principalement utile pour les tests et n'est pas recommand챕 pour les donn챕es r챕elles."
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
"\t<delim> LF\n"
"\tLF?\n"
-msgstr "\t'data' SP '<<' <delim> LF\n\t<brut> LF\n\t<delim> LF\n\tLF?\n"
+msgstr ""
+"\t'data' SP '<<' <delim> LF\n"
+"\t<brut> LF\n"
+"\t<delim> LF\n"
+"\tLF?\n"
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr "o첫 `<delim>` est la cha챤ne de d챕limitation choisie. La cha챤ne `<delim>` ne doit pas appara챤tre sur une ligne seule dans `<brut>`, sinon fast-import pensera que les donn챕es se terminent plus t척t qu'elles ne le font r챕ellement. Le `LF` qui suit imm챕diatement `<brut>` fait partie de `<brut>`. C'est une des limites du format d챕limit챕, il est impossible de fournir un morceau de donn챕es qui n'a pas un LF comme dernier octet."
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr "Le `LF` apr챔s `<delim> LF` est facultatif (il 챕tait auparavant obligatoire)."
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr "Enregistrer qu'une marque se r챕f챔re 횪 un objet donn챕 sans cr챕er au pr챕alable un nouvel objet."
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
"\t'to' SP <commit-ish> LF\n"
"\tLF?\n"
-msgstr "\t'alias' LF\n\tmarque\n\t'to' SP <commit-esque> LF\n\tLF?\n"
+msgstr ""
+"\t'alias' LF\n"
+"\tmarque\n"
+"\t'to' SP <commit-esque> LF\n"
+"\tLF?\n"
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr "Pour une description d챕taill챕e de `<commit-esque>` voir ci-dessus sous `from`."
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr "Force fast-import 횪 fermer le fichier paquet en cours, 횪 en commencer un nouveau, et 횪 sauvegarder toutes les r챕f챕rences, 챕tiquettes et marques de la branche en cours."
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
-msgstr "\t'checkpoint' LF\n\tLF?\n"
+msgstr ""
+"\t'checkpoint' LF\n"
+"\tLF?\n"
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr "Notez que fast-import change automatiquement de fichier paquet lorsque le fichier paquet actuel atteint --max-pack-size, ou 4 Gio, la limite la plus petite 챕tant retenue. Pendant un changement automatique de fichier paquet, fast-import ne met pas 횪 jour les refs de branche, les 챕tiquettes ou les marques."
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr "Comme un `checkpoint` peut n챕cessiter une quantit챕 significative de temps CPU et d'entr챕es-sorties sur le disque (pour calculer la somme de contr척le SHA-1 du paquet global, g챕n챕rer le fichier d'index correspondant, et mettre 횪 jour les r챕f챕rences), il peut facilement prendre plusieurs minutes pour une seule commande `checkpoint`."
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr "Les frontaux peuvent choisir d'챕mettre des points de contr척le lors d'importations extr챗mement importantes et longues, ou lorsqu'ils doivent permettre 횪 un autre processus Git d'acc챕der 횪 une branche. Cependant, 챕tant donn챕 qu'un d챕p척t Subversion de 30 Go peut 챗tre charg챕 dans Git par le biais d'un import rapide en 3 heures environ, la mise en place de points de contr척le explicites peut ne pas 챗tre n챕cessaire."
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr "Demande 횪 fast-import d'afficher la ligne `progress` enti챔re sans modification sur son canal de sortie standard (descripteur de fichier 1) lorsque la commande est trait챕e 횪 partir du flux d'entr챕e. La commande n'a par ailleurs aucun impact sur l'importation en cours, ni sur l'챕tat interne de fast-import's."
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
-msgstr "\t'progress' SP <cha챤ne-libre> LF\n\tLF?\n"
+msgstr ""
+"\t'progress' SP <cha챤ne-libre> LF\n"
+"\tLF?\n"
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr "La partie `<cha챤ne-libre>` de la commande peut contenir toute s챕quence d'octets ne contenant pas de `LF`. Le `LF` apr챔s la commande est facultatif. Les appelants peuvent souhaiter traiter la sortie 횪 l'aide d'un outil tel que sed pour supprimer la partie de t챗te de la ligne, par exemple :"
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr "\tfrontal | git fast-import | sed 's/^progress //' ;\n"
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr "Placer une commande `progress` imm챕diatement apr챔s un `checkpoint` informera le lecteur quand le `checkpoint` est termin챕 et qu'il peut acc챕der en toute s챕curit챕 aux refs que l'import rapide a mis 횪 jour."
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr "Demande 횪 fast-import d'imprimer le SHA-1 correspondant 횪 une marque vers stdout ou vers le descripteur de fichier pr챕alablement arrang챕 avec l'argument `--cat-blob-fd`. Cette commande n'a pas d'impact sur l'importation en cours ; son but est de r챕cup챕rer les SHA-1 que les commits ult챕rieurs pourraient vouloir mentionner dans leurs messages de commit."
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr "\t'get-mark' SP ':' <idnum> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr "Voir \"R챕ponses aux commandes\" ci-dessous pour plus de d챕tails sur la fa챌on de lire cette sortie en toute s챕curit챕."
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr "Demande 횪 fast-import d'imprimer un blob sur un descripteur de fichier pr챕alablement d챕fini avec l'argument `--cat-blob-fd`. La commande n'a autrement aucun impact sur l'importation courante ; son but principal est de r챕cup챕rer les blobs qui peuvent 챗tre dans la m챕moire de fast-import mais non accessibles depuis le d챕p척t cible."
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr "\t'cat-blob' SP <r챕f-data> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr "Le `<r챕f-data>` peut 챗tre soit une r챕f챕rence de marque (`:<idnum>`) d챕finie pr챕c챕demment, soit un SHA-1 complet de 40 octets d'un blob Git, pr챕existant ou pr챗t 횪 챗tre 챕crit."
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr "La sortie utilise le m챗me format que `git cat-file --batch` :"
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
-msgstr "\t<sha1> SP 'blob' SP <taille> LF\n\t<contenu> LF\n"
+msgstr ""
+"\t<sha1> SP 'blob' SP <taille> LF\n"
+"\t<contenu> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr "Cette commande peut 챗tre utilis챕e l횪 o첫 une directive `filemodify` peut appara챤tre, ce qui permet de l'utiliser au milieu d'un commit. Pour un `filemodify` utilisant une directive inline, elle peut aussi appara챤tre juste avant la directive `data`."
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr "Affiche des informations sur l'objet 횪 un chemin vers un descripteur de fichier pr챕alablement arrang챕 avec l'argument `--cat-blob-fd`. Cela permet d'afficher un blob 횪 partir du commit actif (avec `cat-blob`) ou de copier un blob ou un arbre 횪 partir d'un commit pr챕c챕dent pour l'utiliser dans le commit actuel (avec `filemodify`)."
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr "La commande `ls` peut 챕galement 챗tre utilis챕e l횪 o첫 une directive `filemodify` peut appara챤tre, ce qui permet de l'utiliser au milieu d'un commit."
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr "Lecture de l'engagement actif"
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr "Cette forme ne peut 챗tre utilis챕e qu'au milieu d'un `commit`. Le chemin nomme une entr챕e de r챕pertoire dans le commit actif de fast-import. Le chemin doit 챗tre cit챕 dans ce cas."
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr "\t'ls' SP <chemin> LF\n"
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr "Lecture d'un arbre nomm챕"
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr "Le `<r챕f-data>` peut 챗tre une r챕f챕rence de marque (`:<idnum>`) ou le SHA-1 complet sur 40 octets d'une 챕tiquette Git, d'un commit ou d'un objet arbre, pr챕existant ou en attente d'챕criture. Le chemin est relatif au niveau sup챕rieur de l'arbre nomm챕 par `<r챕f-data>`."
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr "\t'ls' SP <r챕f-data> SP <chemin> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr "Voir `filemodify` ci-dessus pour une description d챕taill챕e de `<chemin>`."
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr "La sortie utilise le m챗me format que `git ls-tree <arbre> -- <chemin>` :"
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr "\t<mode> SP ('blob' | 'tree' | 'commit') SP <r챕f-data> HT <chemin> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr "Le <r챕f-data> repr챕sente le blob, l'arbre ou l'objet commit au <chemin> et peut 챗tre utilis챕 dans les commandes ult챕rieures 'get-mark', 'cat-blob', 'filemodify', ou 'ls'."
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr "S'il n'y a pas de fichier ou de sous-arbre 횪 ce chemin, 'git fast-import' signalera 횪 la place"
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr "\tmissing SP <chemin> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr "Exige que fast-import prenne en charge la fonctionnalit챕 sp챕cifi챕e, ou abandonne si ce n'est pas le cas."
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr "\t'feature' SP <fonction> ('=' <argument>)? LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr "La partie <fonction> de la commande peut 챗tre l'une des suivantes :"
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr "data-format"
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr "export-marks"
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr "relative-marks"
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "no-relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr "forcer"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr "Agit comme si l'option de ligne de commande correspondante avec un `--` en t챗te 챕tait pass챕e sur la ligne de commande (voir OPTIONS, ci-dessus)."
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr "import-marks"
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr "import-marks-if-exists"
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr "Comme --import-marks sauf sur deux points : premi챔rement, une seule commande \"feature import-marks\" ou \"feature import-marks-if-exists\" est autoris챕e par flux ; deuxi챔mement, une option de ligne de commande --import-marks= ou --import-marks-if-exists remplace n'importe laquelle de ces commandes \"feature\" dans le flux ; troisi챔mement, \"feature import-marks-if-exists\" comme une option de ligne de commande correspondante saute silencieusement un fichier inexistant."
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr "get-mark"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr "cat-blob"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr "ls"
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr "Exige que le moteur prenne en charge la commande 'get-mark', 'cat-blob', ou 'ls' respectivement. Les versions de fast-import ne supportant pas la commande sp챕cifi챕e se termineront avec un message l'indiquant. Cela permet 횪 l'importation de se terminer pr챕matur챕ment avec un message clair, plut척t que de perdre du temps au d챕but de l'importation avant que la commande non support챕e ne soit d챕tect챕e."
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr "notes"
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr "Exiger que le moteur prenne en charge la sous-commande 'notemodify' (N) de la commande 'commit'. Les versions de fast-import ne prenant pas en charge les notes se termineront par un message l'indiquant."
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr "fait"
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr "Sortir en erreur si le flux se termine sans une commande 'done'. Sans cette fonctionnalit챕, les erreurs provoquant la fin abrupte du frontal 횪 un moment opportun du flux peuvent passer inaper챌ues. Cela peut se produire, par exemple, si un frontal d'importation meurt au milieu de l'op챕ration sans 챕mettre de SIGTERM ou SIGKILL 횪 son instance git fast-import subordonn챕e."
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr "Traite l'option sp챕cifi챕e afin que git fast-import se comporte d'une mani챔re qui convient aux besoins du frontal Notez que les options sp챕cifi챕es par le frontal sont remplac챕es par toutes les options que l'utilisateur peut sp챕cifier 횪 git fast-import lui-m챗me."
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr " 'option' SP <option> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr "La partie `<option>` de la commande peut contenir n'importe quelle option list챕e dans la section OPTIONS qui ne change pas la s챕mantique de l'importation, sans le `--` de t챗te et est trait챕e de la m챗me mani챔re."
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr "Les commandes d'option doivent 챗tre les premi챔res commandes sur l'entr챕e (sans compter les commandes de fonctionnalit챕), donner une commande d'option apr챔s une commande de non-option est une erreur."
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr "Les options de ligne de commande suivantes modifient la s챕mantique de l'importation et ne peuvent donc pas 챗tre pass챕es en tant qu'option :"
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr "cat-blob-fd"
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr "Si la fonction `done` n'est pas utilis챕e, trait챕e comme si EOF 챕tait lu. Ceci peut 챗tre utilis챕 pour dire 횪 fast-import de finir plus t척t."
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr "Si l'option de ligne de commande `--done` ou la commande `feature done` est utilis챕e, la commande `done` est obligatoire et marque la fin du flux."
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr "R횋PONSES AUX COMMANDES"
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr "Les nouveaux objets 챕crits par fast-import ne sont pas disponibles imm챕diatement. La plupart des commandes de fast-import n'ont pas d'effet visible avant le prochain checkpoint (ou completion). Le frontal peut envoyer des commandes pour remplir le tuyau d�셞ntr챕e de fast-import sans se soucier de la rapidit챕 avec laquelle elles prendront effet, ce qui am챕liore les performances en simplifiant la planification."
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr "Pour certains frontaux, cependant, il est utile de pouvoir relire les donn챕es du d챕p척t actuel au fur et 횪 mesure de sa mise 횪 jour (par exemple lorsque le mat챕riel source d챕crit les objets en termes de correctifs 횪 appliquer aux objets pr챕c챕demment import챕s). Ceci peut 챗tre r챕alis챕 en connectant le frontal et fast-import via des tuyaux bidirectionnels :"
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
"\tgit fast-import >fast-import-output\n"
-msgstr "\tmkfifo fast-import-output\n\tfrontal <fast-import-output |\n\tgit fast-import >fast-import-output\n"
+msgstr ""
+"\tmkfifo fast-import-output\n"
+"\tfrontal <fast-import-output |\n"
+"\tgit fast-import >fast-import-output\n"
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr "Un frontal configur챕 de cette fa챌on peut utiliser les commandes `progress`, `get-mark`, `ls`, et `cat-blob` pour lire les informations de l'import en cours."
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr "Pour 챕viter les blocages, de tels frontaux doivent compl챔tement consommer toute sortie en attente de `progress`, `ls`, `get-mark`, et `cat-blob` avant d'effectuer des 챕critures dans fast-import qui pourraient bloquer."
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr "RAPPORTS D'ACCIDENT"
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr "Si fast-import re챌oit une entr챕e invalide, il se terminera avec un statut de sortie non nul et cr챕era un rapport d'accident au niveau sup챕rieur du d챕p척t Git dans lequel il importait. Les rapports d'accident contiennent un instantan챕 de l'챕tat interne de fast-import ainsi que les commandes les plus r챕centes qui ont conduit au crash."
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr "Toutes les commandes r챕centes (y compris les commentaires de flux, les modifications de fichiers et les commandes de progression) sont affich챕es dans l'historique des commandes au sein du rapport de collision, mais les donn챕es de fichiers brutes et les messages de validation sont exclus du rapport de collision. Cette exclusion permet de gagner de l'espace dans le fichier de rapport et de r챕duire la quantit챕 de mise en m챕moire tampon que l'importation rapide doit effectuer pendant l'ex챕cution."
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr "Apr챔s avoir 챕crit un rapport de panne, fast-import fermera le fichier paquet actuel et exportera la table des marques. Cela permet au d챕veloppeur du frontal d'inspecter l'챕tat du d챕p척t et de reprendre l'importation 횪 partir du point o첫 elle s'est arr챗t챕e. Les branches et les 챕tiquettes modifi챕es ne sont pas mises 횪 jour lors d'un crash, car l'importation ne s'est pas termin챕e avec succ챔s. Les informations sur les branches et les 챕tiquettes se trouvent dans le rapport d'accident et doivent 챗tre appliqu챕es manuellement si la mise 횪 jour est n챕cessaire."
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr "Un exemple d'accident :"
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -24231,37 +24330,59 @@ msgid ""
"\tEOF\n"
"\tM 777 inline bob\n"
"\tEND_OF_INPUT\n"
-msgstr "\t$ cat >in <<END_OF_INPUT\n\t# mon tout premier commit de test\n\tcommit refs/heads/master\n\tcommitter Shawn O. Pearce <spearce> 19283 -0400\n\t# Qui est ce type d'ailleurs ?\n\tdata <<EOF\n\tC'est mon commit\n\tEOF\n\tM 644 inline .gitignore\n\tdata <<EOF\n\t.gitignore\n\tEOF\n\tM 777 inline bob\n\tEND_OF_INPUT\n"
+msgstr ""
+"\t$ cat >in <<END_OF_INPUT\n"
+"\t# mon tout premier commit de test\n"
+"\tcommit refs/heads/master\n"
+"\tcommitter Shawn O. Pearce <spearce> 19283 -0400\n"
+"\t# Qui est ce type d'ailleurs ?\n"
+"\tdata <<EOF\n"
+"\tC'est mon commit\n"
+"\tEOF\n"
+"\tM 644 inline .gitignore\n"
+"\tdata <<EOF\n"
+"\t.gitignore\n"
+"\tEOF\n"
+"\tM 777 inline bob\n"
+"\tEND_OF_INPUT\n"
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
"\tfast-import: dumping crash report to .git/fast_import_crash_8434\n"
-msgstr "\t$ git fast-import <in\n\tfatal: Corrupt mode: M 777 inline bob\n\tfast-import: dumping crash report to .git/fast_import_crash_8434\n"
+msgstr ""
+"\t$ git fast-import <in\n"
+"\tfatal: Corrupt mode: M 777 inline bob\n"
+"\tfast-import: dumping crash report to .git/fast_import_crash_8434\n"
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
"\t fast-import process: 8434\n"
"\t parent process : 1391\n"
"\t at Sat Sep 1 00:58:12 2007\n"
-msgstr "\t$ cat .git/fast_import_crash_8434\n\tfast-import crash report:\n\t fast-import process: 8434\n\t parent process : 1391\n\t at Sat Sep 1 00:58:12 2007\n"
+msgstr ""
+"\t$ cat .git/fast_import_crash_8434\n"
+"\tfast-import crash report:\n"
+"\t fast-import process: 8434\n"
+"\t parent process : 1391\n"
+"\t at Sat Sep 1 00:58:12 2007\n"
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr "\tfatal: Corrupt mode: M 777 inline bob\n"
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -24272,38 +24393,50 @@ msgid ""
"\t data <<EOF\n"
"\t M 644 inline .gitignore\n"
"\t data <<EOF\n"
-msgstr "\tMost Recent Commands Before Crash\n\t---------------------------------\n\t # mon tout premier commit\n\t commit refs/heads/master\n\t committer Shawn O. Pearce <spearce> 19283 -0400\n\t # Qui est ce gars d'ailleurs ?\n\t data <<EOF\n\t M 644 inline .gitignore\n\t data <<EOF\n"
+msgstr ""
+"\tMost Recent Commands Before Crash\n"
+"\t---------------------------------\n"
+"\t # mon tout premier commit\n"
+"\t commit refs/heads/master\n"
+"\t committer Shawn O. Pearce <spearce> 19283 -0400\n"
+"\t # Qui est ce gars d'ailleurs ?\n"
+"\t data <<EOF\n"
+"\t M 644 inline .gitignore\n"
+"\t data <<EOF\n"
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr "M 777 inline bob\n"
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
"active_branches = 1 cur, 5 max\n"
-msgstr "Active Branch LRU\n-----------------\nactive_branches = 1 cur, 5 max\n"
+msgstr ""
+"Active Branch LRU\n"
+"-----------------\n"
+"active_branches = 1 cur, 5 max\n"
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr "0 refs/heads/master"
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -24314,311 +24447,320 @@ msgid ""
"cur tree : 0000000000000000000000000000000000000000\n"
"commit clock: 0\n"
"last pack :\n"
-msgstr "Inactive Branches\n-----------------\nrefs/heads/master:\nstatus : active loaded dirty\ntip commit : 0000000000000000000000000000000000000000\nold tree : 0000000000000000000000000000000000000000\ncur tree : 0000000000000000000000000000000000000000\ncommit clock: 0\nlast pack :\n"
+msgstr ""
+"Inactive Branches\n"
+"-----------------\n"
+"refs/heads/master:\n"
+"status : active loaded dirty\n"
+"tip commit : 0000000000000000000000000000000000000000\n"
+"old tree : 0000000000000000000000000000000000000000\n"
+"cur tree : 0000000000000000000000000000000000000000\n"
+"commit clock: 0\n"
+"last pack :\n"
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr "------------------- END OF CRASH REPORT"
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr "TRUCS ET ASTUCES"
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr "Les trucs et astuces suivants ont 챕t챕 collect챕s aupr챔s de divers utilisateurs de fast-import, et sont propos챕s ici sous forme de suggestions."
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr "Utiliser une marque par commit"
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr "Lors d'une conversion de d챕p척t, utilisez une marque unique par commit (`mark :<n>`) et fournissez l'option --export-marks sur la ligne de commande. fast-import va g챕n챕rer un fichier qui liste chaque marque et l'objet Git SHA-1 qui lui correspond. Si le frontal peut relier les marques au d챕p척t source, il est facile de v챕rifier l'exactitude et l'exhaustivit챕 de l'importation en comparant chaque commit Git 횪 la r챕vision source correspondante."
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr "Si vous venez d'un syst챔me tel que Perforce ou Subversion, cela devrait 챗tre assez simple, car la marque d'importation rapide peut 챕galement 챗tre le num챕ro de changeset de Perforce ou le num챕ro de r챕vision de Subversion."
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr "Passez librement d'une branche 횪 l'autre"
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr "N�셞ssayez pas d�셭ptimiser le frontal pour qu�셢l s�셙ttache 횪 une seule branche 횪 la fois pendant une importation. Bien que cela puisse 챗tre l챕g챔rement plus rapide pour l'importation rapide, cela tend 횪 augmenter consid챕rablement la complexit챕 du code frontal."
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr "La LRU des branches int챕gr챕e 횪 fast-import tend 횪 se comporter tr챔s bien, et le co청t d'activation d'une branche inactive est si faible que le fait de rebondir entre les branches n'a pratiquement aucun impact sur les performances d'importation."
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr "Gestion des renommages"
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr "Lors de l'importation d'un fichier ou d'un r챕pertoire renomm챕, il suffit de supprimer le ou les anciens noms et de modifier le ou les nouveaux noms lors du commit correspondant. Git effectue la d챕tection des renommages apr챔s coup, plut척t qu'explicitement lors d'un commit."
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr "Utilisez des branches de correction des 챕tiquettes"
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr "Certains autres syst챔mes SCM permettent 횪 l'utilisateur de cr챕er une 챕tiquette 횪 partir de plusieurs fichiers qui ne sont pas du m챗me commit/changeset. Ou de cr챕er des 챕tiquettes qui sont un sous-ensemble des fichiers disponibles dans le d챕p척t."
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr "Importer ces 챕tiquettes tels quels dans Git est impossible sans faire au moins un commit qui \"r챕pare\" les fichiers pour qu'ils correspondent au contenu de l'챕tiquette. Utilisez la commande `reset' de fast-import'pour r챕initialiser une branche fictive en dehors de votre espace de branche normal au commit de base pour le tag, puis validez un ou plusieurs commits de correction de fichiers, et enfin 챕tiquetez la branche fictive."
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr "Par exemple, puisque toutes les branches normales sont stock챕es sous `refs/heads/`, nommez la branche de correction des 챕tiquettes `CORRECTION_ETIQUETTE`. De cette fa챌on, il est impossible que la branche de correction utilis챕e par l'importateur ait des conflits d'espace de noms avec les branches r챕elles import챕es depuis la source (le nom `CORRECTION_ETIQUETTE` n'est pas `refs/heads/CORRECTION_ETIQUETTE`)."
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr "Lorsque vous validez des corrections, pensez 횪 utiliser `merge` pour connecter le(s) commit(s) qui fournissent des r챕visions de fichiers 횪 la branche de correction. Cela permettra 횪 des outils tels que 'git blame' de suivre l'historique r챕el des commits et d'annoter correctement les fichiers sources."
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr "Apr챔s que fast-import se termine, le frontal devra faire `rm .git/CORRECTION_ETIQUETTE` pour supprimer la branche factice."
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr "Importez maintenant, r챕-empaquetez plus tard"
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr "D챔s que l'importation rapide est termin챕e, le d챕p척t Git est compl챔tement valide et pr챗t 횪 챗tre utilis챕. En g챕n챕ral, cela ne prend que tr챔s peu de temps, m챗me pour les projets de grande envergure (plus de 100 000 commits)."
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr "Cependant, le repaquetage du d챕p척t est n챕cessaire pour am챕liorer la localit챕 des donn챕es et les performances d'acc챔s. Il peut 챕galement prendre des heures sur des projets extr챗mement importants (surtout si -f et un grand param챔tre --window sont utilis챕s). Puisque le r챕-empaquetage est s청r 횪 ex챕cuter en m챗me temps que les lecteurs et les 챕crivains, ex챕cutez le r챕-empaquetage en arri챔re-plan et laissez-le se terminer quand il se termine. Il n'y a aucune raison d'attendre pour explorer votre nouveau projet Git !"
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr "Si vous choisissez d�셙ttendre la fin du r챕-empaquetage, n�셞ssayez pas d�셞x챕cuter des benchmarks ou des tests de performance tant que le r챕-empaquetage n�셞st pas termin챕. fast-import produit des fichiers paquets sous-optimaux qui ne sont tout simplement jamais vus en situation r챕elle d�셵tilisation."
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr "R챕-empaquetage des donn챕es historiques"
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr "Si vous r챕-empaquetez des donn챕es import챕es tr챔s anciennes (par exemple, plus anciennes que l'ann챕e derni챔re), envisagez de d챕penser un peu plus de temps CPU et de fournir --window=50 (ou plus) lorsque vous ex챕cutez 'git repack'. Cela prendra plus de temps, mais produira 챕galement un fichier de paquetage plus petit. Vous n'aurez 횪 faire cet effort qu'une seule fois, et tous les utilisateurs de votre projet b챕n챕ficieront d'un d챕p척t plus petit."
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr "Incluez des messages de progr챔s"
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr "par arbre actif"
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr "par entr챕e active de fichier"
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -44462,7 +44604,20 @@ msgid ""
"'git remote' [-v | --verbose] 'show' [-n] <name>...\n"
"'git remote prune' [-n | --dry-run] <name>...\n"
"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
-msgstr "'git remote' [-v | --verbose]\n'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <nom> <URL>\n'git remote rename' [--[no-]progress] <ancien> <nouveau>\n'git remote remove' <nom>\n'git remote set-head' <nom> (-a | --auto | -d | --delete | <branche>)\n'git remote set-branches' [--add] <nom> <branche>...\n'git remote get-url' [--push] [--all] <nom>\n'git remote set-url' [--push] <nom> <nouvelle-URL> [<ancienne-url>]\n'git remote set-url --add' [--push] <nom> <nouvelle-URL>\n'git remote set-url --delete' [--push] <nom> <URL>\n'git remote' [-v | --verbose] 'show' [-n] <nom>...\n'git remote prune' [-n | --dry-run] <nom>...\n'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | <distant>)...]\n"
+msgstr ""
+"'git remote' [-v | --verbose]\n"
+"'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <nom> <URL>\n"
+"'git remote rename' [--[no-]progress] <ancien> <nouveau>\n"
+"'git remote remove' <nom>\n"
+"'git remote set-head' <nom> (-a | --auto | -d | --delete | <branche>)\n"
+"'git remote set-branches' [--add] <nom> <branche>...\n"
+"'git remote get-url' [--push] [--all] <nom>\n"
+"'git remote set-url' [--push] <nom> <nouvelle-URL> [<ancienne-url>]\n"
+"'git remote set-url --add' [--push] <nom> <nouvelle-URL>\n"
+"'git remote set-url --delete' [--push] <nom> <URL>\n"
+"'git remote' [-v | --verbose] 'show' [-n] <nom>...\n"
+"'git remote prune' [-n | --dry-run] <nom>...\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | <distant>)...]\n"
#. type: Plain text
#: en/git-remote.txt:30
@@ -59993,7 +60148,15 @@ msgid ""
"'git worktree remove' [-f] <worktree>\n"
"'git worktree repair' [<path>...]\n"
"'git worktree unlock' <worktree>\n"
-msgstr "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <cha챤ne>]] [-b <nouvelle-branche>] <chemin> [<commit-esque>]\n'git worktree list' [-v | --porcelain [-z]]\n'git worktree lock' [--reason <cha챤ne>] <arbre-de-travail>\n'git worktree move' <arbre-de-travail> <nouveau-chemin>\n'git worktree prune' [-n] [-v] [--expire <expire>]\n'git worktree remove' [-f] <arbre-de-travail>\n'git worktree repair' [<path>...]\n'git worktree unlock' <arbre-de-travail>\n"
+msgstr ""
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <cha챤ne>]] [-b <nouvelle-branche>] <chemin> [<commit-esque>]\n"
+"'git worktree list' [-v | --porcelain [-z]]\n"
+"'git worktree lock' [--reason <cha챤ne>] <arbre-de-travail>\n"
+"'git worktree move' <arbre-de-travail> <nouveau-chemin>\n"
+"'git worktree prune' [-n] [-v] [--expire <expire>]\n"
+"'git worktree remove' [-f] <arbre-de-travail>\n"
+"'git worktree repair' [<path>...]\n"
+"'git worktree unlock' <arbre-de-travail>\n"
#. type: Plain text
#: en/git-worktree.txt:25
@@ -60526,7 +60689,14 @@ msgid ""
"\tlocked: worktree path is mounted on a portable device\n"
"/path/to/prunable-worktree 5678abc1 (detached HEAD)\n"
"\tprunable: gitdir file points to non-existent location\n"
-msgstr "$ git worktree list --verbose\n/chemin/vers/arbre-de-travail-li챕 abcd1234 [master]\n/chemin/vers/arbre-de-travail-verrouill챕-pas-de-raison abcd5678 (HEAD d챕tach챕e) locked\nchemin/vers/arbre-de-travail-verrouill챕-avec-raison 1234abcd (branche-a)\n\tlocked: working tree path is mounted on a portable device\nchemin/vers/arbre-de-travail-elagable 5678abc1 (HEAD d챕tach챕e)\n\tprunable: gitdir file points to non-existent location\n"
+msgstr ""
+"$ git worktree list --verbose\n"
+"/chemin/vers/arbre-de-travail-li챕 abcd1234 [master]\n"
+"/chemin/vers/arbre-de-travail-verrouill챕-pas-de-raison abcd5678 (HEAD d챕tach챕e) locked\n"
+"chemin/vers/arbre-de-travail-verrouill챕-avec-raison 1234abcd (branche-a)\n"
+"\tlocked: working tree path is mounted on a portable device\n"
+"chemin/vers/arbre-de-travail-elagable 5678abc1 (HEAD d챕tach챕e)\n"
+"\tprunable: gitdir file points to non-existent location\n"
#. type: Plain text
#: en/git-worktree.txt:423
@@ -60730,1261 +60900,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[Le manuel d'utilisateur de Git]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr "[[def_branch]]branche"
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr "[[def_directory]]r챕pertoire"
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr "top"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr "literal"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr "glob"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr "exclude"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr "[[def_remote]]d챕p척t distant"
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr "[[def_remote_tracking_branch]]branche de suivi 횪 distance"
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index b5c8204..7e0b7cb 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -6399,7 +6399,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr ""
@@ -6411,7 +6411,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr ""
@@ -6428,7 +6428,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr ""
@@ -7118,7 +7118,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7130,13 +7130,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18631,7 +18631,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20656,19 +20656,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20677,25 +20677,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20707,109 +20707,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21166,283 +21166,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21451,55 +21451,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21509,31 +21509,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21543,259 +21543,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21807,19 +21807,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21831,433 +21831,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22274,241 +22274,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22516,259 +22516,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22776,73 +22776,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22854,55 +22854,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22911,25 +22911,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22937,19 +22937,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22959,43 +22959,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23003,31 +23003,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23037,25 +23037,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23065,19 +23065,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23085,31 +23085,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23117,67 +23117,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23185,283 +23185,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23470,49 +23470,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23532,7 +23532,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23541,7 +23541,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23552,13 +23552,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23573,13 +23573,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23588,19 +23588,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23615,307 +23615,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59461,1266 +59461,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 9bf35a2..5481578 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -6400,7 +6400,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr ""
@@ -6412,7 +6412,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr ""
@@ -6429,7 +6429,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr ""
@@ -7119,7 +7119,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7131,13 +7131,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Sebagian suite linkgit:git[1]"
@@ -18642,7 +18642,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20667,19 +20667,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20688,25 +20688,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20718,109 +20718,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21177,283 +21177,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21462,55 +21462,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21520,31 +21520,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21554,259 +21554,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21818,19 +21818,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21842,433 +21842,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr "`rfc2822`"
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22285,241 +22285,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22527,259 +22527,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22787,73 +22787,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22865,55 +22865,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22922,25 +22922,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22948,19 +22948,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22970,43 +22970,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23014,31 +23014,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23048,25 +23048,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23076,19 +23076,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23096,31 +23096,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23128,67 +23128,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23196,283 +23196,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23481,49 +23481,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23543,7 +23543,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23552,7 +23552,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23563,13 +23563,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23584,13 +23584,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr "M 777 inline putra\n"
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23599,19 +23599,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr "0 refs/heads/main"
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23626,307 +23626,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59477,1266 +59477,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr "[[def_SHA1]]SHA-1"
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.is.po b/po/documentation.is.po
index c021e2b..1251d18 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.po
@@ -6387,7 +6387,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NAFN"
@@ -6399,7 +6399,7 @@ msgstr "git-add - B챈ta innihaldi skjala 챠 atri챨askr찼na"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "SAMANTEKT"
@@ -6421,7 +6421,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "횣TSK횦RING"
@@ -7135,7 +7135,7 @@ msgstr "A챨 breyta innihaldi l챠na sem eru til (\" \") e챨a 찼 a챨 fjarl챈gja (\
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "SJ횁 EINNIG"
@@ -7147,13 +7147,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Hluti af linkgit:git[1] fylkingunni"
@@ -18691,7 +18691,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20716,19 +20716,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20737,25 +20737,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20767,109 +20767,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21225,283 +21225,283 @@ msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcor
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21510,55 +21510,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21568,31 +21568,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21602,259 +21602,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21866,19 +21866,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21890,433 +21890,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22333,241 +22333,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22575,259 +22575,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22835,73 +22835,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22913,55 +22913,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22970,25 +22970,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22996,19 +22996,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23018,43 +23018,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23062,31 +23062,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23096,25 +23096,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23124,19 +23124,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23144,31 +23144,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23176,67 +23176,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23244,283 +23244,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23529,49 +23529,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23591,7 +23591,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23600,7 +23600,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23611,13 +23611,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23632,13 +23632,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23647,19 +23647,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23674,307 +23674,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59528,1261 +59528,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 7135bfe..51d9590 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -6433,7 +6433,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:310
msgid "NAME"
msgstr "NOME"
@@ -6445,7 +6445,7 @@ msgstr "Aggiunge i contenuti del file all'indice"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "SINOSSI"
@@ -6467,7 +6467,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "DESCRIZIONE"
@@ -7181,7 +7181,7 @@ msgstr "modificando i contenuti del contesto o rimuovere le linee."
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "VEDERE ANCHE"
@@ -7193,13 +7193,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, fuzzy, priority:300
+#, fuzzy, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Parte del pacchetto linkgit:git[1]"
@@ -18719,7 +18719,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20744,19 +20744,19 @@ msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr "Confronta il contenuto e i mode dei blob trovati tramite due oggetti albero"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20765,25 +20765,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr "Confronta il contenuto e i mode dei blob trovati tramite due oggetti albero"
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20795,109 +20795,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "recurse into sub-trees"
msgstr "esegui ricorsivamente nei sottoalberi"
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21254,283 +21254,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21539,55 +21539,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21597,31 +21597,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21631,259 +21631,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21895,19 +21895,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21919,433 +21919,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "Commands"
msgstr "comando"
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22362,241 +22362,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22604,259 +22604,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22864,73 +22864,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22942,55 +22942,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22999,25 +22999,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -23025,19 +23025,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23047,43 +23047,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23091,31 +23091,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23125,25 +23125,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23153,19 +23153,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23173,31 +23173,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23205,67 +23205,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23273,283 +23273,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr "forza l'operazione"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "done"
msgstr "none"
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23558,49 +23558,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23620,7 +23620,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23629,7 +23629,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23640,13 +23640,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23661,13 +23661,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23676,19 +23676,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23703,307 +23703,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59565,1266 +59565,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr "Elenca i riferimenti in un repository remoto"
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr "agisci sui branch remoti tracciati"
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.ja.po b/po/documentation.ja.po
index a79d2d0..c5259d5 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.po
@@ -4,7 +4,19 @@
# Jean-No챘l AVILA <jn.avila@free.fr>, 2020.
#
msgid ""
-msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-04-09 23:15+0200\nPO-Revision-Date: 2022-04-22 18:27+0000\nLast-Translator: yajamon <yajamon.tatsuki@gmail.com>\nLanguage-Team: Japanese\nLanguage: ja\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.12.1-dev\n"
+msgstr ""
+"Project-Id-Version: git-manpages-l 10n\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2022-04-09 23:15+0200\n"
+"PO-Revision-Date: 2022-04-22 18:27+0000\n"
+"Last-Translator: yajamon <yajamon.tatsuki@gmail.com>\n"
+"Language-Team: Japanese\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.12.1-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:763 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:129 en/git-status.txt:31
@@ -4317,7 +4329,12 @@ msgid ""
"\tlinkgit:git-diff[1]. This is different from showing the log\n"
"\titself in raw format, which you can achieve with\n"
"\t`--format=raw`.\n"
-msgstr "\t�꾠궠�잆긿�덀겓�ㅳ걚�╉�걊aw壤℡폀�� diff �믢슴�ｃ겍鸚됪쎍��궢�욁꺁�쇈굮烏①ㅊ�쀣겲�쇻��\n\tlinkgit:git-diff[1]�� \"RAW OUTPUT FORMAT\" �삠궚�룔깾�녈굮\n\t�귞뀱�쀣겍�뤵걽�뺛걚�귙걪�뚣겘�곥꺆�계눎鵝볝굮raw壤℡폀��\n\t烏①ㅊ�쇻굥��겏��빊�ゃ굤�얇걲�귙걹��굠�녴겒�볝겏�믣츪�얇걲�뗣겓��\n\t`--format=raw` �ⓦ걮�얇걲��\n"
+msgstr ""
+"\t�꾠궠�잆긿�덀겓�ㅳ걚�╉�걊aw壤℡폀�� diff �믢슴�ｃ겍鸚됪쎍��궢�욁꺁�쇈굮烏①ㅊ�쀣겲�쇻��\n"
+"\tlinkgit:git-diff[1]�� \"RAW OUTPUT FORMAT\" �삠궚�룔깾�녈굮\n"
+"\t�귞뀱�쀣겍�뤵걽�뺛걚�귙걪�뚣겘�곥꺆�계눎鵝볝굮raw壤℡폀��\n"
+"\t烏①ㅊ�쇻굥��겏��빊�ゃ굤�얇걲�귙걹��굠�녴겒�볝겏�믣츪�얇걲�뗣겓��\n"
+"\t`--format=raw` �ⓦ걮�얇걲��\n"
#. type: Labeled list
#: en/diff-options.txt:142
@@ -4691,7 +4708,9 @@ msgstr "�얇걼�� `--raw` �� `--numstat` �뚧뙁若싥걬�뚣걼�닷릦�ャ겘�곥깙
msgid ""
"\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
"\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
-msgstr "\t`--raw`�� ` --numstat` �� `--name-only` �곥겲�잆겘 `--name-status` ��\n\t訝롢걟�됥굦�잌졃�덀�곥깙�밧릫�믡겇�뜰걬�싥�곩눣�쎼깢�ｃ꺖�ャ깋��탞塋�춴�첥UL�믢슴�ⓦ걮�얇걲��\n"
+msgstr ""
+"\t`--raw`�� ` --numstat` �� `--name-only` �곥겲�잆겘 `--name-status` ��\n"
+"\t訝롢걟�됥굦�잌졃�덀�곥깙�밧릫�믡겇�뜰걬�싥�곩눣�쎼깢�ｃ꺖�ャ깋��탞塋�춴�첥UL�믢슴�ⓦ걮�얇걲��\n"
#. type: Plain text
#: en/diff-options.txt:313 en/git-apply.txt:123
@@ -4753,7 +4772,9 @@ msgstr "�꿜퍡�띲겗藥�늽�믦〃鹽뷩걮�얇걲�� `--color` 竊덀겇�얇굤��'=<when
msgid ""
"\tIt can be changed by the `color.ui` and `color.diff`\n"
"\tconfiguration settings.\n"
-msgstr "\t�볝굦���� `color.ui` �� `color.diff` ��Þ若싥겓�덀겂��\n\t鸚됪쎍�㎯걤�얇걲��\n"
+msgstr ""
+"\t�볝굦���� `color.ui` �� `color.diff` ��Þ若싥겓�덀겂��\n"
+"\t鸚됪쎍�㎯걤�얇걲��\n"
#. type: Labeled list
#: en/diff-options.txt:345 en/git-branch.txt:146 en/git-grep.txt:196 en/git-show-branch.txt:124
@@ -4804,7 +4825,10 @@ msgid ""
"\tThe <mode> defaults to 'no' if the option is not given\n"
"\tand to 'zebra' if the option with no mode is given.\n"
"\tThe mode must be one of:\n"
-msgstr "\t�ゃ깤�룔깾�녈걹��굚��걣�뉐츣�뺛굦�╉걚�ゃ걚�닷릦��<mode> ��깈�뺛궔�ャ깉�� 'no' �㎯걗�듽��\n\t�ゃ깤�룔깾�녈겓�㏂꺖�됥걣�뉐츣�뺛굦�╉걚�ゃ걚�닷릦�� 'zebra' �ャ겒�듽겲�쇻��\n\t�㏂꺖�됥겘餓δ툔��걚�싥굦�뗣겎�ゃ걨�뚣겙�ゃ굤�얇걵�볝��\n"
+msgstr ""
+"\t�ゃ깤�룔깾�녈걹��굚��걣�뉐츣�뺛굦�╉걚�ゃ걚�닷릦��<mode> ��깈�뺛궔�ャ깉�� 'no' �㎯걗�듽��\n"
+"\t�ゃ깤�룔깾�녈겓�㏂꺖�됥걣�뉐츣�뺛굦�╉걚�ゃ걚�닷릦�� 'zebra' �ャ겒�듽겲�쇻��\n"
+"\t�㏂꺖�됥겘餓δ툔��걚�싥굦�뗣겎�ゃ걨�뚣겙�ゃ굤�얇걵�볝��\n"
#. type: Labeled list
#: en/diff-options.txt:362 en/diff-options.txt:404
@@ -6433,7 +6457,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NAME"
@@ -6445,7 +6469,7 @@ msgstr "git-add - Add file contents to the index"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "礖귟쫨"
@@ -6467,7 +6491,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "沃ф삇"
@@ -7181,7 +7205,7 @@ msgstr "�녈꺍�녴궘�밤깉��냵若밤굮鸚됪쎍�귙걮�뤵겘烏뚣겗�딃솮"
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "���ｉ쟿��"
@@ -7193,13 +7217,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Part of the linkgit:git[1] suite"
@@ -14619,7 +14643,16 @@ msgid ""
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
"\t [--filter=<filter> [--also-filter-submodules]] [--] <repository>\n"
"\t [<directory>]\n"
-msgstr "'git clone' [--template=<template-directory>]\n\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n\t [--dissociate] [--separate-git-dir <git-dir>]\n\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t [--filter=<filter> [--also-filter-submodules]] [--] <repository>\n\t [<directory>]\n"
+msgstr ""
+"'git clone' [--template=<template-directory>]\n"
+"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n"
+"\t [--dissociate] [--separate-git-dir <git-dir>]\n"
+"\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n"
+"\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n"
+"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
+"\t [--filter=<filter> [--also-filter-submodules]] [--] <repository>\n"
+"\t [<directory>]\n"
#. type: Plain text
#: en/git-clone.txt:30
@@ -18703,7 +18736,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20728,19 +20761,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20749,25 +20782,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20779,109 +20812,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21237,283 +21270,283 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21522,55 +21555,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21580,31 +21613,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21614,259 +21647,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21878,19 +21911,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21902,433 +21935,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]�믣뢿��"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr "`rfc2822`"
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22345,241 +22378,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22587,259 +22620,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22847,73 +22880,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22925,55 +22958,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22982,25 +23015,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -23008,19 +23041,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23030,43 +23063,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23074,31 +23107,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23108,25 +23141,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23136,19 +23169,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23156,31 +23189,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23188,67 +23221,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23256,283 +23289,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23541,49 +23574,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23603,7 +23636,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23612,7 +23645,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23623,13 +23656,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23644,13 +23677,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23659,19 +23692,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23686,307 +23719,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -30769,7 +30802,11 @@ msgid ""
"\t [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
"\t [-b <branch-name> | --initial-branch=<branch-name>]\n"
"\t [--shared[=<permissions>]] [<directory>]\n"
-msgstr "'git init' [-q | --quiet] [--bare] [--template=<template-directory>]\n\t [--separate-git-dir <git-dir>] [--object-format=<format>]\n\t [-b <branch-name> | --initial-branch=<branch-name>]\n\t [--shared[=<permissions>]] [<directory>]\n"
+msgstr ""
+"'git init' [-q | --quiet] [--bare] [--template=<template-directory>]\n"
+"\t [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
+"\t [-b <branch-name> | --initial-branch=<branch-name>]\n"
+"\t [--shared[=<permissions>]] [<directory>]\n"
#. type: Plain text
#: en/git-init.txt:26
@@ -59534,1261 +59571,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr "<<def_head,head>> �ⓨ릪獰⒲겎�쇻��"
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr "<<def_object_name,object name>> �ⓨ릪獰⒲��"
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr "<<def_commit,commit>> (�띹찠) �ⓨ릪獰⒲겎�쇻��"
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index 2047bee..34e19c5 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -6398,7 +6398,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "�대쫫"
@@ -6410,7 +6410,7 @@ msgstr "git-add - �뚯씪 �댁슜�ㅼ쓣 �몃뜳�ㅼ뿉 異붽��⑸땲��"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "�쒕냹�쒖뒪"
@@ -6432,7 +6432,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "�ㅻ챸"
@@ -7122,7 +7122,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7134,13 +7134,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18635,7 +18635,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20660,19 +20660,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20681,25 +20681,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20711,109 +20711,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21170,283 +21170,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21455,55 +21455,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21513,31 +21513,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21547,259 +21547,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21811,19 +21811,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21835,433 +21835,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22278,241 +22278,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22520,259 +22520,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22780,73 +22780,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22858,55 +22858,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22915,25 +22915,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22941,19 +22941,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22963,43 +22963,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23007,31 +23007,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23041,25 +23041,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23069,19 +23069,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23089,31 +23089,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23121,67 +23121,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23189,283 +23189,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23474,49 +23474,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23536,7 +23536,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23545,7 +23545,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23556,13 +23556,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23577,13 +23577,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23592,19 +23592,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23619,307 +23619,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59460,1261 +59460,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index 38e84b4..0eb8ae8 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -6398,7 +6398,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "西ⓣㅎ西�"
@@ -6410,7 +6410,7 @@ msgstr "git-add - 西ⓣㅏ西겯쪓西╆쪍西뜩ㅎ西귖쨻西약ㄴ 西ムㅎ西댽ㅂ 西멘ㅎ西�쨽
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "西멘ㅎ西겯ㅎ西귖ㅆ"
@@ -6427,7 +6427,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "西듀ㅀ誓띭ㄳ西�"
@@ -7117,7 +7117,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7129,13 +7129,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18630,7 +18630,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20655,19 +20655,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20676,25 +20676,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20706,109 +20706,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21165,283 +21165,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21450,55 +21450,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21508,31 +21508,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21542,259 +21542,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21806,19 +21806,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21830,433 +21830,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22273,241 +22273,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22515,259 +22515,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22775,73 +22775,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22853,55 +22853,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22910,25 +22910,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22936,19 +22936,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22958,43 +22958,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23002,31 +23002,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23036,25 +23036,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23064,19 +23064,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23084,31 +23084,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23116,67 +23116,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23184,283 +23184,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23469,49 +23469,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23531,7 +23531,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23540,7 +23540,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23551,13 +23551,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23572,13 +23572,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23587,19 +23587,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23614,307 +23614,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59455,1266 +59455,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index e301c25..1d8070d 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -6398,7 +6398,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr ""
@@ -6410,7 +6410,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr ""
@@ -6427,7 +6427,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr ""
@@ -7118,7 +7118,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7130,13 +7130,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18636,7 +18636,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20661,19 +20661,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20682,25 +20682,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20712,109 +20712,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21171,283 +21171,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21456,55 +21456,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21514,31 +21514,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21548,259 +21548,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21812,19 +21812,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21836,433 +21836,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22279,241 +22279,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22521,259 +22521,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22781,73 +22781,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22859,55 +22859,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22916,25 +22916,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22942,19 +22942,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22964,43 +22964,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23008,31 +23008,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23042,25 +23042,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23070,19 +23070,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23090,31 +23090,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23122,67 +23122,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23190,283 +23190,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23475,49 +23475,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23537,7 +23537,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23546,7 +23546,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23557,13 +23557,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23578,13 +23578,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23593,19 +23593,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23620,307 +23620,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59475,1266 +59475,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index b9cd2f4..807356c 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -6399,7 +6399,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NAAM"
@@ -6411,7 +6411,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr ""
@@ -6428,7 +6428,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "BESCHRIJVING"
@@ -7125,7 +7125,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7137,13 +7137,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18650,7 +18650,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20675,19 +20675,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20696,25 +20696,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20726,109 +20726,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21185,283 +21185,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21470,55 +21470,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21528,31 +21528,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21562,259 +21562,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21826,19 +21826,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21850,433 +21850,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22293,241 +22293,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22535,259 +22535,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22795,73 +22795,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22873,55 +22873,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22930,25 +22930,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22956,19 +22956,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22978,43 +22978,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23022,31 +23022,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23056,25 +23056,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23084,19 +23084,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23104,31 +23104,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23136,67 +23136,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23204,283 +23204,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23489,49 +23489,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23551,7 +23551,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23560,7 +23560,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23571,13 +23571,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23592,13 +23592,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23607,19 +23607,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23634,307 +23634,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59600,1266 +59600,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 6f802db..85ac47e 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -6399,7 +6399,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NAZWA"
@@ -6411,7 +6411,7 @@ msgstr "git-add - Dodaj zawarto힄훶 pliku do indeksu"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "STRESZCZENIE"
@@ -6439,7 +6439,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "OPIS"
@@ -7129,7 +7129,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "ZOBACZ TAK탈E"
@@ -7141,13 +7141,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18654,7 +18654,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20679,19 +20679,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20700,25 +20700,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20730,109 +20730,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21192,283 +21192,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21477,55 +21477,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21535,31 +21535,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21569,259 +21569,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21833,19 +21833,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21857,433 +21857,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22300,241 +22300,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22542,259 +22542,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22802,73 +22802,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22880,55 +22880,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22937,25 +22937,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22963,19 +22963,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22985,43 +22985,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23029,31 +23029,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23063,25 +23063,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23091,19 +23091,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23111,31 +23111,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23143,67 +23143,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23211,283 +23211,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23496,49 +23496,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23558,7 +23558,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23567,7 +23567,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23578,13 +23578,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23599,13 +23599,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23614,19 +23614,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23641,307 +23641,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59521,1266 +59521,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 87a0295..41ea5dd 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -3,7 +3,18 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
-msgstr "Report-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-04-09 23:15+0200\nPO-Revision-Date: 2022-04-23 10:14+0000\nLast-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\nLanguage-Team: none\nLanguage: pt_BR\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.12.1-dev\n"
+msgstr ""
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2022-04-09 23:15+0200\n"
+"PO-Revision-Date: 2022-04-23 10:14+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
+"Language-Team: none\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"
+"X-Generator: Weblate 4.12.1-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:763 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:129 en/git-status.txt:31
@@ -2760,7 +2771,14 @@ msgid ""
"\tpath = foo.inc\n"
"[remote \"origin\"]\n"
"\turl = https://example.com/git\n"
-msgstr "; inclua apenas caso exista um ramo remoto com a URL fornecida (observe\n; que tal URL pode ser fornecida posteriormente num arquivo ou num\n; arquivo lido ap처s este arquivo ser lido, como visto neste exemplo)\n[includeIf \"hasconfig:remote.*.url:https://example.com/**\"]\n\tpath = foo.inc\n[remote \"origin\"]\n\turl = https://example.com/git\n"
+msgstr ""
+"; inclua apenas caso exista um ramo remoto com a URL fornecida (observe\n"
+"; que tal URL pode ser fornecida posteriormente num arquivo ou num\n"
+"; arquivo lido ap처s este arquivo ser lido, como visto neste exemplo)\n"
+"[includeIf \"hasconfig:remote.*.url:https://example.com/**\"]\n"
+"\tpath = foo.inc\n"
+"[remote \"origin\"]\n"
+"\turl = https://example.com/git\n"
#. type: Title ~
#: en/config.txt:267
@@ -6498,7 +6516,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NOME"
@@ -6510,7 +6528,7 @@ msgstr "git-add - Adicione o conte첬do do arquivo ao 챠ndice"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "RESUMO"
@@ -6532,7 +6550,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "DESCRI횉횄O"
@@ -7246,7 +7264,7 @@ msgstr "modificando o conte첬do do contexto ou as linhas de remo챌찾o"
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "VEJA TAMB횋M"
@@ -7258,13 +7276,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Parte do conjunto linkgit:git[1]"
@@ -10212,7 +10230,23 @@ msgid ""
"'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
"'git branch' (-d | -D) [-r] <branchname>...\n"
"'git branch' --edit-description [<branchname>]\n"
-msgstr "'git branch' [--color[=<quando>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<op챌천es>] | --no-column] [--sort=<chaves>]\n\t[--merged [<commit>]] [--no-merged [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <objeto>] [--format=<formato>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<padr찾o>...]\n'git branch' [--track[=(direct|inherit)] | --no-track] [-f]\n\t[--recurse-submodules] <nome-do-ramo> [<ponto-de-partida>]\n'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]\n'git branch' --unset-upstream [<nome-do-ramo>]\n'git branch' (-m | -M) [<ramo-antigo>] <nome-do-ramo>\n'git branch' (-c | -C) [<ramo-antigo>] <novo-ramo>\n'git branch' (-d | -D) [-r] <nome-do-ramo>...\n'git branch' --edit-description [<nome-do-ramo>]\n"
+msgstr ""
+"'git branch' [--color[=<quando>] | --no-color] [--show-current]\n"
+"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
+"\t[--column[=<op챌천es>] | --no-column] [--sort=<chaves>]\n"
+"\t[--merged [<commit>]] [--no-merged [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
+"\t[--points-at <objeto>] [--format=<formato>]\n"
+"\t[(-r | --remotes) | (-a | --all)]\n"
+"\t[--list] [<padr찾o>...]\n"
+"'git branch' [--track[=(direct|inherit)] | --no-track] [-f]\n"
+"\t[--recurse-submodules] <nome-do-ramo> [<ponto-de-partida>]\n"
+"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]\n"
+"'git branch' --unset-upstream [<nome-do-ramo>]\n"
+"'git branch' (-m | -M) [<ramo-antigo>] <nome-do-ramo>\n"
+"'git branch' (-c | -C) [<ramo-antigo>] <novo-ramo>\n"
+"'git branch' (-d | -D) [-r] <nome-do-ramo>...\n"
+"'git branch' --edit-description [<nome-do-ramo>]\n"
#. type: Plain text
#: en/git-branch.txt:37
@@ -11546,7 +11580,15 @@ msgid ""
"\t [--textconv | --filters]\n"
"'git cat-file' (--textconv | --filters)\n"
"\t [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]\n"
-msgstr "'git cat-file' <tipo> <objeto>\n'git cat-file' (-e | -p) <objeto>\n'git cat-file' (-t | -s) [--allow-unknown-type] <objeto>\n'git cat-file' (--batch | --batch-check) [--batch-all-objects]\n\t [--buffer] [--follow-symlinks] [--unordered]\n\t [--textconv | --filters]\n'git cat-file' (--textconv | --filters)\n\t [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]\n"
+msgstr ""
+"'git cat-file' <tipo> <objeto>\n"
+"'git cat-file' (-e | -p) <objeto>\n"
+"'git cat-file' (-t | -s) [--allow-unknown-type] <objeto>\n"
+"'git cat-file' (--batch | --batch-check) [--batch-all-objects]\n"
+"\t [--buffer] [--follow-symlinks] [--unordered]\n"
+"\t [--textconv | --filters]\n"
+"'git cat-file' (--textconv | --filters)\n"
+"\t [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]\n"
#. type: Plain text
#: en/git-cat-file.txt:27
@@ -12688,7 +12730,13 @@ msgid ""
"\t\t [--ignore-skip-worktree-bits]\n"
"\t\t [-z] [--stdin]\n"
"\t\t [--] [<file>...]\n"
-msgstr "'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<texto>]\n\t\t [--stage=<n첬mero>|all]\n\t\t [--temp]\n\t\t [--ignore-skip-worktree-bits]\n\t\t [-z] [--stdin]\n\t\t [--] [<arquivo>...]\n"
+msgstr ""
+"'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<texto>]\n"
+"\t\t [--stage=<n첬mero>|all]\n"
+"\t\t [--temp]\n"
+"\t\t [--ignore-skip-worktree-bits]\n"
+"\t\t [-z] [--stdin]\n"
+"\t\t [--] [<arquivo>...]\n"
#. type: Plain text
#: en/git-checkout-index.txt:23
@@ -15007,7 +15055,16 @@ msgid ""
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
"\t [--filter=<filter> [--also-filter-submodules]] [--] <repository>\n"
"\t [<directory>]\n"
-msgstr "'git clone' [--template=<diret처rio-modelo>]\n\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t [-o <nome>] [-b <nome>] [-u <upload-pack>] [--reference <reposit처rio>]\n\t [--dissociate] [--separate-git-dir <dir-git>]\n\t [--depth <profundidade>] [--[no-]single-branch] [--no-tags]\n\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t [--filter=<filtro>] [--also-filter-submodules]] [--] <reposit처rio>\n\t [<diret처rio>]\n"
+msgstr ""
+"'git clone' [--template=<diret처rio-modelo>]\n"
+"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t [-o <nome>] [-b <nome>] [-u <upload-pack>] [--reference <reposit처rio>]\n"
+"\t [--dissociate] [--separate-git-dir <dir-git>]\n"
+"\t [--depth <profundidade>] [--[no-]single-branch] [--no-tags]\n"
+"\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n"
+"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
+"\t [--filter=<filtro>] [--also-filter-submodules]] [--] <reposit처rio>\n"
+"\t [<diret처rio>]\n"
#. type: Plain text
#: en/git-clone.txt:30
@@ -19241,7 +19298,7 @@ msgstr "Voc챗 pode especificar uma lista de diret처rios permitidos. Caso nenhum
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr "LIMITA횉횛ES"
@@ -21335,19 +21392,19 @@ msgstr "Obter e definir as op챌천es globais ou as de reposit처rio"
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr "git-diff-tree - Compara o conte첬do e o modo das bolhas encontradas atrav챕s de dois objetos 찼rvore"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -21359,25 +21416,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr "Compara o conte첬do e o modo das bolhas encontrados por meio de dois objetos 찼rvore."
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr "Caso haja apenas uma <찼rvore> informada, o commit ser찼 comparado com as suas ra챠zes (consulte `--stdin` abaixo)."
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr "Observe que 'git diff-tree' pode usar a 찼rvore encapsulada num objeto commit."
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr "A identifica챌찾o de um objeto 찼rvore."
@@ -21389,109 +21446,109 @@ msgstr "<caminho>..."
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr "Caso seja utilizado, os resultados ser찾o limitados a um subconjunto de arquivos que coincidam a um dos `pathspecs` utilizados."
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr "recurs찾o em sub-찼rvores"
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr "exiba a pr처pria entrada da 찼rvore e suas sub찼rvores. Implica no uso da op챌찾o `-r`."
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr "Quando `--root` 챕 utilizado o commit inicial ser찼 exibido como um grande evento de cria챌찾o. Isso 챕 o equivalente a um `diff` na 찼rvore `NULL`."
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr "Em vez de comparar as <찼rvore>s diretamente, use a mesclagem base entre as duas <찼rvores>s como o lado \"antes\". Devem haver duas <찼rvore>s informadas e o commit deve ser feito em ambas."
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr "Quando a op챌찾o `--stdin` 챕 utilizada, o comando n찾o obt챕m os argumentos da `<찼rvore>` atrav챕s da linha de comando. Em vez disso ele l챗 as linhas contendo duas `<찼rvores>`, um `<commit>` ou uma lista de `<commit>` da sua entrada padr찾o. (Utilize um 첬nico espa챌o como separador.)"
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr "Quando duas 찼rvores s찾o informadas, 챕 feita uma compara챌찾o entre a primeira e a segunda. Quando um 첬nico commit 챕 dado, ele compara o commit com as suas origens. Os commits restantes, quando informados, s찾o utilizados como se fossem as origens do primeiro commit."
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr "Ao comparar duas 찼rvores, o ID de ambas (separado por um espa챌o e finalizado por uma nova linha) 챕 impressa antes da diferen챌a. Ao comparar os commits, o ID do primeiro (ou do 첬nico) commit ser찼 impresso seguido por uma nova linha."
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr "As seguintes op챌천es afetam ainda mais o comportamento durante a compara챌찾o dos commits (mas n찾o as 찼rvores)."
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr "횋 predefinido que `git diff-tree --stdin` n찾o exiba as diferen챌as para os commits que forem mesclados. Com esta op챌찾o as diferen챌as s찾o exibidas no commit de todas as suas origens. Consulte tamb챕m `-c`."
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr "횋 predefinido que `git diff-tree --stdin` exiba as diferen챌as, seja na forma leg챠vel por m찼quina (sem `-p`) ou em formato patch (com `-p`). Esta sa챠da pode ser suprimida. S처 챕 첬til se for sinalizado com a op챌찾o`-v`."
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr "Essa sinaliza챌찾o faz com que o `git diff-tree --stdin` tamb챕m exiba a mensagem do commit antes das diferen챌as."
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr "o `git diff-tree` gera uma linha com o ID do commit, quando for aplic찼vel. Essa sinaliza챌찾o suprimiu o ID de sa챠da do commit."
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr "Esta op챌찾o altera a maneira como um commit mesclado 챕 exibido (o que significa que 챕 첬til apenas quando o comando recebe uma <찼rvore>, ou `--stdin`). Exibe as diferen챌as de cada um das origens simultaneamente para o resultado da mesclagem em vez de exibir a diferen챌a dos pares entre as origens e o resultado, um de cada vez (que 챕 o que a op챌찾o `-m` faz). Al챕m disso, lista apenas os arquivos que foram modificados vindo de todas as origens."
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr "Esta op챌찾o altera a maneira como um patch para a mesclagem de um commit 챕 exibido, de uma maneira semelhante 횪 op챌찾o `-c`. Implica na utiliza챌찾o das op챌천es `-c` e `-p`, comprime ainda mais o patch gerado ao omitir os peda챌os que n찾o interessam, cujo conte첬do nas origens tenham apenas duas variantes e o resultado da mesclagem escolha uma delas sem qualquer modifica챌찾o. Quando n찾o h찼 interesse em todos os blocos, o pr처prio commit e a mensagem do registro log n찾o s찾o exibidas, como em qualquer outro caso de um \"diff vazio\"."
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr "Esta op챌찾o faz com que os diffs combinados (usados para a mesclagem dos commits) listem o nome do arquivo de todos os pais. Dessa forma, s처 tem efeito quando `-c` ou `-cc` s찾o utilizados e provavelmente 챕 첬til apenas caso as altera챌천es no nome do arquivo sejam detectados (ou seja, quando a renomea챌찾o ou a detec챌찾o da c처pia forem solicitadas)."
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr "Exibe o pr처prio commit com a mensagem do registro log do commit, mesmo que o `diff` esteja vazio."
@@ -21867,283 +21924,283 @@ msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcor
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr "git-fast-export - Exportador de dados do Git"
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr "'git fast-export [<op챌천es>]' | 'git fast-import'\n"
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr "Este programa despeja as revis천es informadas num formato adequado para ser canalizado para o 'git fast-import'."
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr "Voc챗 pode us찼-lo como uma reposi챌찾o leg챠vel do pacote (consulte linkgit:git-bundle[1]) ou como um formato que pode ser editado antes que possa ser enviado ao 'git fast import' para fazer a reescrita no hist처rico (uma habilidade dependente das ferramentas como 'git filter-repo')."
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr "--progress = <n>"
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr "Insira instru챌천es de 'progresso' em todos os objetos `<n>` a serem exibidos por 'git fast-import' durante a importa챌찾o."
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr "Determine como lidar com tags assinadas. Como qualquer transforma챌찾o ap처s a exporta챌찾o pode alterar os nomes das tags (o que tamb챕m pode acontecer ao excluir as revis천es) e as assinaturas n찾o coincidentes."
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr "Ao pedir para abortar 'abort' (que 챕 o padr찾o), este programa ser찼 terminado ao encontrar uma tag assinada. Com `strip`, as tags ser찾o silenciosamente perder찾o a assinatura, com `warn strip` elas tamb챕m perder찾o a assinatura, por챕m um aviso ser찼 exibido, com `verbatim`, elas ser찾o exportadas silenciosamente e com `warn`, elas ser찾o exportadas , por챕m voc챗 ser찼 avisado."
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr "--tag-of-filtered-object=(abort|drop|rewrite)"
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr "Determina como manipular as tags cujo objeto marcado seja filtrado. Como as revis천es e os arquivos a serem exportados podem ser limitados pelo caminho, os objetos marcados podem ser filtrados por completo."
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr "Ao pedir para abortar 'abort' (que 챕 o predefinido), este programa ser찼 terminado ao encontrar tal tag. Com 'drop' estas op챌천es ser찾o omitidas da sa챠da. Com 'rewrite', caso o objeto marcado seja um commit, a tag ser찼 reescrita para marcar a tag de um commit anterior (atrav챕s da reescrita da origem; consulte linkgit:git-rev-list[1])"
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr "Detecta a a챌찾o de copiar e mover como descrito na p찼gina do manual linkgit:git-diff[1], utilize-o para gerar comandos de copiar e renomear na sa챠da."
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr "Observe que as vers천es anteriores deste comando n찾o reclamavam e produziam resultados incorretos caso essas op챌천es fossem utilizadas."
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr "--export-marks=<arquivo>"
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr "Despeja a tabela de marca챌천es internas no <arquivo> quando for conclu챠da. Linha a linha as marca챌천es s찾o escritas, como `:markid SHA-1`. Somente as marca챌천es para as revis천es s찾o despejadas; as marca챌천es das bolhas s찾o ignoradas. Os processos internos podem usar esse arquivo para validar as importa챌천es depois que forem conclu챠das ou para salvar a tabela das marca챌천es nas execu챌천es incrementais. Como o <arquivo> s처 챕 aberto e truncado na conclus찾o, o mesmo caminho tamb챕m pode ser passado com seguran챌a para a op챌찾o `--import-marks`. O arquivo n찾o ser찼 gravado caso nenhum novo objeto tenha sido marcado/exportado."
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr "--import-marks=<arquivo>"
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr "Antes de processar qualquer entrada, carregue as marca챌천es usadas no <arquivo>. O arquivo de entrada deve existir, ser leg챠vel e usar o mesmo formato produzido por `--export-marks`."
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr "Al챕m de rotular as bolhas e fazer os commits com os IDs das marca챌천es, e tamb챕m rotulando as tags. 횋 첬til em conjunto com a op챌찾o `--export-marks` e `--import-marks`, tamb챕m 챕 첬til (e necess찼rio) para a exporta챌찾o das tags aninhadas. N찾o prejudica os outros casos e seria a predefini챌찾o, por챕m muitos frontends de importa챌찾o r찼pida (fast-import) n찾o est찾o preparados para aceitar as tags com identificadores de marca챌찾o."
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr "Quaisquer commits (ou tags) que j찼 foram marcadas n찾o ser찾o exportadas novamente. Caso a estrutura utilize um arquivo '--import-marks' semelhante, isto permitir찼 a exporta챌찾o bidirecional e incremental do reposit처rio, mantendo as marcas iguais durante as execu챌천es."
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr "Alguns reposit처rios antigos t챗m tags sem um etiquetador. O protocolo de importa챌찾o r찼pida era bastante rigoroso quanto isso. Ent찾o, falsifique um etiquetador para poder importar rapidamente a sa챠da."
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr "Inicie o fluxo com uma sub-rotina 'feature done' e finalize-o com um comando 'done'."
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr "Ignore a sa챠da dos objetos bolha e, em vez disso, consulte as bolhas por meio do hash SHA-1 original. Isso 챕 첬til durante a reescrita da estrutura dos diret처rios ou do hist처rico de um reposit처rio sem tocar no conte첬do individual dos arquivos. Observe que o fluxo resultante pode ser utilizado apenas por um reposit처rio que j찼 contenha os objetos necess찼rios."
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr "Essa op챌찾o far찼 com que a exporta챌찾o r찼pida emita uma diretiva \"deleteall\" (apague todos) para cada commit seguida por uma lista completa de todos os arquivos no commit (em vez de apenas listar os arquivos diferentes do primeiro commit)."
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr "Torne os conte첬dos do reposit처rio, an척nimo, mantendo a forma do hist처rico e da 찼rvore armazenada. Veja a se챌찾o `ANONIMIZANDO` abaixo."
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr "--anonymize-map=<a-partir-de>[:<para>]"
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr "Converta o token `<a-partir-de>` para `<para>` na sa챠da an척nima. Caso `<para>` seja omitido, mapeie `<a-partir-de>` para si mesmo (ou seja, n찾o anonimamente). Consulte a se챌찾o 'ANONIMIZANDO` abaixo."
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr "횋 predefinido que ao executar um comando como `git fast-export master~5..master` n찾o incluir찼 o commit 'master{tilde}5' e far찼 com que o 'master{tilde}4' n찾o tenha mais o 'master{tilde}5' como parente (embora ambos o antigo 'master{tilde}4' e o novo 'master{tilde}4' tenham todos os mesmos arquivos). Utilize a op챌찾o `--reference-exclusive-parents` para que o fluxo se refira aos commits no intervalo exclu챠do do hist처rico pelo sha1sum. Observe que o fluxo resultante pode ser utilizado apenas por um reposit처rio que j찼 contenha os parentes dos commits necess찼rios."
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr "Inclua uma diretiva extra para os commits que forem gerados e as bolhas, `original-oid <SHA1SUM>`. Embora estas diretivas provavelmente sejam ignoradas pelos importadores, como o comando `git-fast-import`, pode ser 첬til para os filtros intermedi찼rios (para reescrever mensagens do commit que se referem aos commits mais antigos ou para remover as bolhas atrav챕s de uma ID por exemplo)."
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr "--reencode=(yes|no|abort)"
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr "Especifique como manipular o cabe챌alho `encoding` nos objetos commit. Ao pedir para abortar 'abort' (que 챕 a predefini챌찾o), este programa ser찼 terminado ao encontrar tal objeto que foi feito o commit. Com 'yes', a mensagem do commit ser찼 re-codificada para UTF-8. Com 'no', a codifica챌찾o original ser찼 preservada."
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr "Aplique o `refspec` especificado a cada \"ref\" exportado. V찼rios deles podem ser especificados."
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr "[<git-rev-list-args>...]"
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr "Uma lista de argumentos aceit찼veis para o 'git rev-parse' e 'git rev-list', que especifica os objetos e refer챗ncias para serem exportadas. Por exemplo, `master~10..master` faz com que a refer챗ncia principal atual seja exportada junto com todos os objetos adicionados desde o seu d챕cimo commit ancestral e (a menos que a op챌찾o `--reference-exclusive-parents` esteja usada) todos os arquivos comuns a master{tilde}9 e master{tilde}10."
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr "Isso exportar찼 o reposit처rio inteiro e importar찼 para o reposit처rio vazio existente. Exceto para re-codificar os commits que n찾o estejam como UTF-8, seria um c처pia um para um."
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -22155,55 +22212,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr "Isso cria um novo ramo chamado 'other' de 'master~5..master' (ou seja, caso 'master' tenha um hist처rico linear, ser찾o necess찼rios ent찾o os 첬ltimos 5 commits)."
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr "Observe que isso pressup천e que nenhuma das bolhas e as mensagens dos commits referenciadas por esse intervalo de revis찾o, contenha a sequ챗ncia `refs/heads/master`."
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr "ANONIMIZANDO"
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr "Caso a op챌찾o `--anonymize` seja utilizada, o git tentar찼 remover todas as informa챌천es de identifica챌찾o do reposit처rio, mantendo ainda o suficiente da 찼rvore original e dos padr천es do hist처rico para reproduzir alguns bugs. O objetivo 챕 que um bug do git encontrado num reposit처rio privado persista no reposit처rio anonimizado e este 첬ltimo pode ser compartilhado com os desenvolvedores do git para ajudar na resolu챌찾o do problema."
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr "Com esta op챌찾o, o git substituir찼 todos os `refnames`, os caminhos, o conte첬do da bolha, o commit, a tag das mensagens, os nomes e os endere챌os de e-mail que forem gerados atrav챕s de dados an척nimos. As duas inst창ncias da mesma sequ챗ncia ser찾o substitu챠das de forma equivalente (dois commits com o mesmo autor ir찾o gerar o mesmo autor an척nimo, por챕m n찾o ter찾o nenhuma semelhan챌a com a sequ챗ncia do autor original por exemplo). O relacionamento entre os commits, as ramifica챌천es e as tags ser찼 mantido, bem como o registro de data e hora dos commits (menos as mensagens dos commits e os `refnames` que n찾o tenham nenhuma semelhan챌a com os originais). A composi챌찾o relativa da 찼rvore 챕 mantida (caso tenha uma 찼rvore raiz com 10 arquivos e 3 찼rvores, assim tamb챕m ser찼 gerado por exemplo), por챕m os seus nomes e o conte첬do dos arquivos ser찾o substitu챠dos."
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr "Caso acredite que tenha encontrado um bug no git, pode come챌ar exportando um fluxo anonimizado de todo o reposit처rio:"
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr "$ git fast-export --anonymize --all >anon-stream\n"
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr "Em seguida, confirme se o bug persiste num reposit처rio criado a partir desse fluxo (muitos erros n찾o, pois eles realmente dependem do conte첬do exato do reposit처rio):"
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -22217,31 +22274,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr "Caso o reposit처rio anonimizado exiba o erro, pode valer a pena compartilhar o `anon-stream` junto com um relat처rio de erro tradicional. Observe que o fluxo anonimizado 챕 muito bem compactado, portanto a sua compacta챌찾o gzip 챕 altamente recomend찼vel. Caso deseje examinar o fluxo para ver se n찾o cont챕m dados particulares, 챕 poss챠vel examin찼-lo diretamente antes de enviar. Tamb챕m 챕 poss챠vel tentar:"
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr "que exiba todas as linhas exclusivas (com n첬meros convertidos em \"X\", para recolher o \"Usu찼rio 0\", \"Usu찼rio 1\" etc. em \"Usu찼rio X\"). Isso produz uma sa챠da muito menor e geralmente 챕 de r찼pida confirma챌찾o j찼 que n찾o h찼 dados privados no fluxo."
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr "A reprodu챌찾o de alguns bugs pode exigir a refer챗ncia para alguns commits em particular ou caminhos espec챠ficos, o que se torna desafiador depois que os refnames e os caminhos sejam anonimizados. 횋 poss챠vel solicitar que um token em espec챠fico seja deixado como est찼 ou seja mapeado para um novo valor. Como por exemplo, caso tenha um bug que seja reproduzido com o comando `git rev-list sensitive -- secret.c`, 챕 poss챠vel executar:"
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -22255,259 +22312,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr "Depois de importar o fluxo, 챕 poss챠vel ent찾o executar o commando `git rev-list foo -- bar.c` no reposit처rio anonimizado."
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr "Observe que os caminhos e os nomes s찾o divididos em tokens nos limites do corte. O comando acima iria anonimizar `subdir/secret.c` para algo como `path123/bar.c`; seria poss챠vel ent찾o procurar por `bar.c` no reposit처rio anonimizado para determinar o caminho final."
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr "Para tornar mais simples a refer챗ncia ao pathname (nome do caminho), 챕 poss챠vel mapear cada componente do caminho; ent찾o, caso tamb챕m anonimize o `subdir` para `publicdir`, ent찾o o nome final do caminho seria `publicdir/bar.c`."
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr "Como 'git fast-import' n찾o pode marcar as 찼rvores, voc챗 n찾o poder찼 exportar o reposit처rio linux.git completamente pois ele cont챕m uma marca que faz refer챗ncia a uma 찼rvore em vez de um commit."
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr "git-fast-import - Estrutura para os importadores de dados r찼pidos do Git"
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr "frontend | 'git fast-import' [<op챌천es>]\n"
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr "Este programa geralmente n찾o 챕 o que o usu찼rio final deseja executar diretamente. A maioria dos usu찼rios finais deseja usar um dos programas front-end j찼 existentes, que analisa um tipo espec챠fico de fonte estrangeira e alimenta o conte첬do armazenado l찼 para 'git fast-import'."
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr "O `fast-import` l챗 um fluxo misto de comandos e dados na entrada padr찾o e grava um ou mais pacote de arquivos diretamente no reposit처rio atual. Quando um \"EOF\" 챕 recebido na entrada padr찾o, a importa챌찾o r찼pida grava as refer챗ncias atualizadas das ramifica챌천es e tags, atualizando completamente o reposit처rio atual com os dados importados recentemente."
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr "A estrutura `fast-import` em si pode importar para um reposit처rio vazio (um que j찼 foi inicializado por 'git init') ou atualizar de forma incremental num reposit처rio preenchido j찼 existente. Caso as importa챌천es incrementais sejam ou n찾o compat챠veis com determinada fonte estrangeira espec챠fica, isso vai depender do programa de front-end utilizado."
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr "Impor a atualiza챌찾o das ramifica챌천es existentes que foram alteradas , ainda que os commits sejam perdidos (como um novo commit que n찾o contenha o commit antigo)."
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr "Desative a sa챠da exibida por `--stats`, fazendo com que o `fast-import` seja silenciado quando for bem-sucedido. No entanto, caso o fluxo de importa챌찾o tenha diretivas destinadas a exibir a sa챠da do usu찼rio (diretivas `progress` por exemplo), as mensagens coincidentes ainda ser찾o exibidas."
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr "Exiba algumas estat챠sticas b찼sicas sobre os objetos que a importa챌찾o r찼pida criou, os arquivos do pacote em que foram armazenados e a mem처ria utilizado por `fast-import` durante essa execu챌찾o. 횋 predefinido que esta sa챠da seja exibida, mas pode ser desativado com `--quiet`."
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr "Muitas op챌천es na linha de comando podem ser informadas como parte do pr처prio fluxo de importa챌찾o r찼pida, utilizando os comandos `feature` ou `option`. No entanto, algumas destas op챌천es n찾o s찾o seguras (por exemplo, permitindo que a importa챌찾o r찼pida acesse o sistema de arquivos fora do reposit처rio). 횋 predefinido que estas op챌천es est찾o desabilitadas, por챕m podem ser permitidas ao utilizar essa op챌찾o na linha de comandos. Atualmente, isso afeta apenas os comandos de recurso `export-marks`,` import-marks` e `import-marks-if-exist`."
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr "Ative esta op챌찾o apenas caso confie no programa que gera o fluxo de importa챌찾o r찼pida! Esta op챌찾o 챕 ativada automaticamente para os auxiliares remotos que usem o recurso `import`, pois eles j찼 s찾o confi찼veis para executar o seu pr처prio c처digo."
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr "Op챌천es para Front-ends"
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr "--cat-blob-fd=<fd>"
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr "Escreva as respostas para `get-mark`, `cat-blob` e do `ls` das consultas no descritor do arquivo <fd> em vez do `stdout`. Permite que a sa챠da `progress` destinada ao usu찼rio final seja separada de uma outra sa챠da."
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr "--date-format=<fmt>"
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr "Especifique o tipo das datas que o frontend fornecer찼 para o `fast-import` nos comandos `author`, `committer` e `tagger`. Consulte ``Formatos de data'' abaixo para obter mais detalhes sobre quais os formatos s찾o compat챠veis e sua respectiva sintaxe."
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr "Termine com erro caso n찾o haja um comando `done` no final do fluxo. Essa op챌찾o pode ser 첬til para detectar os erros que fazem com que o front-end seja encerrado antes de come챌ar a gravar um fluxo."
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr "Localiza챌천es dos arquivos de marca챌찾o"
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr "Despeja a tabela de marca챌천es internas em <arquivo> quando conclu챠da. As marca챌천es s찾o escritas uma por linha como `:markid SHA-1`. Os front-ends podem usar este arquivo para validar as importa챌천es depois que forem conclu챠das ou para salvar a tabela de marca챌천es nas execu챌천es incrementais. Como o <arquivo> 챕 aberto e truncado apenas no ponto de verifica챌찾o (ou conclus찾o), o mesmo caminho tamb챕m pode ser passado com seguran챌a para `--import-marks`."
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr "Antes de processar qualquer entrada, carregue as marca챌천es usadas no <arquivo>. O arquivo de entrada deve existir, ser leg챠vel e usar o mesmo formato produzido por `--export-marks`. As m첬ltiplas op챌천es podem ser informadas para importar mais de um conjunto de marcas. Caso uma marca챌찾o seja definida com valores diferentes, o 첬ltimo arquivo vence."
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr "--import-marks-if-exists=<arquivo>"
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr "Como `--import-marks` por챕m caso n찾o exista, em vez de exibir um erro, ignora silenciosamente o arquivo."
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr "Ap처s especificar `--relative-marks`, os caminhos especificados com `--import-marks=` e `--export-marks=` s찾o relativos a um diret처rio interno no reposit처rio atual. No `git-fast-import`, isso significa que os caminhos s찾o relativos ao diret처rio `.git/info/fast-import`. No entanto, outros importadores podem usar um local diferente."
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr "Marca챌천es relativas ou n찾o podem ser combinadas entrela챌ando `--(no-)-relative-marks` com a op챌찾o `--(import|export)-marks=`."
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr "Reescrita do subm처dulo"
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr "--rewrite-submodules-from=<nome>:<arquivo>"
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nome>:<arquivo>"
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr "Reescreve a ID dos objetos no subm처dulo especificado atrav챕s do <nome> dos valores usados a partir de um <arquivo> para aqueles usados para o <arquivo>. As marca챌천es de origem deveriam ter sido criadas por pelo comando `git fast-export` e as marca챌천es to deveriam ter sido criadas pelo `git fast-import` durante a importa챌찾o do mesmo subm처dulo."
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr "O <nome> pode ser qualquer sequ챗ncia arbitr찼ria que n찾o contenha um caractere com dois pontos, por챕m o mesmo valor deve ser utilizado com as duas op챌천es ao definir as marca챌천es correspondentes. Os v찼rios subm처dulos podem ser definidos com valores diferentes para <nome>. 횋 um erro n찾o utilizar estas op챌천es nos pares correspondentes."
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr "Estas op챌천es s찾o 첬teis principalmente durante a convers찾o de um reposit처rio atrav챕s de um algoritmo hash para o outro; sem eles, a importa챌찾o r찼pida ir찼 falhar caso encontre um subm처dulo porque n찾o h찼 como gravar a ID do objeto no novo algoritmo hash."
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr "Ajuste de desempenho e compacta챌찾o"
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr "--active-branches=<n>"
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr "N첬mero m찼ximo de ramifica챌천es para manter ativo de uma s처 vez. Consulte `` Utiliza챌찾o da mem처ria '' abaixo para mais informa챌천es. A predefini챌찾o 챕 5."
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr "--big-file-threshold=<n>"
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr "O tamanho m찼ximo de uma bolha para o qual o `fast-import` tentar찼 criar um delta expressado em bytes. A predefini챌찾o 챕 512m (512 MiB). Alguns importadores podem diminuir isso em sistemas com menos mem처ria."
@@ -22519,19 +22576,19 @@ msgstr "--depth=<n>"
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr "Profundidade delta m찼xima, para a \"deltifica챌찾o\" da bolha e da 찼rvore. A predefini챌찾o 챕 50."
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr "--export-pack-edges=<arquivo>"
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr "Depois de criar um pacote de arquivo, imprima uma linha de dados em `<arquivo>`, listando o nome do arquivo e o 첬ltimo commit em cada ramo que foi gravado neste pacote. Estas informa챌천es podem ser 첬teis ap처s a importa챌찾o de projetos cujo conjunto total de objetos exceda o limite de 4 GiB, pois estes commits podem ser utilizados como pontos de extremidade durante as chamadas para o 'git pack-objects'."
@@ -22543,433 +22600,433 @@ msgstr "--max-pack-size=<n>"
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr "Tamanho m찼ximo de cada pacote de arquivo. A predefini챌찾o 챕 sem limites."
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr "Consulte linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr "DESEMPENHO"
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr "O design do `fast-import` permite a importa챌찾o de grandes projetos com uma quantidade m챠nima do consumo da mem처ria e do tempo de processamento. Supondo que o front-end seja capaz de acompanhar e alimentar o `fast-import` com um fluxo constante de dados, os tempos de importa챌찾o para os projetos com mais de 10+ anos de hist처ria e com mais de 100.000+ commits individuais geralmente s찾o conclu챠dos entre uma a duas horas com um hardware modesto (~$2.000 USD)."
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr "A maioria dos gargalos parece estar no acesso a dados de origem estrangeira (a fonte simplesmente n찾o pode extrair as revis천es com a rapidez suficiente) ou no E/S do disco (o `fast-import` grava t찾o r찼pido quanto o disco aceitar). As importa챌천es ser찾o executadas o mais rapidamente caso os dados de origem sejam armazenados numa unidade diferente do reposit처rio de destino Git (devido a menor conten챌찾o de E/S)."
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr "CUSTO DE DESENVOLVIMENTO"
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr "Um front-end t챠pico para `fast-import` tende a pesar aproximadamente 200 linhas de c처digo Perl/Python/Ruby. A maioria dos desenvolvedores conseguiu criar importadores ativos em apenas algumas horas, mesmo que seja a sua primeira exposi챌찾o ao `fast-import` e 횪s vezes, at챕 ao Git. Esta 챕 uma situa챌찾o ideal, j찼 que a maioria das ferramentas de convers찾o 챕 descart찼vel (utilize uma vez e nunca mais se preocupe)."
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr "OPERA횉횄O EM PARALELO"
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr "Como `git push` ou `git fetch`, as importa챌천es manipuladas pelo `fast-import` s찾o seguras para serem executadas juntamente com as invoca챌천es paralelas `git repack -a -d` ou `git gc` ou qualquer outra opera챌찾o Git (incluindo `git prune`, objetos soltos nunca s찾o utilizados por `fast-import`)."
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr "O `fast-import` n찾o bloqueia a ramifica챌찾o ou \"tag refs\" que est찼 sendo importando ativamente. Ap처s a importa챌찾o, durante a sua fase de atualiza챌찾o do \"ref\", o `fast-import` testa cada \"ref\" em cada ramo existente para verificar se a atualiza챌찾o ser찼 uma atualiza챌찾o de avan챌o r찼pido (o commit armazenado no \"ref\" est찼 contida no novo hist처rico do commit a ser gravado). Se a atualiza챌찾o n찾o for uma atualiza챌찾o r찼pida, a importa챌찾o r찼pida pular찼 a atualiza챌찾o \"ref\" e em vez disso, imprimir찼 uma mensagem de aviso. A importa챌찾o r찼pida sempre tentar찼 atualizar todas as ramifica챌천es refs e n찾o para na primeira falha."
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr "As atualiza챌천es das ramifica챌천es podem ser impostas com a op챌찾o `--force`, mas 챕 recomend찼vel que isso seja utilizado apenas num reposit처rio silencioso. O uso da op챌찾o `--force` n찾o 챕 necess찼rio para uma importa챌찾o inicial para um reposit처rio vazio."
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr "DISCUSS횄O T횋CNICA"
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr "O `fast-import` monitora um conjunto de ramifica챌천es na mem처ria. Durante o processo de importa챌찾o, qualquer ramo pode ser criado ou modificado a qualquer momento, enviando um comando `commit` no fluxo de entrada. Este design permite que um programa front-end processe uma quantidade ilimitada de ramifica챌천es simult창neas, gerando commits na ordem em que est찾o dispon챠veis a partir dos dados da origem. Isso tamb챕m simplifica consideravelmente os programas de interface."
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr "O `fast-import` n찾o usa ou altera o diret처rio de trabalho atual ou qualquer outro arquivo dentro dele. (No entanto, atualiza o reposit처rio Git atual, conforme referenciado por `GIT_DIR`.) Portanto, um front-end de importa챌찾o pode usar o diret처rio de trabalho para os seus pr처prios prop처sitos, como extrair as revis천es dos arquivos das fontes estrangeiras. Essa ignor창ncia do diret처rio de trabalho tamb챕m permite que o `fast-import` seja executado muito rapidamente, pois n찾o 챕 necess찼rio executar nenhuma opera챌찾o dispendiosa de atualiza챌찾o de arquivo ao alternar entre as ramifica챌천es."
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr "FORMATO DE ENTRADA"
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr "Com exce챌찾o dos dados brutos do arquivo (que o Git n찾o interpreta), o formato de entrada do `fast-import` 챕 baseado em texto (ASCII). Esse formato baseado em texto simplifica o desenvolvimento e a depura챌찾o dos programas front-end, especialmente quando uma linguagem de n챠vel superior, como o Perl, Python ou Ruby, est찼 sendo utilizado."
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr "O `fast-import` 챕 muito rigoroso quanto 횪 sua entrada. Quando dissermos SP, queremos dizer *exatamente* um espa챌o. Da mesma forma, `LF` significa uma alimenta챌찾o de linha (apenas uma) e `HT` uma guia horizontal (apenas uma). O fornecimento de caracteres de espa챌o adicionais causar찼 resultados inesperados, como os nomes dos ramos ou nomes dos arquivos com espa챌os 횪 esquerda ou 횪 direita em seu nome, ou o encerramento antecipado do `fast-import` quando encontrar uma entrada inesperada."
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr "Coment찼rios do fluxo"
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr "Para ajudar na depura챌찾o de front-ends, o `fast-import` ignora qualquer linha que comece com `#` (ASCII libra/hash) at챕, e incluindo, a linha que termina com `LF`. Uma linha de coment찼rio pode conter qualquer sequ챗ncia de bytes que n찾o contenha um `LF` e, portanto, pode ser utilizado para incluir qualquer informa챌찾o detalhada de depura챌찾o que possa ser espec챠fica do front-end e 첬til ao inspecionar um fluxo de dados do `fast-import`."
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr "Formatos de data"
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr "Os seguintes formatos s찾o compat챠veis. Um front-end deve selecionar o formato que ser찼 utilizado para essa importa챌찾o, passando o nome do formato na op챌찾o da linha de comando `--date-format=<fmt>`."
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr "Este 챕 o formato nativo do Git que 챕 `<tempo> SP <offutc>`. Tamb챕m 챕 o formato predefinido do `fast-import`, caso `--date-format` n찾o seja utilizado."
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr "A hora do evento 챕 especificado atrav챕s de `<tempo>` como o n첬mero de segundos desde a 챕poca UNIX (meia-noite de 1쨘 de janeiro de 1970, UTC) e 챕 gravado como um n첬mero inteiro decimal ASCII."
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr "A compensa챌찾o local 챕 determinado atrav챕s de `<offutc>` como uma compensa챌찾o positiva ou negativa do UTC. Por exemplo, EST (que fica h찼 5 horas atr찼s do UTC) seria expresso em `<tz>` por ``-0500'' enquanto o UTC 챕 ``+0000''. A compensa챌찾o local n찾o afeta o `<tempo>`; 챕 utilizado apenas como um aviso para ajudar as rotinas de formata챌찾o a exibir o registro de data e hora."
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr "Caso uma compensa챌찾o local n찾o esteja dispon챠vel no material de origem, utilize ``+0000'' ou a compensa챌찾o local mais comum. Por exemplo, muitas organiza챌천es t챗m um reposit처rio CVS que s처 foi acessado por usu찼rios localizados no mesmo local e fuso hor찼rio. Nesse caso, uma compensa챌찾o razo찼vel do UTC pode ser assumida."
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr "Diferente do formato `rfc2822`, que 챕 muito rigoroso. Qualquer varia챌찾o na formata챌찾o far찼 com que o fast-import rejeite o valor e algumas verifica챌천es de sanidade com valores num챕ricos tamb챕m possam ser executadas."
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr "Isto 챕 o mesmo que `raw`, exceto que as verifica챌천es de sanidade n찾o s찾o realizadas na 챕poca num챕rica e no desvio do fuso hor찼rio local. Isto pode ser 첬til ao tentar filtrar ou importar um hist처rico j찼 existente com por exemplo, valores falsos do fuso hor찼rio."
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr "`rfc2822`"
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr "Este 챕 o formato de email padr찾o, conforme est찼 descrito pela RFC 2822."
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr "Um valor de exemplo 챕 ``Ter 6 de fevereiro 11:22:18 2007 -0500''. O analisador do Git 챕 preciso, por챕m um pouco tolerante. 횋 o mesmo analisador utilizado pelo 'git am' ao aplicar os patches recebidos de email."
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr "Algumas cadeias de caracteres (strings) malformadas podem ser aceitas como datas v찼lidas. Em alguns desses casos, o Git ainda poder찼 obter a data correta da cadeia de caracteres. Tamb챕m existem alguns tipos de cadeia de caracteres malformados que o Git analisar찼 incorretamente e, no entanto, ainda assim o considerar찼 v찼lido. As sequ챗ncias que estiverem seriamente malformadas ser찾o rejeitadas."
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr "Diferentemente do formato `bruto` acima, as informa챌천es de compensa챌찾o do fuso hor찼rio/UTC contidas numa sequ챗ncia de datas RFC 2822, s찾o utilizadas para ajustar o valor da data para UTC antes do armazenamento. Portanto, 챕 importante que essas informa챌천es sejam as mais precisas poss챠veis."
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr "Caso o material de origem utilize datas no formato RFC 2822, o front-end deve permitir que o `fast-import` manipule a an찼lise a convers찾o (em vez de tentar fazer isso sozinho), pois o analisador do Git foi bem testado num ambiente natural."
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr "Os front-end devem preferir o formato `raw` (bruto) caso o material de origem j찼 utilize o formato UNIX, pode ser atrativo fornecer datas nesse formato, ou o seu formato 챕 facilmente convert챠vel, pois n찾o h찼 ambiguidade na an찼lise."
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr "Sempre utilize a hora e o fuso hor찼rio atual. O literal `now` sempre deve ser informado em `<quando>`."
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr "Este 챕 um formato de brinquedo. A hora e o fuso hor찼rio atual deste sistema s찾o sempre copiados para a cadeia de identidade no momento em que s찾o criados pelo `fast-import`. N찾o h찼 como especificar um hor찼rio ou fuso hor찼rio diferente."
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr "Esse formato em particular 챕 informado para implementa챌찾o curta e pode ser 첬til para um processo onde se deseja criar um novo commit imediatamente, sem a necessidade de usar um diret처rio ativo ou `git update-index`."
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr "Caso o `autor` e o `committer` sejam utilizados de forma separadas num `commit`, os registro de data e hora podem n찾o coincidir, pois o rel처gio do sistema ser찼 pesquisado duas vezes (uma vez para cada comando). A 첬nica maneira de garantir que as informa챌천es de identidade do autor e de quem fez o commit tenham o mesmo registro de data e hora 챕 omitir o `autor` (copiando assim do `committer`) ou usar um formato de data diferente de `now`."
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr "Comandos"
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr "O fast-import aceita v찼rios comandos para atualizar o reposit처rio atual e controlar o processo de importa챌찾o. Discuss천es mais detalhadas (com exemplos) de cada comando vir찾o depois."
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr "Cria uma nova ramifica챌찾o ou atualiza uma ramifica챌찾o existente, criando um novo commit e atualizando a ramifica챌찾o para apontar para o commit rec챕m criado."
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr "Cria um objeto \"tag\" anotado a partir de um commit ou ramifica챌찾o existente. As tags `lightweight` (ou leves) n찾o s찾o compat챠veis com este comando, pois n찾o s찾o recomendadas para registrar os pontos importantes de tempo."
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr "Redefina uma ramifica챌찾o existente (ou uma nova ramifica챌찾o) para determinada revis찾o. Este comando deve ser utilizado para alterar uma ramifica챌찾o para uma revis찾o espec챠fica sem fazer um commit nela."
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr "Converta os dados brutos do arquivo numa bolha, para uso futuro num comando `commit`. Este comando 챕 opcional, n찾o sendo necess찼rio para executar uma importa챌찾o."
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr "Registre que uma marca se refere a um determinado objeto sem antes criar qualquer objeto novo. O uso de --import-marks e referindo-se a marcas ausentes far찼 com que a importa챌찾o r찼pida falhe de modo que os pseud척nimos possam fornecer uma maneira de definir os compromissos podados de outra forma a um valor v찼lido (por exemplo, o ancestral n찾o podado mais pr처ximo)."
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr "Imp천em o uso de `fast-import` para fechar o arquivo de pacotes atual, gerar seu \"checksum\", seu 챠ndice SHA-1 e iniciar um novo pacote de arquivo. Este comando 챕 opcional, n찾o sendo necess찼rio para executar uma importa챌찾o."
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr "Faz com que o `fast-import` fa챌a um eco da linha inteira para sua pr처pria sa챠da padr찾o. Este comando 챕 opcional, n찾o sendo necess찼rio para executar uma importa챌찾o."
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr "Faz a marca챌찾o do fim do fluxo. Este comando 챕 opcional, a menos que o recurso `done` tenha sido solicitado utilizando a op챌찾o de linha de comando` --done` ou o comando `feature done`."
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr "Faz com que o `fast-import` imprima o SHA-1 correspondente a uma marca챌찾o no descritor do arquivo definido com `--cat-blob-fd` ou `stdout` caso n찾o tenha sido especificado."
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr "Faz com que o `fast-import` imprima uma bolha no formato 'cat-file --batch' no descritor do arquivo definido com `--cat-blob-fd` ou `stdout` caso n찾o tenha sido especificado."
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr "Faz com que o `fast-import` imprima uma linha que descreve uma entrada do diret처rio no formato `ls-tree` para o descritor do arquivo definido com `--cat-blob-fd` ou `stdout` caso n찾o tenha sido especificado."
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr "Ativa o recurso especificado. Isso requer que o `fast-import` ofere챌a compatibilidade ao recurso especificado, caso contr찼rio, que seja abortado."
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr "Especifique qualquer uma das op챌천es listadas em `OPTIONS` que n찾o alterem a sem창ntica do fluxo para atender 횪s necessidades do front-end. Este comando 챕 opcional, n찾o sendo necess찼rio para executar uma importa챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr "Crie ou atualize uma ramifica챌찾o com um novo commit, registrando uma altera챌찾o l처gica no projeto."
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22997,241 +23054,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr "onde `<ref>` 챕 o nome do ramo no qual o commit deve ser feito. Normalmente, os nomes dos ramos s찾o prefixados com `refs/heads/` no Git, portanto, a importa챌찾o do s챠mbolo do ramo CVS `RELENG-1_0` utilizaria `refs/heads/RELENG-1_0` como o valor de `<ref>`. O valor de `<ref>` deve ser um \"refname\" v찼lido no Git. Como `LF` n찾o 챕 v찼lido num \"refname\" do Git, nenhuma sintaxe de aspas ou de escape 챕 compat챠vel aqui."
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr "Um comando de marca챌찾o `mark` pode aparecer opcionalmente, solicitando ao `fast-import` para salvar uma refer챗ncia ao commit rec챕m-criado para uso futuro atrav챕s do front-end (veja abaixo). 횋 muito comum que os front-ends marquem cada commit criado, permitindo assim a cria챌찾o futura de ramifica챌천es a partir de qualquer commit importado."
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr "O comando `data` ap처s o `committer` deve suprir a mensagem do commit (veja abaixo a sintaxe do comando `data`). Para importar uma mensagem vazia de commit, utilize os dados com 0 de comprimento. As mensagens do commit s찾o de livre formato e n찾o s찾o interpretadas pelo Git. Atualmente, elas devem ser codificadas em UTF-8, pois o `fast-import` n찾o permite que outras codifica챌천es sejam utilizadas."
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr "Zero ou mais comandos como `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` e `notemodify` podem ser inclu챠dos para atualizar o conte첬do do ramo antes de criar o commit. Estes comandos podem ser utilizados em qualquer ordem. No entanto, 챕 recomendado que um comando `filedeleteall` preceda todos os comandos `filemodify`, `filecopy`, `filerename` e `notemodify` no mesmo commit, j찼 que `filedeleteall` limpa a ramifica챌찾o (veja abaixo)."
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr "O 'LF' ap처s o comando 챕 opcional (costumava ser obrigat처rio). Observe que por raz천es de retrocompatibilidade, caso o commit termine com um comando `data` (ou seja, n찾o tiver nenhum comando `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` ou `notemodify`) ent찾o dois comandos 'LF' podem aparecer no final do comando em vez de apenas um."
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr "Um comando `autor` pode opcionalmente aparecer, caso as informa챌천es do autor puderem diferir das informa챌천es de quem fez o commit. Caso o `autor` seja omitido, ent찾o o `fast-import` usar찼 automaticamente as informa챌천es de quem fez o commit para a parte relaiva ao autor do commit. Veja abaixo uma descri챌찾o dos campos em `autor`, pois s찾o id챗nticos aos do `committer`."
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr "O comando `committer` indica quem foi que fez o commit e quando foi feito."
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr "Aqui `<nome>` 챕 o nome de exibi챌찾o da pessoa (``Com M Itter'' por exemplo) and `<e-mail>` 챕 o endere챌o de e-mail da pessoa(``\\cm@example.com''). `LT` e `GT` s찾o os s챠mbolos literais menores que (`\\x3c`) e maiores que (`\\x3e`). Isso 챕 necess찼rio para delimitar o endere챌o de e-mail dos outros campos na linha. Observe que `<nome>` e `<e-mail>` s찾o de forma livre e podem conter qualquer sequ챗ncia de bytes, exceto `LT`,` GT` e `LF`. `<nome>` 챕 codificada em UTF-8."
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr "A hora da altera챌찾o 챕 usada por `<quando>` utilizando o formato de data selecionado pela op챌찾o da linha de comando `--date-format=<fmt>`. Consulte ``Formatos de data'' acima para obter o conjunto de formatos compat챠veis e a sua sintaxe."
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr "O comando opcional `encoding` indica a codifica챌찾o da mensagem do commit. A maioria dos commits s찾o UTF-8 e a codifica챌찾o 챕 omitida, por챕m isso permite importar as mensagens dos commits para o git sem que primeiro seja necess찼rio recodific찼-las."
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr "O comando `from` 챕 utilizado para especificar o commit para inicializar esta ramifica챌찾o. Esta revis찾o ser찼 o primeiro ancestral do novo commit. O estado da 찼rvore constru챠da neste commit come챌ar찼 com a condi챌찾o no commit `from` e ser찼 alterado pelas altera챌천es do conte첬do deste commit."
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr "Omitir o comando `from` no primeiro commit de uma nova ramifica챌찾o far찼 com que o `fast-import` crie este commit sem antecessor. Isso tende a ser desejado apenas para o commit inicial de um projeto. Caso o front-end crie todos os arquivos do zero ao criar uma nova ramifica챌찾o, um comando `merge` poder찼 ser utilizado em vez de `from` para iniciar o commit com uma 찼rvore vazia. Omitir o comando `from` em ramifica챌천es existentes 챕 geralmente desejado, pois o commit atual neste ramo 챕 automaticamente assumido como o primeiro antecessor do novo commit."
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr "Como `LF` n찾o 챕 v찼lido numa refer챗ncia de nome do Git ou numa express찾o SHA-1, nenhuma sintaxe de cita챌찾o ou escape 챕 compat챠vel com `<commit-ish>`."
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr "Aqui `<commit-ish>` 챕 qualquer um dos seguintes:"
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr "O nome de uma ramifica챌찾o existente j찼 na tabela de ramifica챌천es internas do `fast-import`. Caso o `fast-import` n찾o saiba o nome, ele ser찼 tratado como uma express찾o SHA-1."
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr "A marca챌찾o de refer챗ncia, `:<idnum>`, onde `<idnum>` seja o n첬mero da marca챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr "O motivo do `fast-import` utilizar `:` para indicar uma marca챌찾o de refer챗ncia, este caractere n찾o 챕 legal com um nome do ramo do Git. O `:` principal facilita a distin챌찾o entre a marca챌찾o 42 (`:42`) e a ramifica챌찾o 42 (`42` ou `refs/heads/42`), ou um SHA-1 abreviado que passou a consistir apenas em d챠gitos com base 10."
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr "As marca챌천es devem ser declaradas (atrav챕s de `mark`) antes de poderem ser utilizadas."
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr "Um commit completo com 40 bytes ou um SHA-1 abreviado em hexadecimal."
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr "Qualquer express찾o Git SHA-1 v찼lido que resolva para um commit. Consulte ``DEFININDO AS REVIS횛ES'' em linkgit:gitrevisions[7] para mais detalhes."
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr "O SHA-1 nulo especial (40 zeros) especifica que a ramifica챌찾o deve ser removida."
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr "O caso especial de reiniciar uma importa챌찾o incremental do valor atual do ramo deve ser escrito como:"
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr "\tfrom refs/heads/branch^0\n"
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr "O sufixo `^0` 챕 necess찼rio, pois a importa챌찾o r찼pida n찾o permite que uma ramifica챌찾o inicie por si mesma e a ramifica챌찾o 챕 criada na mem처ria antes que o comando `from` seja lido pela entrada. Adicionar o `^0` ir찼 impor que o `fast-import` resolva o commit atrav챕s da biblioteca de an찼lise de revis찾o do Git, em vez de sua tabela de ramifica챌찾o interna, carregando assim o valor existente do ramo."
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr "Inclui um commit ancestral adicional. O link de ancestralidade adicional n찾o altera a maneira como o estado da 찼rvore 챕 constru챠do nesse commit. Caso o comando `from` seja omitido durante a cria챌찾o de uma nova ramifica챌찾o, o primeiro commit` merge` ser찼 o primeiro ancestral do commit atual, e o ramo come챌ar찼 sem arquivos. Um n첬mero ilimitado de comandos `merge` por commit 챕 permitido pelo `fast-import`, estabelecendo assim uma mesclagem n-way."
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr "Aqui `<commit-ish>` 챕 qualquer uma das express천es de especifica챌찾o de um commit tamb챕m aceitas por `from` (veja acima)."
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr "Inclu챠do no comando `commit` para adicionar um novo arquivo ou alterar o conte첬do de um arquivo existente. Este comando possui dois meios diferentes de especificar o conte첬do do arquivo."
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr "Formato de dados externos"
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr "O conte첬do dos dados para o arquivo j찼 foi informado por um comando `blob` (bolha) anterior. O front-end s처 precisa conect찼-lo."
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr "\t'M' SP <modo> SP <dataref> SP <caminho> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr "Aqui geralmente `<dataref>` deve ser uma marca챌찾o de refer챗ncia (`:<idnum>`) definida por um comando `blob` ou um SHA-1 completo com 40 bytes de um objeto bolha j찼 existente no Git. Caso o `<modo>` seja `040000`` ent찾o `<dataref>` deve ser o SHA-1 completo com 40 bytes de um objeto existente na 찼rvore Git ou uma marca챌찾o de refer챗ncia definida com `--import-marks`."
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr "Formato de dados em linha"
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr "O conte첬do dos dados para o arquivo ainda n찾o foi informado. O front-end deseja fornec챗-lo como parte deste comando de modifica챌찾o."
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -23241,259 +23298,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr "Veja abaixo uma descri챌찾o detalhada do comando `data`."
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr "Nos dois formatos o `<modo>` 챕 o tipo de entrada do arquivo em formato octal. O Git 챕 compat챠vel apenas com os seguintes modos:"
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr "`100644` ou `644`: um arquivo normal (n찾o execut찼vel). A maioria dos arquivos na maioria dos projetos utiliza este modo. Em caso de d첬vida, 챕 isso mesmo que deve ser utilizado."
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr "`100755` ou `755`: Um arquivo normal, por챕m execut찼vel."
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr "`120000`: um link simb처lico, o conte첬do do arquivo ser찼 o destino do link."
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr "`160000`: Um gitlink SHA-1 do objeto referindo-se a um commit em outro reposit처rio. Os links Git podem ser especificados apenas pelo SHA ou por meio de uma marca챌찾o do commit. Eles s찾o utilizados para implementar os subm처dulos."
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr "`040000`: um subdiret처rio. Os subdiret처rios podem ser especificados apenas pelo SHA ou atrav챕s de uma marca챌찾o de 찼rvore definida com `--import-marks`."
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr "Nos dois formatos o `<caminho>` 챕 o caminho completo do arquivo a ser adicionado (caso ainda n찾o exista) ou modificado (caso j찼 exista)."
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr "Uma cadeia de caracteres `<caminho>` deve usar separadores de diret처rio no estilo UNIX (barra `/`), pode conter qualquer byte que n찾o seja `LF` e n찾o deve come챌ar com aspas duplas (`\"`)."
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr "Um caminho pode usar aspas no estilo C; 챕 aceito em todos os casos e obrigat처rio caso o nome do arquivo comece com duas aspas ou tenha um `LF`. Na cita챌찾o no estilo C, o nome completo deve estar entre duas aspas e qualquer caractere `LF`, barra invertida ou duas aspas deve ser escapado precedendo-os com uma barra invertida (`\"caminho/com\\n, \\\\ e \\\"nele\"` por exemplo)."
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr "O valor de `<caminho>` deve estar em forma can척nica. Ou seja, n찾o deve:"
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr "cont챕m um componente de diret처rio vazio (`foo//bar` 챕 inv찼lido por exemplo),"
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr "termina com um separador de diret처rio (`foo/` 챕 inv찼lido por exemplo),"
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr "comece com um separador de diret처rio (`/foo` 챕 inv찼lido por exemplo),"
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr "tem o componente especial `.` ou `..` (`foo/./bar` e `foo/../bar` s찾o inv찼lidos por exemplo)."
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr "A raiz da 찼rvore pode ser representada por uma cadeia de caracteres vazios como `<caminho>`."
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr "횋 recomend찼vel que o `<caminho>` seja sempre codificado utilizando UTF-8."
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr "Inclu챠do no comando `commit` para remover um arquivo ou excluir recursivamente um diret처rio inteiro do ramo. Caso a remo챌찾o do arquivo ou diret처rio deixar o seu diret처rio de origem vazio, o diret처rio de origem tamb챕m ser찼 automaticamente removido. Isso faz segue na 찼rvore at챕 que o primeiro diret처rio n찾o vazio ou at챕 que chegue at챕 a raiz."
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr "\t'D' SP <caminho> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr "aqui o '<caminho>' 챕 o caminho completo do arquivo ou subdiret처rio que ser찼 removido do ramo. Consulte `filemodify` acima para obter uma descri챌찾o mais detalhada sobre `<caminho>`."
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr "Recursivamente copie um arquivo ou subdiret처rio existente para um local diferente dentro do ramo. O arquivo ou diret처rio existente deve existir. Caso o destino exista, ele ser찼 completamente substitu챠do pelo conte첬do copiado da fonte."
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr "\t'C' SP <caminho> SP <caminho> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr "aqui o primeiro `<caminho>` 챕 o local de origem e o segundo `<caminho>` 챕 o destino. Consulte `filemodify` acima para uma descri챌찾o detalhada de como pode ser o `<caminho>`. O caminho deve ser citado para usar um caminho de origem que contenha `SP`."
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr "Um comando `filecopy` entra em vigor imediatamente. Depois que o local de origem tenha sido copiado para o destino, quaisquer comandos futuros aplicados ao local de origem n찾o afetar찾o o destino da c처pia."
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr "Renomeia um arquivo ou subdiret처rio existente para um local diferente dentro do ramo. O arquivo ou diret처rio existente deve existir. Caso o destino exista, ele ser찼 substitu챠do pelo diret처rio de origem."
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr "\t'R' SP <caminho> SP <caminho> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr "Um comando `filerename` entra em vigor imediatamente. Depois que o local de origem for renomeado para o destino, quaisquer comandos futuros aplicados ao local de origem criar찾o novos arquivos e n찾o afetar찾o o destino da renomea챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr "Observe que um `filename` 챕 o mesmo que um` filecopy` seguido de um `filedelete` do local de origem. H찼 uma pequena vantagem de desempenho em usar o `filename`, mas a vantagem 챕 t찾o pequena que nunca vale a pena tentar converter um par de exclus찾o/adi챌찾o no material de origem numa renomea챌찾o para o `fast-import`. Este comando `filerename` 챕 informado apenas para simplificar os front-ends que j찼 possuam informa챌천es de renomea챌찾o e n찾o querem se decompor num `filecopy` seguido de um `filedelete`."
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr "Inclu챠do no comando `commit` para remover todos os arquivos (e tamb챕m todos os diret처rios) do ramo. Este comando redefine a estrutura interna do ramo para que exista nenhum arquivo nele, permitindo que o \"front-end\" adicione posteriormente todos os arquivos interessantes do zero."
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr "\t'deleteall' LF\n"
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr "Este comando 챕 extremamente 첬til caso o front-end n찾o soiba (ou n찾o quer saber) quais s찾o os arquivos est찾o atualmente no ramo e, portanto, n찾o conseguir gerar os comandos `filedelete` adequados para atualizar o conte첬do."
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr "A emiss찾o de um arquivo 軻filedeleteall` seguido dos comandos necess찼rios `filemodify` para definir o conte첬do correto e produzir찼 os mesmos resultados que o envio apenas dos comandos necess찼rios `filemodify` e `filedelete`. A abordagem `filedeleteall` pode, no entanto, exigir que o `fast-import` para usar um pouco mais de mem처ria por ramifica챌찾o ativa (menos de 1 MiB para projetos ainda maiores); portanto, os front-ends que podem obter facilmente apenas aos caminhos afetados para um commit s찾o incentivados a faz챗-lo."
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr "Inclu챠do num comando `commit` `<notes_ref>` para adicionar uma nova nota anotando um `<commit-ish>` ou alterar este conte첬do da anota챌찾o. Internamente, 챕 semelhante ao arquivo modificado 100644 no caminho `<commit-ish>` (talvez dividido em subdiret처rios). N찾o 챕 aconselh찼vel usar outros comandos para escrever na 찼rvore `<notes_ref>`, exceto `filedeleteall` para excluir todas as anota챌천es existentes nessa 찼rvore. Este comando possui dois meios diferentes de especificar o conte첬do da anota챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr "O conte첬do dos dados para a anota챌찾o j찼 foi informado por um comando `blob` anterior. O front-end s처 precisa conect찼-lo ao commit que deve ser anotado."
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr "\t'N' SP <dataref> SP <commit-ish> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr "Aqui `<dataref>` pode ser uma marca챌찾o de refer챗ncia (`:<idnum>`) definida por um comando `blob` anterior ou um SHA-1 completo com 40 bytes de um objeto bolha existente."
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr "O conte첬do dos dados da anota챌찾o ainda n찾o foi informado. O front-end deseja fornec챗-lo como parte deste comando de modifica챌찾o."
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -23503,73 +23560,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr "Nos dois formatos, `<commit-ish>` 챕 qualquer uma das express천es de especifica챌찾o do commit tamb챕m aceitos por `from` (veja acima)."
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr "Organiza `fast-import` para salvar uma refer챗ncia ao objeto atual, permitindo que o front-end recupere este objeto num momento futuro, sem conhecer o seu SHA-1. Aqui, o objeto atual 챕 o comando de cria챌찾o do objeto no qual o comando `mark` aparece. Pode ser `commit`, `tag` e `blob`, mas `commit` 챕 o uso mais comum."
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr "\t'mark' SP ':' <idnum> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr "onde `<idnum>` 챕 o n첬mero atribu챠do pelo front-end a esta marca챌찾o. O valor de `<idnum>` 챕 expresso como um n첬mero ASCII decimal inteiro. O valor 0 챕 reservado e n찾o pode ser utilizado como uma marca챌찾o. Somente os valores maiores ou iguais a 1 podem ser utilizados como marca챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr "As novas marca챌천es s찾o criadas automaticamente. As marca챌천es existentes podem ser movidas para um outro objeto simplesmente reutilizando o mesmo `<idnum>` em outro comando `mark`."
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr "Fornece o nome do objeto no sistema de controle de origem original. o `fast-import` simplesmente ignorar찼 esta diretiva, por챕m os processos de filtro que operam e modificam o fluxo antes de alimentar o `fast-import` podem ter usos para essas informa챌천es"
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr "\t'original-oid' SP <identificador-do-objeto> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr "onde `<identificador-do-objeto>` 챕 qualquer cadeia de caracteres que n찾o contenha LF."
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr "Cria uma tag anotada referente a um commit espec챠fico. Para criar tags `leve` (n찾o anotadas), consulte o comando `reset` abaixo."
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -23587,55 +23644,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr "onde `<nome>` 챕 o nome da tag a ser criada."
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr "Os nomes das tags s찾o prefixados automaticamente com `refs/tags/` quando armazenados no Git, portanto, a importa챌찾o do s챠mbolo do ramo CVS `RELENG-1_0-FINAL` usaria apenas `RELENG-1_0-FINAL` para `<nome>` e o `fast-import` ir찼 escrever um `ref` correspondente como `refs/tags/RELENG-1_0-FINAL`."
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr "O valor de `<nome>` deve ser um `refname` v찼lido no Git e portanto, pode conter barras. Como `LF` n찾o 챕 v찼lido num \"refname\" do Git, nenhuma sintaxe de aspas ou de escape 챕 compat챠vel aqui."
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr "O comando `from` 챕 o mesmo que no comando `commit`; veja acima para detalhes."
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr "O comando `tagger` usa o mesmo formato que `committer` dentro de `commit`; veja novamente acima para obter detalhes."
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr "O comando `data` ap처s o `tagger` deve fornecer a mensagem anotada do tag (veja abaixo a sintaxe do comando `data`). Para importar uma mensagem de tag vazia, utilize dados com 0 de comprimento. As mensagens de tag s찾o de forma livre e n찾o s찾o interpretados pelo Git. Atualmente, elas devem ser codificadas em UTF-8, pois o `fast-import` n찾o permite que outras codifica챌천es sejam utilizadas."
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr "A assinatura de tags anotadas durante a importa챌찾o com `fast-import` n찾o 챕 compat챠vel. N찾o 챕 recomend찼vel tentar incluir na sua pr처pria assinatura PGP/GPG, pois o front-end n찾o tem (facilmente) acesso ao conjunto completo de bytes que normalmente entra nessa assinatura. Caso a assinatura seja necess찼ria, crie tags `leve` a partir do `fast-import` com `reset` e crie as vers천es anotadas dessas tags desconectadas com o processo predefinido 'git tag'."
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr "Cria (ou recria) a ramifica챌찾o nomeada, iniciando opcionalmente a partir de uma revis찾o espec챠fica. O comando `reset permite que um front-end emita um novo comando `from` para uma ramifica챌찾o existente ou crie uma nova ramifica챌찾o a partir de um commit existente sem criar um novo commit."
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -23647,25 +23704,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr "Para uma descri챌찾o detalhada sobre `<ref>` e `<commit-ish>` veja acima em `commit` e` from`."
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr "O `LF` ap처s o comando 챕 opcional (costumava ser necess찼rio)."
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr "O comando `reset` tamb챕m pode ser utilizado para criar tags leves (n찾o anotadas). Por exemplo:"
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -23675,19 +23732,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr "criaria a tag `leve` `refs/tags/938` se referindo a qualquer marca챌찾o do commit `:938`."
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr "Solicita a grava챌찾o de uma revis찾o do arquivo no pacote do arquivo. A revis찾o n찾o est찼 conectada a nenhum commit; essa conex찾o deve ser formada com um comando `commit` subsequente referenciando a bolha atrav챕s de uma marca챌찾o atribu챠da."
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23701,43 +23758,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr "O comando `mark` 챕 opcional aqui, pois alguns front-ends optaram por gerar o SHA-1 do Git para a bolha por conta pr처pria e aliment찼-la diretamente para o `commit`. No entanto, normalmente 챕 mais trabalhoso do que vale a pena, pois as marcas s찾o baratas de armazenar e f찼ceis de usar."
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr "Fornece os dados brutos (para uso como o conte첬do bolha/arquivo, as mensagens do commit ou as mensagens de anota챌찾o das tags) para o `fast-import`. Os dados podem ser informados utilizando uma contagem exata de bytes ou delimitados por uma linha final. Os front-ends reais destinados para convers천es de qualidade de produ챌찾o devem sempre usar o formato exato de contagem de bytes, pois s찾o mais robustos e t챗m um melhor desempenho. O formato delimitado destina-se principalmente ao teste de importa챌찾o r찼pida."
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr "As linhas de coment찼rio que aparecem na parte `<raw>` dos comandos `data` sempre s찾o consideradas parte do corpo dos dados e portanto, nunca s찾o ignoradas pelo `fast-import`. Isso torna seguro importar qualquer conte첬do do arquivo/mensagem cujas linhas possam come챌ar com `#`."
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr "Formato exato de contagem de bytes"
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr "O front-end deve especificar a quantidade de bytes dos dados."
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23747,31 +23804,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr "onde `<count>` 챕 a quantidade exato de bytes que aparece em `<raw>`. O valor `<count>` 챕 expressado como um n첬mero ASCII decimal inteiro. O `LF` em ambos os lados de `<raw>` n찾o est찼 inclu챠do em `<count>` e n찾o ser찼 inclu챠do nos dados importados."
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr "O `LF` ap처s `<raw>` 챕 opcional (costumava ser necess찼rio), mas recomendado. A inclus찾o sempre facilita a depura챌찾o de um fluxo do `fast-import`, pois o pr처ximo comando sempre inicia na coluna 0 da pr처xima linha, ainda que `<raw>` n찾o termine com um `LF`."
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr "Formato delimitado"
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr "Uma cadeia de caracteres delimitadora 챕 utilizada para marcar o final dos dados. O `fast-import` calcular찼 o comprimento pesquisando pelo delimitador. Esse formato 챕 첬til principalmente para testes e n찾o 챕 recomendado para dados reais."
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23785,25 +23842,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr "onde `<delim>` 챕 a cadeia de caracteres escolhida para a delimita챌찾o. A cadeia de caracteres `<delim>` n찾o deve aparecer numa linha sozinha dentro de `<raw>`, pois o `fast-import` pensar찼 que os dados terminam mais cedo do que realmente terminam. O `LF` imediatamente ap처s `<raw>` faz parte de `<raw>`. Essa 챕 uma das limita챌천es do formato delimitado, 챕 imposs챠vel fornecer um bloco de dados que n찾o tenha um `LF` como o seu 첬ltimo byte."
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr "O `LF` ap처s `<delim> LF` 챕 opcional (costumava ser necess찼rio)."
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr "Registre que uma marca챌찾o se refere a um determinado objeto sem criar primeiro nenhum novo objeto."
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23817,19 +23874,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr "Para uma descri챌찾o detalhada do `<commit-ish>` veja acima em `from`."
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr "Imp천em o `fast-import` a fechar o arquivo de pacote atual, iniciar um novo e salvar todas os `refs`, tags e marcas das ramifica챌천es atuais."
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23839,31 +23896,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr "Observe que o `fast-import` alterna automaticamente os arquivos do pacote quando o arquivo do pacote atual alcance `--max-pack-size` ou 4 GiB, o que for menor. Durante uma troca autom찼tica do pacote de arquivos `fast-import n찾o atualiza os `refs`, tags ou marca챌천es do ramo."
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr "Como um `checkpoint` pode exigir uma quantidade significativa de tempo de CPU e E/S de disco (para calcular a soma de verifica챌찾o SHA-1 do pacote geral, gerar o arquivo do 챠ndice correspondente e atualizar as `refs`), pode levar v찼rios minutos para um 첬nico comando `checkpoint` para concluir."
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr "Os front-end podem optar por emitir `checkpoints` durante as importa챌천es extremamente grandes e de execu챌찾o demorada, ou quando precisam permitir que outro processo do Git acesse uma ramifica챌찾o. No entanto, dado que um reposit처rio do Subversion com 30 GiB pode ser carregado no Git atrav챕s do `fast-import` em cerca de 3 horas, talvez n찾o seja necess찼rio um `checkpoint` expl챠cito."
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr "Faz com que o `fast-import` imprima toda a linha `progress` sem modifica챌찾o em seu canal de sa챠da predefinido (descritor do arquivo 1) quando o comando 챕 processado a partir do fluxo de entrada. Caso contr찼rio, o comando n찾o tem impacto na importa챌찾o atual ou em qualquer outro estado interno do `fast-import`."
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23873,67 +23930,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr "A parte `<any>` do comando pode conter qualquer sequ챗ncia de bytes que n찾o contenha um `LF`. O `LF` ap처s o comando 챕 opcional. Os chamadores podem desejar processar a sa챠da por meio de uma ferramenta como sed para remover a parte principal da linha, por exemplo:"
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr "\tfrontend | git fast-import | sed 's/^progress //'\n"
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr "A coloca챌찾o de um comando `progress` imediatamente ap처s um `checkpoint` informar찼 ao leitor quando o `checkpoint` seja conclu챠do e ele poder찼 acessar com seguran챌a os `refs` que o `fast-import` atualizaram."
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr "Faz com que o `fast-import` imprima o SHA-1 correspondente a uma marca챌찾o em `stdout` ou ao descritor de arquivo previamente organizado com o argumento `--cat-blob-fd`. Caso contr찼rio, o comando n찾o tem impacto na importa챌찾o atual; seu objetivo 챕 recuperar o SHA-1s que commits posteriores podem querer se referir em suas mensagens de commit."
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr "\t'get-mark' SP ':' <idnum> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr "Consulte ``RESPOSTAS AOS COMANDOS'' abaixo para obter detalhes sobre como ler esta sa챠da com seguran챌a."
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr "Faz com que o `fast-import` imprima uma bolha num descritor do arquivo previamente organizado com o argumento `--cat-blob-fd`. Caso contr찼rio, o comando n찾o tem impacto na importa챌찾o atual; o seu principal objetivo 챕 recuperar as bolhas que podem estar na mem처ria do `fast-import`, mas n찾o acess챠veis no reposit처rio de destino."
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr "\t'cat-blob' SP <dataref> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr "O `<dataref>` pode ser uma marca챌찾o de refer챗ncia (`:<idnum>`) definida anteriormente ou um SHA-1 completo com 40 bytes de uma bolha Git pr챕-existente ou pronto para ser gravado."
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr "A sa챠da usa o mesmo formato que `git cat-file --batch`:"
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23943,283 +24000,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr "Este comando pode ser usado onde uma diretiva `filemodify` possa aparecer, permitindo que ela seja usada no meio de um commit. Para um `filemodify` usando uma diretiva 'inline', ele tamb챕m pode aparecer logo antes da diretiva `data`."
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr "Imprime as informa챌천es sobre o objeto num caminho para um descritor do arquivo organizado anteriormente com a op챌찾o `--cat-blob-fd`. Permite a impress찾o de uma bolha a partir do commit ativo (com `cat-blob`) ou copiando uma bolha ou 찼rvore de um commit anterior para uso no atual (com `filemodify`)."
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr "O comando `ls` tamb챕m pode ser usado onde uma diretiva `filemodify` possa aparecer, permitindo que ela seja usada no meio de um commit."
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr "Lendo a partir do commit ativo"
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr "Este formul찼rio pode ser utilizado apenas no meio de um `commit`. O caminho informa uma entrada do diret처rio no commit ativo do `fast-import`. O caminho deve ser citado neste caso."
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr "\t'ls' SP <caminho> LF\n"
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr "Lendo de uma 찼rvore nomeada"
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr "O `<dataref>` pode ser uma marca챌찾o de refer챗ncia (`:<idnum>`) ou o SHA-1 completo com 40 bytes de uma tag, commit ou objeto da 찼rvore Git pr챕-existente ou aguardando para ser gravado. O caminho 챕 relativo ao cume da 찼rvore informada atrav챕s do `<dataref>`."
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr "\t'ls' SP <dataref> SP <caminho> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr "Consulte `filemodify` acima para uma descri챌찾o detalhada de `<caminho>`."
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr "A sa챠da usa o mesmo formato que `git ls-tree <찼rvore> -- <caminho>`:"
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <caminho> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr "O <dataref> representa o objeto bolha, 찼rvore ou commit no <caminho> e pode ser utilizado posteriormente nos comandos `get-mark`, `cat-blob`, `filemodify` ou `ls`."
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr "Caso n찾o haja um arquivo ou sub찼rvore nesse caminho, o `git fast-import` o reportar찼"
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr "\tmissing SP <caminho> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr "Exija que a importa챌찾o r찼pida ofere챌a suporte ao recurso especificado ou o anule."
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr "\t'feature' SP <caracter챠stica> ('=' <argumento>)? LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr "A parte <caracter챠stica> do comando pode ser qualquer um dos seguintes:"
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr "date-format"
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr "export-marks"
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr "relative-marks"
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "no-relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr "force"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr "Aja como se a op챌찾o da linha de comando coincida com um `--` inicial fosse passada na linha de comando (consulte OP횉횛ES, acima)."
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr "import-marks"
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr "import-marks-if-exists"
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr "Como `--import-marks`, exceto em dois aspectos: primeiro, apenas um comando 쨈feature import-marks` ou `feature import-marks-if-exist` 챕 permitido por fluxo; segundo, uma op챌찾o da linha de comando `--import-marks=` ou `--import-marks-if-existents` substitui qualquer um desses comandos \"feature\" no fluxo; terceiro, o `feature import-marks-if-exists` como uma op챌찾o da linha de comando coincidente ignora silenciosamente um arquivo inexistente."
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr "get-mark"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr "cat-blob"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr "ls"
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr "Exija que o o processo interno seja compat챠vel com os comandos 'get-mark', 'cat-blob' ou 'ls' respectivamente. As vers천es do `fast-import` que n찾o sejam compat챠veis com o comando utilizado ser찾o encerradas com uma mensagem. Isso permite que o erro de importa챌찾o encerre com uma mensagem clara, em vez de perder tempo na parte inicial de uma importa챌찾o, antes que um comando n찾o compat챠vel seja detectado."
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr "notes"
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr "Exija que a estrutura seja compat챠vel com o subcomando `notemodify` (N) com o comando `commit`. As vers천es do `fast-import` que n찾o sejam compat챠veis com as anota챌천es ser찾o encerradas com uma mensagem."
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr "done"
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr "Indique um erro caso o fluxo termine snum comando 'done'. Sem este recurso, os erros que fazem com que o front-end termine abruptamente num ponto conveniente no fluxo podem n찾o ser detectados. Isso pode ocorrer, por exemplo, caso um front end de importa챌찾o morra no meio da opera챌찾o sem emitir um `SIGTERM` ou um `SIGKILL` em sua inst창ncia subordinada do `git fast-import`."
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr "Processa a op챌찾o utilizada para que o `fast-import` do git se comporte de maneira que atenda 횪s necessidades do front-end. Observe que as op챌천es utilizadas pelo front-end s찾o substitu챠das por quaisquer op챌천es que o usu찼rio possa especificar para obter o pr처prio `fast-import`."
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr " 'option' SP <op챌찾o> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr "A parte `<op챌찾o>` do comando pode conter qualquer uma das op챌천es listadas na se챌찾o OPTIONS que n찾o alteram a sem창ntica de importa챌찾o, sem o `--` principal e s찾o tratadas da mesma maneira."
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr "Os comandos de op챌찾o devem ser os primeiros comandos na entrada (sem contar os comandos de recurso), para fornecer um comando de op챌찾o ap처s um erro que n찾o seja de op챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr "As seguintes op챌천es de linha de comando alteram a sem창ntica de importa챌찾o e, portanto, n찾o podem ser passadas como op챌찾o:"
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr "cat-blob-fd"
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr "Se o recurso `done` n찾o estiver em uso, ser찼 tratado como se o `EOF` fosse lido. Isso pode ser utilizado para dizer 횪 importa챌찾o r찼pida para terminar mais cedo."
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr "Caso a op챌찾o de linha de comando `--done` ou o comando `feature done` estiver em uso, o comando `done` 챕 obrigat처rio e marca o final do fluxo."
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr "RESPOSTAS AOS COMANDOS"
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr "Os novos objetos gravados pelo `fast-import` que n찾o est찾o dispon챠veis de forma imediata. A maioria dos comandos `fast-import` n찾o tem efeito vis챠vel at챕 o pr처ximo `checkpoint` (ou conclus찾o). O frontend pode enviar os comandos para preencher o canal de entrada do `fast-import` sem se preocupar com a agilidade com que eles entrar찾o em vigor, o que melhora o desempenho ao simplificar o agendamento."
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr "No entanto, para alguns front-end, 챕 첬til poder ler os dados do reposit처rio atual 횪 medida que est찾o sendo atualizados (quando o material de origem descreve objetos em termos de patches a serem aplicados a objetos importados anteriormente por exemplo). Isso pode ser feito conectando o front-end e o `fast-import` por meio de tubos bidirecionais:"
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -24231,49 +24288,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr "Um front-end configurado desta maneira pode usar os comandos `progress`, `get-mark`, `ls` e `cat-blob` para ler as informa챌천es das importa챌천es em andamento."
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr "Para evitar um impasse, tais front-ends devem consumir completamente quaisquer sa챠da pendente que for gerada com `progress`, `ls`, `get-mark` e `cat-blob` antes de realizar as escritas que o `fast-import` possa bloquear."
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr "RELAT횙RIOS DE CRASH"
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr "Caso uma entrada inv찼lida seja utilizada na entrada do `fast-import`, ele terminar찼 com um status de sa챠da diferente de zero e criar찼 um relat처rio de falha no topo do reposit처rio Git de onde estava sendo importado. Os relat처rios de falha cont챗m um instant창neo da condi챌찾o interna do `fast-import`, bem como os comandos mais recentes que levaram 횪 falha."
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr "Todos os comandos recentes (incluindo os coment찼rios do fluxo, altera챌천es do arquivo e comandos de progresso) s찾o exibidos no hist처rico de comandos no relat처rio, mas os dados brutos do arquivo e as mensagens dos commits s찾o exclu챠dos. Essa exclus찾o economiza espa챌o no arquivo de relat처rio e reduz a quantidade de mem처ria interm챕dia que a importa챌찾o r찼pida deve realizar durante a execu챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr "Depois de escrever um relat처rio, o `fast-import` fechar찼 o pacote atual e exportar찼 a tabela de marca챌찾o. Isso permite que o desenvolvedor front-end inspecione a condi챌찾o do reposit처rio e retome a importa챌찾o a partir do ponto em que ele travou. As ramifica챌천es e tags modificadas n찾o s찾o atualizados durante uma falha, pois a importa챌찾o n찾o foi conclu챠da com 챗xito. As informa챌천es do ramo e marca챌찾o podem ser encontrados no relat처rio da falha e devem ser aplicadas manualmente caso a atualiza챌찾o seja necess찼ria."
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr "Um exemplo de falha:"
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -24307,7 +24364,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -24319,7 +24376,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -24335,13 +24392,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr "\tfatal: Corrupt mode: M 777 inline bob\n"
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -24365,13 +24422,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr "M 777 inline bob\n"
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -24383,19 +24440,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr "0 refs/heads/master"
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -24419,307 +24476,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr "------------------- END OF CRASH REPORT"
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr "DICAS E TRUQUES"
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr "As dicas e truques a seguir foram coletadas de v찼rios usu찼rios do `fast-import` e s찾o oferecidas aqui apenas como sugest천es."
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr "Utilize uma Marca챌찾o por Commit"
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr "Ao fazer uma convers찾o de reposit처rio, utilize uma marca챌찾o 첬nica por commit (`mark :<n>`) e forne챌a a op챌찾o `--export-marks` na linha de comando. O `fast-import` despeja um arquivo que lista todas as marca챌천es e o objeto Git SHA-1 que coincida com ela. Se o front-end puder vincular as marca챌천es ao reposit처rio de origem, 챕 f찼cil verificar a precis찾o e a integridade da importa챌찾o comparando cada commit do Git com a revis찾o de origem coincidente."
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr "Vindo de um sistema como o \"Perforce\" ou o \"Subversion\", isso deve ser bastante simples, pois a marca챌찾o do `fast-import` tamb챕m pode ser o n첬mero do conjunto de altera챌천es do \"Perforce\" ou o n첬mero da revis찾o do \"Subversion\"."
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr "Ir Livremente em Torno dos Ramos"
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr "N찾o tente otimizar o front-end para manter uma ramifica챌찾o por vez durante uma importa챌찾o. Embora isso possa ser um pouco mais r찼pido para o `fast-import`, ele tende a aumentar consideravelmente a complexidade do c처digo do front-end."
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr "O LRU do ramo incorporado ao `fast-import` tende a se comportar muito bem e o custo de ativar uma ramo inativo 챕 t찾o baixo que o movimento entre os ramos praticamente n찾o tem impacto no desempenho da importa챌찾o."
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr "Manipulando Renomea챌천es"
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr "Ao importar um arquivo ou diret처rio renomeado, simplesmente exclua os nomes antigos e modifique os novos nomes durante o commit correspondente. O Git executa a detec챌찾o de renomea챌찾o ap처s o fato, em vez de explicitamente detect찼-lo durante um commit."
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr "Utilizando Ramifica챌천es para a Corre챌찾o das Tags"
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr "Alguns outros sistemas SCM permitem ao usu찼rio criar uma tag a partir de v찼rios arquivos que n찾o pertencem ao mesmo commit/changeset. Ou para criar as tags que s찾o um subconjunto dos arquivos dispon챠veis no reposit처rio."
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr "A importa챌찾o dessas tags como est찼 no Git 챕 imposs챠vel sem qe seja feito pelo menos um commit que ``corrija'' os arquivos para coincidir com o conte첬do da tag. Utilize o comando `reset` do `fast-import` para redefinir uma ramifica챌찾o fantasia fora do seu ramo normal para um commit base para a tag, depois confirme um ou mais corre챌천es dos arquivos de commits e por fim, identifique a ramifica챌찾o fantasia."
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr "Uma vez que todas as ramifica챌천es normais s찾o armazenadas em `refs/heads/`, nomeie a tag de manuten챌찾o como `TAG_FIXUP` por exemplo. Dessa forma, 챕 imposs챠vel que a ramifica챌찾o de corre챌찾o utilizada pelo importador tenha os conflitos do espa챌o de nomes com as ramifica챌천es reais importadas da origem (o nome `TAG_FIXUP` n찾o 챕 `refs/heads/TAG_FIXUP`)."
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr "Ao fazer os commits das corre챌천es, considere o uso de `merge` para conectar os commits para fornecer as revis천es dos arquivos ao ramo de corre챌찾o. Isso permitir찼 que ferramentas como o 'git blame' rastreiem o hist처rico real do commit e anotem adequadamente os arquivos de origem."
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr "Quando o `fast-import` encerrar, o front-end precisar찼 executar o comando `rm .git/TAG_FIXUP` para remover a ramifica챌찾o fantasia."
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr "Importe Agora, Reembale Depois"
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr "Logo que o `fast-import` conclua, o reposit처rio Git estar찼 completamente v찼lido e pronto para uso. Normalmente, o processo consome muito pouco tempo, mesmo para projetos consideravelmente grandes (com mais de 100.000 commits)."
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr "No entanto, 챕 necess찼rio reembalar o reposit처rio para melhorar a localidade dos dados e melhorar o desempenho. Projetos extremamente grandes pode levar horas (especialmente se `-f` e um par창metro `--window` grande for utilizado). Como a reembalagem 챕 segura para ser executada ao lado de leitores e escritores, execute a re-embalagem em segundo plano e deixe acabar quando finalizar. N찾o h찼 motivo para esperar a explora챌찾o do seu novo projeto Git!"
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr "Caso opte por aguardar o reembalo, n찾o tente executar benchmarks ou testes de desempenho at챕 que o processo termine. o `fast-import` gera arquivos de pacotes otimizados que simplesmente nunca s찾o vistos em situa챌천es de uso real."
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr "Reempacotando Dados Hist처ricos"
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr "Se voc챗 estiver reembalando dados importados muito antigos (por exemplo, mais antigos que no ano passado), considere gastar algum tempo extra da CPU e fornecer --window = 50 (ou superior) ao executar o 'git repack'. Isso levar찼 mais tempo, mas tamb챕m produzir찼 um pacote menor. Voc챗 s처 precisa perder tempo uma vez e todos os usu찼rios do seu projeto se beneficiar찾o do reposit처rio menor."
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr "Incluir Algumas Mensagens de Progresso"
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr "Para importar rapidamente, de vez em quando o seu front-end emite uma mensagem de `progresso`. O conte첬do das mensagens 챕 totalmente livre, portanto, uma sugest찾o seria gerar a informa챌찾o do m챗s e o ano atual cada vez que a data do commit atual passar para o pr처ximo m챗s. Os seus usu찼rios se sentir찾o melhor ao saber quanto do fluxo de dados foi processado."
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr "OTIMIZA횉횄O DOS PACOTES"
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr "Ao compactar uma bolha, o `fast-import` sempre tenta \"deltificar\" a 첬ltima bolha gravada. A menos que seja especificamente organizado pelo front-end, essa provavelmente n찾o ser찼 uma vers찾o anterior do mesmo arquivo, portanto o delta gerado n찾o ser찼 o menor poss챠vel. O pacote do arquivo resultante ser찼 compactado, mas n찾o ser찼 otimizado."
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr "Os front-ends que t챗m acesso eficiente a todas as revis천es de um 첬nico arquivo (lendo um arquivo RCS/CVS, v por exemplo) podem optar por fornecer todas as revis천es desse arquivo como uma sequ챗ncia de comandos consecutivos do `blob` (bolha). Isso permite que o `fast-import` \"deltifique\" as diferentes revis천es dos arquivos, economizando espa챌o no arquivo do pacote final. As Marca챌천es podem ser utilizadas para posterior identifica챌찾o das revis천es individuais dos arquivos durante uma sequ챗ncia de comandos `commit`."
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr "Os arquivos de pacotes criados pelo `fast-import` n찾o incentivam bons padr천es de acesso ao disco. Isso 챕 cautilizado pela grava챌찾o dos dados do `fast-import` na ordem em que s찾o recebidos na entrada padr찾o, enquanto o Git normalmente organiza os dados nos pacotes dos arquivos para fazer com que os dados mais recentes (dica atual) apare챌am antes dos dados hist처ricos. O Git tamb챕m agrupa os commits acelerando o percurso de revis찾o atrav챕s de uma melhor localidade do cache."
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr "Por esse motivo 챕 altamente recomend찼vel que os usu찼rios reembalem o reposit처rio com o comando `git repack -a -d` ap처s a conclus찾o do `fast-import`, permitindo que o Git reorganize os pacotes dos arquivos para um acesso mais r찼pido aos dados. Caso os deltas da bolha estejam abaixo do ideal (veja acima), a adi챌찾o da op챌찾o `-f` para impor que todos os deltas sejam recalculados podendo reduzir significativamente o tamanho final do pacote do arquivo (30-50% menor pode ser bastante comum)."
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr "Em vez de executar o `git repack`, 챕 poss챠vel tamb챕m executar o `git gc --aggressive`, que tamb챕m otimizar찼 outras coisas ap처s uma importa챌찾o (refazer os pacotes refs soltos por exemplo). Como observado na se챌찾o \"AGGRESSIVE\" no linkgit:git-gc[1] a op챌찾o `--aggressive` encontrar찼 os novos deltas com a op챌찾o `-f` para linkgit:git-repack[1]. Pelas raz천es descritas acima, a utiliza챌찾o da op챌찾o `--aggressive` ap처s uma importa챌찾o r찼pida, este 챕 um dos poucos casos em que se sabe que vale a pena ser feito."
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr "UTILIZA횉횄O DE MEM횙RIA"
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr "H찼 uma quantidade de fatores que afetam a quantidade de mem처ria consumida pelo `fast-import` durante a execu챌찾o de uma importa챌찾o. Como as se챌천es cr챠ticas do Git principal, o `fast-import` usa os seus pr처prios alocadores de mem처ria para amortizar o consumo geral associadas ao \"malloc\". Na pr찼tica, o `fast-import` tende a amortizar o consumo geral do malloc para 0, devido ao uso de grandes aloca챌천es dos blocos."
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr "por objeto"
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr "O `fast-import` mant챕m uma estrutura na mem처ria para todos os objetos gravados nesta execu챌찾o. Em um sistema de 32 bits a estrutura 챕 de 32 bytes; num sistema de 64 bits a estrutura 챕 de 40 bytes (devido aos tamanhos maiores do ponteiro). Os objetos na tabela n찾o s찾o desalocados at챕 que o `fast-import` termine. A importa챌찾o de 2 milh천es de objetos num sistema de 32 bits exigir찼 aproximadamente 64 MiB de mem처ria."
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr "A tabela de objetos 챕 na verdade uma \"hashtable\" (tabela hash) codificada no nome do objeto com o SHA-1. Essa configura챌찾o de armazenamento permite que o `fast-import` reutilize um objeto existente ou j찼 gravado e evite gravar duplicatas no sa챠da do arquivo de pacote. Em uma importa챌찾o, as bolhas duplicadas s찾o muito comuns, geralmente devido a mesclagem do ramo na origem."
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr "por marca챌찾o"
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr "As marca챌천es s찾o armazenadas numa origem esparsa, utilizando 1 ponteiro (4 bytes ou 8 bytes, dependendo do tamanho do ponteiro) por marca챌찾o. Embora a origem seja escassa, os front-end ainda s찾o fortemente incentivados a usar marcas entre 1 e n, onde n 챕 a quantidade total de marca챌천es necess찼rias para essa importa챌찾o."
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr "por ramo"
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr "Os ramos s찾o classificados como ativos e inativos. O uso de mem처ria das duas classes 챕 significativamente diferente."
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr "As ramifica챌천es inativas s찾o armazenadas numa estrutura que usa entre 96 ou 120 bytes (sistemas de 32 ou 64 bits, respectivamente), mais o comprimento do nome do ramo (normalmente com menos de 200 bytes), por ramifica챌찾o. O `fast-import` processa facilmente at챕 10.000 ramifica챌천es inativas com menos de 2 MiB de mem처ria."
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr "As ramifica챌천es ativas t챗m a mesma sobrecarga das ramifica챌천es inativas, mas tamb챕m cont챗m as c처pias de todas as 찼rvores que foram modificadas recentemente nesta ramifica챌찾o. Se a sub찼rvore `include` n찾o tenha sido modificada, desde o momento que a ramifica챌찾o se tornou ativa, o seu conte첬do n찾o ser찼 carregado na mem처ria, mas o seu conte첬do ser찼 carregado na mem처ria caso a sub찼rvore `src` tenha sido modificada por um commit."
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr "� medida que as ramifica챌천es ativas armazenam metadados sobre os arquivos existentes nessa ramifica챌찾o, o tamanho do armazenamento na mem처ria pode aumentar consideravelmente (veja abaixo)."
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr "Com base num algoritmo simples, o `fast-import` move automaticamente as ramifica챌천es ativas para a condi챌찾o inativa utilizando um algor챠timo simples. A cadeia LRU 챕 atualizada a cada comando `commit`. A quantidade m찼xima de ramifica챌천es ativas pode se aumentado ou diminu챠do na linha de comando com a op챌찾o `--active-branches=`."
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr "por 찼rvore ativa"
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr "As 찼rvores (tamb챕m conhecidas como diret처rios) usam apenas 12 bytes de mem처ria no topo da mem처ria necess찼ria para as suas entradas (consulte ``por arquivo ativo'' abaixo). O custo de uma 찼rvore 챕 praticamente 0, pois sua sobrecarga 챕 amortizada pelas entradas de arquivo individuais."
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr "por entrada de arquivo ativa"
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr "Os arquivos (e os ponteiros para as sub찼rvores) nas 찼rvores ativas requerem 52 ou 64 bytes (plataformas de 32/64 bits) por entrada. Para economizar espa챌o, os nomes dos arquivos e as 찼rvores s찾o agrupados numa tabela de cadeias comuns, permitindo que o nome do arquivo ``Makefile'' utilize apenas 16 bytes (ap처s incluir a sobrecarga do cabe챌alho da cadeia), n찾o importa quantas vezes isso ocorra no projeto."
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr "O LRU do ramo ativo, quando associado ao conjunto da cadeia de caracteres do nome do arquivo e ao carregamento lento das sub찼rvores, permite que a efici챗ncia da importa챌찾o r찼pida dos projetos com mais de 2.000 ramifica챌천es e mais de 45.114 arquivos num espa챌o de mem처ria muito limitado (menos de 2,7 MiB por ramo ativo)."
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr "SINAIS"
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr "Enviar um *SIGUSR1* para o processo 'git fast-import' encerra antes o arquivo do pacote atual, simulando um comando `checkpoint`. O operador mais impaciente pode usar esse recurso para espiar os objetos e as refer챗ncias de uma importa챌찾o em andamento, ao custo de um tempo de execu챌찾o adicional e de uma pior compacta챌찾o."
@@ -30193,7 +30250,11 @@ msgid ""
"'git help' [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]\n"
"'git help' [-g|--guides]\n"
"'git help' [-c|--config]\n"
-msgstr "'git help' [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]\n'git help' [[-i|--info] [-m|--man] [-w|--web]] [<comando>|<guia>]\n'git help' [-g|--guides]\n'git help' [-c|--config]\n"
+msgstr ""
+"'git help' [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]\n"
+"'git help' [[-i|--info] [-m|--man] [-w|--web]] [<comando>|<guia>]\n"
+"'git help' [-g|--guides]\n"
+"'git help' [-c|--config]\n"
#. type: Plain text
#: en/git-help.txt:22
@@ -34270,7 +34331,10 @@ msgid ""
"'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n"
"\t [--name-only] [--name-status] [--object-only] [--full-name] [--full-tree] [--abbrev[=<n>]] [--format=<format>]\n"
"\t <tree-ish> [<path>...]\n"
-msgstr "'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n\t [--name-only] [--name-status] [--object-only] [--full-name] [--full-tree] [--abbrev[=<n>]] [--format=<formato>]\n\t <tree-ish> [<caminho>...]\n"
+msgstr ""
+"'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n"
+"\t [--name-only] [--name-status] [--object-only] [--full-name] [--full-tree] [--abbrev[=<n>]] [--format=<formato>]\n"
+"\t <tree-ish> [<caminho>...]\n"
#. type: Plain text
#: en/git-ls-tree.txt:20
@@ -35859,7 +35923,10 @@ msgid ""
"*Warning*: Running 'git merge' with non-trivial uncommitted changes is\n"
"discouraged: while possible, it may leave you in a state that is hard to\n"
"back out of in the case of a conflict.\n"
-msgstr "*Aviso*: 횋 desencorajado executar o comando 'git merge' com altera챌천es\nn찾o-triviais dos commits que n찾o foram feitos 챕 desencorajado: enquanto\nposs챠vel, pode deix찼-lo numa condi챌찾o dif챠cil de sair no caso de haver um conflito.\n"
+msgstr ""
+"*Aviso*: 횋 desencorajado executar o comando 'git merge' com altera챌천es\n"
+"n찾o-triviais dos commits que n찾o foram feitos 챕 desencorajado: enquanto\n"
+"poss챠vel, pode deix찼-lo numa condi챌찾o dif챠cil de sair no caso de haver um conflito.\n"
#. type: Plain text
#: en/git-merge.txt:62
@@ -36664,7 +36731,10 @@ msgid ""
"An abbreviated revision 2ae0a9cb82 will not be substituted.\n"
"The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907,\n"
"while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
-msgstr "Uma revis찾o abreviada 2ae0a9cb82 n찾o ser찼 substitu챠da.\nO nome completo ap처s a substitui챌찾o 챕 2ae0a9cb8298185a94e5998086f380a355dd8907,\nenquanto o objeto da 찼rvore 챕 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
+msgstr ""
+"Uma revis찾o abreviada 2ae0a9cb82 n찾o ser찼 substitu챠da.\n"
+"O nome completo ap처s a substitui챌찾o 챕 2ae0a9cb8298185a94e5998086f380a355dd8907,\n"
+"enquanto o objeto da 찼rvore 챕 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
#. type: delimited block -
#: en/git-name-rev.txt:61
@@ -36679,7 +36749,10 @@ msgid ""
"An abbreviated revision 2ae0a9cb82 will not be substituted.\n"
"The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907 (master),\n"
"while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
-msgstr "Uma revis찾o abreviada 2ae0a9cb82 n찾o ser찼 substitu챠da.\nO nome completo ap처s a substitui챌찾o 챕 2ae0a9cb8298185a94e5998086f380a355dd8907 (master),\nenquanto o objeto da 찼rvore 챕 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
+msgstr ""
+"Uma revis찾o abreviada 2ae0a9cb82 n찾o ser찼 substitu챠da.\n"
+"O nome completo ap처s a substitui챌찾o 챕 2ae0a9cb8298185a94e5998086f380a355dd8907 (master),\n"
+"enquanto o objeto da 찼rvore 챕 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
#. type: delimited block -
#: en/git-name-rev.txt:67
@@ -36694,7 +36767,10 @@ msgid ""
"An abbreviated revision 2ae0a9cb82 will not be substituted.\n"
"The full name after substitution is master,\n"
"while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
-msgstr "Uma revis찾o abreviada do 2ae0a9cb82 n찾o ser찼 substitu챠da.\nO nome completo ap처s a substitui챌찾o 챕 master,\nenquanto o objeto da 찼rvore 챕 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
+msgstr ""
+"Uma revis찾o abreviada do 2ae0a9cb82 n찾o ser찼 substitu챠da.\n"
+"O nome completo ap처s a substitui챌찾o 챕 master,\n"
+"enquanto o objeto da 찼rvore 챕 70d105cc79e63b81cfdcb08a15297c23e60b07ad\n"
#. type: Plain text
#: en/git-name-rev.txt:76
@@ -45367,7 +45443,20 @@ msgid ""
"'git remote' [-v | --verbose] 'show' [-n] <name>...\n"
"'git remote prune' [-n | --dry-run] <name>...\n"
"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
-msgstr "'git remote' [-v | --verbose]\n'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>\n'git remote rename' [--[no-]progress] <antigo> <novo>\n'git remote remove' <nome>\n'git remote set-head' <nome> (-a | --auto | -d | --delete | <ramo>)\n'git remote set-branches' [--add] <nome> <ramo>...\n'git remote get-url' [--push] [--all] <nome>\n'git remote set-url' [--push] <nome> <newurl> [<oldurl>]\n'git remote set-url --add' [--push] <nome> <newurl>\n'git remote set-url --delete' [--push] <nome> <URL>\n'git remote' [-v | --verbose] 'show' [-n] <nome>...\n'git remote prune' [-n | --dry-run] <nome>...\n'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | <remoto>)...]\n"
+msgstr ""
+"'git remote' [-v | --verbose]\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>\n"
+"'git remote rename' [--[no-]progress] <antigo> <novo>\n"
+"'git remote remove' <nome>\n"
+"'git remote set-head' <nome> (-a | --auto | -d | --delete | <ramo>)\n"
+"'git remote set-branches' [--add] <nome> <ramo>...\n"
+"'git remote get-url' [--push] [--all] <nome>\n"
+"'git remote set-url' [--push] <nome> <newurl> [<oldurl>]\n"
+"'git remote set-url --add' [--push] <nome> <newurl>\n"
+"'git remote set-url --delete' [--push] <nome> <URL>\n"
+"'git remote' [-v | --verbose] 'show' [-n] <nome>...\n"
+"'git remote prune' [-n | --dry-run] <nome>...\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | <remoto>)...]\n"
#. type: Plain text
#: en/git-remote.txt:30
@@ -61301,7 +61390,15 @@ msgid ""
"'git worktree remove' [-f] <worktree>\n"
"'git worktree repair' [<path>...]\n"
"'git worktree unlock' <worktree>\n"
-msgstr "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <novo-ramo>] <caminho> [<commit-ish>]\n'git worktree list' [-v | --porcelain] [-z]]\n'git worktree lock' [--reason <texto>] <찼rvore de trabalho>\n'git worktree move' <찼rvore de trabalho> <novo caminho>\n'git worktree prune' [-n] [-v] [--expire <expire>]\n'git worktree remove' [-f] <찼rvore de trabalho>\n'git worktree repair' [<caminho>...]\n'git worktree unlock' <찼rvore de trabalho>\n"
+msgstr ""
+"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <novo-ramo>] <caminho> [<commit-ish>]\n"
+"'git worktree list' [-v | --porcelain] [-z]]\n"
+"'git worktree lock' [--reason <texto>] <찼rvore de trabalho>\n"
+"'git worktree move' <찼rvore de trabalho> <novo caminho>\n"
+"'git worktree prune' [-n] [-v] [--expire <expire>]\n"
+"'git worktree remove' [-f] <찼rvore de trabalho>\n"
+"'git worktree repair' [<caminho>...]\n"
+"'git worktree unlock' <찼rvore de trabalho>\n"
#. type: Plain text
#: en/git-worktree.txt:25
@@ -61834,7 +61931,14 @@ msgid ""
"\tlocked: worktree path is mounted on a portable device\n"
"/path/to/prunable-worktree 5678abc1 (detached HEAD)\n"
"\tprunable: gitdir file points to non-existent location\n"
-msgstr "$ git worktree list --verbose\n/path/to/linked-worktree abcd1234 [master]\n/path/to/locked-worktree-no-reason abcd5678 (HEAD desanexado) bloqueado\n/path/to/locked-worktree-with-reason 1234abcd (brancha)\n\tbloqueado: a 찼rvore de trabalho est찼 montando em um dispositivo port찼til\n/path/to/prunable-worktree 5678abc1 (HEAD desanexado)\n\tpod찼vel: o arquivo gitdir aponta para um local que n찾o existe\n"
+msgstr ""
+"$ git worktree list --verbose\n"
+"/path/to/linked-worktree abcd1234 [master]\n"
+"/path/to/locked-worktree-no-reason abcd5678 (HEAD desanexado) bloqueado\n"
+"/path/to/locked-worktree-with-reason 1234abcd (brancha)\n"
+"\tbloqueado: a 찼rvore de trabalho est찼 montando em um dispositivo port찼til\n"
+"/path/to/prunable-worktree 5678abc1 (HEAD desanexado)\n"
+"\tpod찼vel: o arquivo gitdir aponta para um local que n찾o existe\n"
#. type: Plain text
#: en/git-worktree.txt:423
@@ -62038,1261 +62142,1261 @@ msgstr "Escreve o objeto 찼rvore que represente um subdiret처rio `<prefixo>`. P
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr "gitglossary - Um Gloss찼rio do Git"
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr "*\n"
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[O Manual do Usu찼rio Git]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr "[[def_alternate_object_database]]alternate object database (banco de dados alternativo do objeto)"
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr "Atrav챕s do mecanismo alternativo, um <<def_repository,reposit처rio>> pode herdar parte do seu <<def_object_database,banco de dados do objeto>> vindo de outro banco de dados de objeto, chamado \"alternativo\"."
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr "[[def_bare_repository]]bare repository (reposit처rio simples)"
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr "Um reposit처rio simples normalmente 챕 um diret처rio <<def_directory,diret처rio>> apropriadamente denominado com um sufixo `.git` que n찾o possui uma c처pia local averiguada de nenhum dos arquivos sob controle da revis찾o. Ou seja, todos os arquivos administrativos e de controle do Git que normalmente estariam presentes no subdiret처rio `.git` oculto est찾o diretamente presentes no diret처rio `repository.git`, e nenhum outro arquivo est찼 presente e 챕 retirado. Normalmente, os editores dos reposit처rios p첬blicos disponibilizam reposit처rios simples."
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr "[[def_blob_object]]blob object (objeto bolha)"
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr "Um <<def_object,objeto>> sem tipo, por exemplo, o conte첬do de um arquivo."
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr "[[def_branch]]branch (ramo)"
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr "Um \"ramo\" 챕 uma linha de desenvolvimento. O <<def_commit,commit >> mais recente em um ramo 챕 referido como o cume deste ramo. O cume do ramo 챕 referenciado por um ramo <<def_head,head>>, que avan챌a 횪 medida que o desenvolvimento adicional 챕 feito no ramo. Um 첬nico Git <<def_repository,reposit처rio>> pode monitorar um n첬mero arbitr찼rio de ramos, por챕m a sua <<def_working_tree,찼rvore de trabalho>> est찼 associada apenas a uma delas (o ramo \"atual\" ou \"averiguado\") e <<def_HEAD,HEAD>> aponte para esse ramo."
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr "[[def_cache]]cache"
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr "횋 obsoleto para: <<def_index,챠ndice>>."
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr "[[def_chain]]chain (cadeia ou corrente)"
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr "Uma lista dos objetos onde cada objeto <<def_object,objeto>> cont챕m uma refer챗ncia ao seu sucessor (por exemplo, o sucessor de um <<def_commit,commit>> pode ser uma das suas <<def_parent,origens>>)."
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr "[[def_changeset]]changeset (conjunto de altera챌천es)"
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr "O BitKeeper/cvsps fala por \"<<def_commit,commit>>\". Como o Git n찾o armazena as altera챌천es, mas declara, que realmente n찾o faz sentido utilizar o termo \"changesets\" com o Git."
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr "[[def_checkout]]checkout (averigua챌찾o)"
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr "A a챌찾o de atualizar todos ou parte da <<def_working_tree,찼rvore de trabalho>> com o <<def_tree_object,objeto da 찼rvore>> ou <<def_blob_object,bolha>> vindo do <<def_object_database,banco de dados do objeto>>, e atualizando o <<def_index,챠ndice>> e <<def_HEAD,HEAD>> caso toda a 찼rvore tenha um ponteiro para um novo <<def_branch,ramo>>."
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr "[[def_cherry-picking]]cherry-picking (escolha-seletiva)"
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr "No jarg찾o <<def_SCM,SCM>>, a \"escolha seletiva\" (cherry pick) significa escolher um subconjunto das altera챌천es de uma s챕rie de altera챌천es (em geral, commits) e registr찼-las como uma nova s챕rie de altera챌천es sobre uma base de c처digo diferente. No Git, isso 챕 executado pelo comando `git cherry-pick` para extrair a altera챌찾o introduzida atrav챕s de um <<def_commit,commit>> j찼 existente e registr찼-lo com base no cume do <<def_branch,ramo>> atual como um novo commit."
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr "[[def_clean]]clean (limpar, limpeza)"
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr "Uma <<def_working_tree,찼rvore de trabalho>> est찼 limpa, caso corresponda 횪 <<def_revision,revis찾o>> referenciada pelo <<def_head,cabe챌alho>> atual. Consulte tamb챕m \"<<def_dirty,dirty>>\"."
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr "[[def_commit]]commit"
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr "Como um substantivo: um 첬nico ponto no hist처rico do Git; todo o hist처rico de um projeto 챕 representado como um conjunto de commits inter-relacionados. A palavra \"commit\" 챕 frequentemente utilizada pelo Git nos mesmos locais onde outros sistemas para o controle da revis찾o utilizem as palavras \"revision\" (revis찾o) ou \"version\" (vers찾o). Tamb챕m utilizado como uma abrevia챌찾o para um <<def_commit_object,objeto commit>>."
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr "Como um verbo: A a챌찾o de armazenar um novo instant창neo da condi챌찾o do projeto no hist처rico do Git, criando um novo commit que representa a condi챌찾o atual do <<def_index,챠ndice>> e avan챌ando o <<def_HEAD,HEAD>> apontando para o novo commit."
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr "[[def_commit_object]]commit object (objeto commit)"
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr "Um objeto <<def_object,objeto>>, que cont챕m as informa챌천es sobre uma <<def_revision,revis찾o>> espec챠fica, como <<def_parent,origem>>, de quem fez o commit, o autor, a data e o <<def_tree_object,objeto 찼rvore>> que corresponde <<def_directory,diret처rio>> da revis찾o que foi armazenada."
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr "[[def_commit-ish]]commit-ish (tamb챕m committish)"
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr "Um <<def_commit_object,objeto commit>> ou um <<def_object,objeto>> que pode perder a refer챗ncia de forma recursiva para um objeto commit. A seguir est찾o todos os 'commit-ishes': um objeto commit, um <<def_tag_object,objeto tag>> que aponta para um objeto commit, um objeto tag que aponta para um objeto tag que aponta para um objeto commit, etc."
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr "[[def_core_git]]core Git (n첬cleo do Git)"
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr "Estruturas de dados e utilit찼rios fundamentais do Git. Exp천e apenas as ferramentas limitadas ao gerenciamento de c처digo-fonte."
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr "[[def_DAG]]DAG"
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr "Gr찼fico ac챠clico dirigido. Os <<def_commit_object,objetos commit>> forma um grafo ac챠clico direcionado, porque eles t챗m parentes (direcionados), e o grafo dos objetos commit s찾o ac챠clicos (n찾o existe <<def_chain,cadeia>> que comece e termine com o mesmo <<def_object,objeto>>)."
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr "[[def_dangling_object]]dangling object (objeto pendurado, pendente)"
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr "Um objeto <<def_unreachable_object,objeto inacess챠vel>> que n찾o seja <<def_reachable,acess챠vel>>, mesmo a partir dos outros objetos inacess챠veis; um objeto pendente n찾o tem refer챗ncias a ele vinda de nenhuma refer챗ncia ou <<def_object,objeto>> no <<def_repository,reposit처rio>>."
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr "[[def_detached_HEAD]]detached HEAD (HEAD desanexado, CABE횉A desanexada)"
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr "Normalmente, o <<def_HEAD,HEAD>> armazena o nome do <<def_branch,ramo>> e os comandos que operam no hist처rico que o `HEAD` representa, operam no hist처rico que leva ao cume do ramo onde o HEAD aponta. No entanto, o Git tamb챕m permite que voc챗 <<def_checkout,averigue>> um <<def_commit,commit>> arbitr찼rio que n찾o seja necessariamente o cume de qualquer ramo em particular. O HEAD em tal condi챌찾o 챕 chamado de \"desanexado\" (detached)."
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr "Observe que os comandos que operam no hist처rico do ramo atual (por exemplo o `git commit` para criar um novo hist처rico sobre ele) ainda funcionam enquanto o `HEAD` for desanexado. Eles atualizam o `HEAD` para apontar no topo do hist처rico atualizado sem afetar nenhum ramo. Os comandos que atualizam ou consultam informa챌천es _sobre_ o ramo atual (por exemplo o comando `git branch --set-upstream-to` que define com qual ramo monitorado remotamente o ramo atual se integra) obviamente n찾o funcionam, pois n찾o h찼 um ramo atual (real) para perguntar sobre esta condi챌찾o."
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr "[[def_directory]]directory (diret처rio)"
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr "A lista que voc챗 consegue com \"ls\" :-)"
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr "[[def_dirty]]dirty (sujo)"
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr "Se diz que uma <<def_working_tree,찼rvore de trabalho>> est찼 \"suja\" caso contenha altera챌천es que n찾o foram <<def_commit,feito os commits>> no <<def_branch,ramo>> atual."
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr "[[def_evil_merge]]evil merge (mesclagem m찼, mau, ruim)"
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr "Uma mesclagem m찼 챕 uma <<def_merge,mesclagem>> que introduz as altera챌천es que n찾o aparecem em nenhuma <<def_parent,origem>>."
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr "[[def_fast_forward]]fast-forward (avan챌o-r찼pido)"
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr "Um avan챌o r찼pido 챕 um tipo especial de <<def_merge,mesclagem>>, onde voc챗 tem uma <<def_revision,revis찾o>> e est찼 \"mesclando\" outras altera챌천es do <<def_branch,ramo>> que s찾o descendentes do que voc챗 tem. Nesse caso, voc챗 n찾o faz um <<def_merge,merge>> <<def_commit,commit>>, mas em vez disso, atualiza apenas o seu ramo para que aponte para a mesma revis찾o do ramo que voc챗 est찼 fazendo a mesclagem. Isso acontecer찼 frequentemente em um <<def_remote_tracking_branch,ramo monitorado remotamente>> de um <<def_repository,reposit처rio>> remoto."
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr "[[def_fetch]]fetch (busca)"
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr "Busque um <<def_branch,ramo>> significa obter o <<def_head_ref,cabe챌alho ref>> de um ramo remoto <<def_repository,reposit처rio>>, para descobrir quais os objetos est찾o faltando no local <<def_object_database,banco de dados do objeto>> e para obt챗-los tamb챕m. Consulte tamb챕m linkgit:git-fetch[1]."
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr "[[def_file_system]]file system (sistema de arquivo)"
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr "O Linus Torvalds originalmente projetou o Git para ser um sistema de arquivos no espa챌o do usu찼rio, ou seja, a infraestrutura para armazenar os arquivos e os diret처rios. Isso garantiu a efici챗ncia e a velocidade do Git."
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr "[[def_git_archive]]Git archive (arquivo Git)"
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr "횋 um sin척nimo para <<def_repository,reposit처rio>> (para o pessoal do arch)."
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr "[[def_gitfile]]gitfile"
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr "Um arquivo simples `.git` na raiz de uma 찼rvore em funcionamento que aponte para o diret처rio que seja o reposit처rio real."
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr "[[def_grafts]]grafts (grafos)"
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr "O Grafts permite que duas linhas de desenvolvimento diferentes sejam unidas, registrando informa챌천es falsas de ancestralidade para os commits. Dessa forma, 챕 poss챠vel fazer o Git fingir que o conjunto de <<def_parent,parents>> um <<def_commit,commit>> tenha 챕 diferente do que foi registrado quando o commit foi criado. Configurado atrav챕s do arquivo `.git/info/grafts`."
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr "Observe que o mecanismo de enxertos est찼 desatualizado e pode levar a problemas na transfer챗ncia dos objetos entre os reposit처rios; para fazer a mesma coisa consulte linkgit:git-replace[1] para um sistema mais flex챠vel e robusto."
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr "[[def_hash]]hash"
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr "Em termos do Git, 챕 um sin척nimo para <<def_object_name,nome do objeto>>."
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr "[[def_head]]head (cabe챌alho, cabe챌a)"
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr "Um <<def_ref,named reference>> para o <<def_commit,commit>> no topo do <<def_branch,ramo>>. Os `HEADS` s찾o armazenados em um arquivo no diret처rio `$GIT_DIR/refs/heads/`, exceto quando 챕 utilizado um `ref` empacotado. (Consulte linkgit:git-pack-refs[1].)"
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr "[[def_HEAD]]HEAD (CABE횉ALHO, CABE횉A)"
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr "O <<def_branch,ramo>> atual. Com mais detalhes: A sua <<def_working_tree,찼rvore de trabalho>> normalmente deriva da condi챌찾o da refer챗ncia da 찼rvore atrav챕s do `HEAD`. O `HEAD` 챕 a refer챗ncia para um dos <<def_head,cabe챌alhos>> no seu reposit처rio, exceto quando utilizar um <<def_detached_HEAD,HEAD desanexado>>, neste caso, referencia diretamente um commit arbitr찼rio."
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr "[[def_head_ref]]head ref (refer챗ncia do cabe챌alho)"
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr "횋 um sin척nimo para <<def_head,cabe챌alho>>."
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr "[[def_hook]]hook (gancho)"
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr "Durante a execu챌찾o normal dos v찼rios comandos Git, s찾o feitas chamadas para os scripts opcionais que permitem que um desenvolvedor adicione mais funcionalidades ou verifica챌천es. Normalmente, os ganchos permitem que um comando seja pr챕-verificado e potencialmente abortado e permite uma notifica챌찾o ap처s a conclus찾o da opera챌찾o. Os scripts do gancho s찾o encontrados no diret처rio `$GIT_DIR/hooks/` e s찾o ativados simplesmente ao remover o sufixo `.sample` do nome do arquivo. Nas vers천es anteriores do Git, era necess찼rio torn찼-los execut찼veis."
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr "[[def_index]]index (챠ndice)"
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr "Uma cole챌찾o dos arquivos com as informa챌천es das estat챠sticas, cujo conte첬do 챕 armazenado como objetos. O 챠ndice 챕 uma vers찾o armazenada da sua <<def_working_tree,찼rvore de trabalho>>. Na verdade, ele tamb챕m pode conter uma segunda e at챕 terceira vers찾o de uma 찼rvore em funcionamento, que s찾o usadas quando for <<def_merge,mesclado>>."
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr "[[def_index_entry]]index entry (lan챌amento, entrada do 챠ndice)"
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr "As informa챌천es sobre um determinado arquivo, armazenadas no <<def_index,챠ndice>>. Uma entrada do 챠ndice pode ter a mesclagem removida, caso uma <<def_merge,mesclagem>> seja iniciada, por챕m ainda n찾o foi conclu챠do (ou seja, caso o 챠ndice contenha v찼rias vers천es deste arquivo)."
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr "[[def_master]]master (mestre)"
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr "O desenvolvimento predefinido do <<def_branch,ramo>>. Sempre quando voc챗 cria um <<def_repository,reposit처rio>> Git, um ramo chamado \"master\" 챕 criado e se torna o ramo ativo. Na maioria dos casos, cont챕m o desenvolvimento local, embora isto seja puramente por conven챌찾o e n찾o seja necess찼rio."
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr "[[def_merge]]merge (mesclar, mesclagem, juntar, combinar, misturar, fundir-se, unir, ligar-se)"
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr "Como verbo: Para trazer o conte첬do de outro <<def_branch,ramo>> (possivelmente de um <<def_repository,reposit처rio>> externo) para o ramo atual. No caso onde a ramifica챌찾o mesclada seja de um reposit처rio diferente, primeiro isto 챕 feito ao <<def_fetch,buscar>> (fetch) o ramo remoto e depois mesclando o seu resultado no ramo atual. Essa combina챌찾o das opera챌천es de busca e mesclagem 챕 chamada de <<def_pull,captura>> (pull). A mesclagem 챕 realizada atrav챕s de um processo autom찼tico que identifica as altera챌천es feitas desde que as ramifica챌천es divirjam e depois aplique todas estas altera챌천es juntas. Nos casos onde as altera챌천es entrem em conflito, pode ser necess찼ria interven챌찾o manual para concluir a mesclagem."
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr "Como substantivo: a menos que seja um <<def_fast_forward,avan챌o r찼pido>>, uma mesclagem bem-sucedida resulta na cria챌찾o de um novo <<def_commit,commit>> representando o resultado da mesclagem e tendo como <<def_parent,parentes>> as dicas das <<def_branch,ramifica챌천es>>. Este commit refere-se ao chamado \"merge commit\" (commit da mesclagem) ou 횪s vezes, apenas como \"mesclagem\"."
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr "[[def_object]]object (objeto)"
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr "A unidade de armazenamento no Git. Ele 챕 identificado exclusivamente pelo <<def_SHA1,SHA-1>> do seu conte첬do. Consequentemente, um objeto n찾o pode ser alterado."
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr "[[def_object_database]]object database (banco de dados do objeto)"
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr "Armazena o conjunto de \"objetos\", e um <<def_object,objeto>> individual 챕 identificado pelos seus <<def_object_name,nomes dos objetos>>. Geralmente o objeto reside no `$GIT_DIR/objects/`."
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr "[[def_object_identifier]]object identifier (identificador do objeto)"
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr "횋 um sin척nimo para o <<def_object_name,nome do objeto>>."
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr "[[def_object_name]]object name (nome do objeto)"
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr "O identificador 첬nico para um <<def_object,objeto>>. O nome do objeto geralmente 챕 representado por uma sequ챗ncia com 40 caracteres hexadecimais. Tamb챕m chamado coloquialmente de <<def_SHA1,SHA-1>>."
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr "[[def_object_type]]tipo do objeto"
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr "Um dos identificadores \"<<def_commit_object,commit>>\", \"<<def_tree_object,찼rvore>>\", \"<<def_tag_object,tag>>\" ou \"<<def_blob_object,bolha>>\" descrevendo o tipo de um <<def_object,objeto>>."
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr "[[def_octopus]]octopus (polvo)"
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr "Para <<def_merge,mesclar>> mais de duas <<def_branch,ramifica챌천es>>."
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr "[[def_origin]]origin (origem)"
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr "O <<def_repository,reposit처rio>> upstream predefinido. A maioria dos projetos possui pelo menos um projeto \"upstream\" que eles monitoram. A predefini챌찾o 'origin' 챕 usada para isso. As atualiza챌천es do novo \"upstream\" ser찾o buscados no <<def_remote_tracking_branch,ramo monitorado remotamente>> chamado 'origin/name-of-upstream-branch', que voc챗 pode ver usando o comando `git branch -r`."
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr "[[def_overlay]]overlay (cobrir, revestir, sobrepor, capa, camada)"
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr "Atualize e adicione apenas os arquivos ao diret처rio de trabalho por챕m n찾o os exclua, semelhante a como o comando 'cp -R' atualizaria o conte첬do no diret처rio de destino. Este 챕 o modo predefinido em <<def_checkout,checkout>> ao fazer averigua챌찾o dos arquivos vindo do <<def_index,챠ndice>> ou <<def_tree-ish,tree-ish>>. Por outro lado, o modo sem sobreposi챌찾o tamb챕m exclui os arquivos monitorados que n찾o est찾o presentes na fonte, semelhante ao comando 'rsync --delete'."
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr "[[def_pack]]pack (pacote)"
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr "Um conjunto de objetos que foram compactados em um arquivo (para economizar espa챌o ou transmiti-los com efici챗ncia)."
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr "[[def_pack_index]]pack index (챠ndice do pacote)"
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr "A lista de identificadores e das outras informa챌천es dos objetos em um <<def_pack,pacote>>, para ajudar no acesso eficiente ao conte첬do de um pacote."
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr "[[def_pathspec]]pathspec (a especifica챌찾o do caminho)"
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr "O padr찾o utilizado para limitar os caminhos nos comandos do Git."
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr "Os pathspecs s찾o utilizados na linha de comando, os comando \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\" e muitos outros para limitar o escopo das opera챌천es para algum subconjunto da 찼rvore ou da 찼rvore de trabalho. Consulte a documenta챌찾o de cada comando para saber se os caminhos s찾o relativos ao diret처rio atual ou ao n챠vel mais alto. A sintaxe do pathspec 챕 a seguinte:"
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr "qualquer caminho corresponde a si pr처prio"
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr "o pathspec at챕 a 첬ltima barra representa um prefixo do diret처rio. O escopo deste pathspec 챕 limitado a esta sub찼rvore."
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr "o restante do pathspec 챕 um padr찾o para o restante do nome do caminho. Os caminhos relativos ao prefixo do diret처rio ser찾o comparados com este padr찾o usando fnmatch(3); '*' e '?' em particular _podem_ ser comparados com os separadores dos diret처rios."
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr "Como por exemplo, 'Documenta챌찾o/*.jpg' ir찼 coincidir com todos os arquivos .jpg na sub찼rvore 'Documenta챌찾o', incluindo 'Documenta챌찾o/cap챠tulo_1/figura_1.jpg'."
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr "Um pathspec que come챌a com dois pontos `:` tem um significado especial. Na forma abreviada, os dois pontos iniciais `:` s찾o seguidos por zero ou mais letras da \"assinatura m찼gica\" (que opcionalmente s찾o terminadas por outros dois pontos `:`), o restante 챕 o padr찾o que ser찼 comparado ao caminho. A \"assinatura m찼gica\" consiste em s챠mbolos ASCII que n찾o s찾o caracteres alfanum챕ricos, 'glob', 'regex' nem caracteres especiais. Os dois pontos opcionais que encerram a \"assinatura m찼gica\" podem ser omitidos caso o padr찾o comece com um caractere que n찾o perten챌a ao conjunto dos s챠mbolos da \"assinatura m찼gica\" e n찾o seja dois pontos."
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr "Na forma longa, os dois pontos iniciais `:` s찾o seguidos por um par챗ntese aberto `(`, uma lista separada por v챠rgula de zeros ou mais \"palavras m찼gicas\" e par챗nteses pr처ximos `)`, o restante 챕 o padr찾o para coincidir contra o caminho."
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr "Um pathspec com apenas dois pontos significa \"n찾o h찼 um pathspec\". Este formul찼rio n찾o deve ser combinado com um outro pathspec."
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr "top"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr "A palavra m찼gica `top` (assinatura m찼gica: `/`) faz o padr찾o da raiz da 찼rvore de trabalho coincidir mesmo quando voc챗 est찼 executando o comando de dentro de um subdiret처rio."
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr "literal"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr "Curingas no padr찾o como `*` ou `?` s찾o tratados como caracteres literais."
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr "icase"
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr "Coincid챗ncia indiferente a letras mai첬sculas ou min첬sculas."
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr "glob"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr "O Git trata o padr찾o como um \"shell glob\" adequado para o consumo do `fnmatch(3)` com a sinaliza챌찾o `FNM_PATHNAME`: curingas no padr찾o n찾o corresponder찾o com o `pathname`. Por exemplo, \"Documentation/{asterisk}.html\" coincide com \"Documentation/git.html\", mas n찾o com \"Documentation/ppc/ppc.html\" ou \"tools/perf/Documentation/perf.html\"."
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr "Dois asteriscos consecutivos (\"`**`\") nos padr천es coincidentes ao `pathname` completo podem ter um significado especial:"
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr "Um \"`**`\" inicial seguido de uma barra significa que houve coincid챗ncia em todos os diret처rios. Por exemplo, \"`**foo`\" 챕 coincidente ao arquivo ou diret처rio \"`foo`\" em qualquer lugar, o mesmo que o padr찾o \"`foo`\". \"`**/foo/bar`\" 챕 coincidente ao arquivo ou diret처rio \"`bar`\" em qualquer lugar que esteja diretamente sob o diret처rio \"`foo`\"."
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr "Um \"`/**`\" 횪 direita corresponde a tudo que estiver dentro. Por exemplo, \"`abc/**`\" coincide todos os arquivos dentro do diret처rio \"abc\", relativos 횪 localiza챌찾o do arquivo `.gitignore`, com uma profundidade infinita."
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr "Uma barra seguida por dois asteriscos consecutivos e uma barra coincide com zero ou mais diret처rios. Por exemplo, \"`a/**/b`\" coincide com \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" e assim por diante."
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr "Os outros asteriscos consecutivos s찾o considerados inv찼lidos."
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr "A magica \"glob\" 챕 incompat챠vel com a m찼gica literal."
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr "attr"
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr "Ap처s o `attr:`, vem um espa챌o separado da lista do \"attribute requirements\" (requisitos dos atributos), todos os quais devem ser atendidos para que o caminho seja considerado uma correspond챗ncia; isso 챕 um acr챕scimo 횪 coincid챗ncia usual dos padr천es do `pathspec`. Consulte linkgit:gitattributes[5]."
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr "Cada um dos requisitos de atributo para o caminho assume uma destas formas:"
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr "\"`ATTR`\" requer que o atributo `ATTR` seja definido."
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr "\"`ATTR`\" requer que o atributo `ATTR` n찾o seja definido."
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr "\"`ATTR=VALUE`\" requer que o atributo `ATTR` seja definido como a string `VALUE`."
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr "\"`!ATTR`\"requer que o atributo` ATTR` n찾o seja especificado."
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr "Observe que durante a coincid챗ncia com um objeto da 찼rvore, os atributos ainda ser찾o obtidos da mesma e n찾o do objeto da 찼rvore especificado."
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr "exclude (exclu챠)"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr "Depois que um caminho coincida com qualquer `pathspec` que n찾o foi exclu챠do ele ser찼 executado em todos os `pathspecs` que foram exclu챠dos (assinatura m찼gica: `!` or its synonym `^`). Caso coincida, o caminho 챕 ignorado. Quando n찾o h찼 um `pathspec` n찾o exclu챠do a exclus찾o 챕 aplicada ao conjunto de resultados como se fosse invocada sem nenhum `pathspec`."
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr "[[def_parent]]parent (pai, origem, matriz)"
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr "Um <<def_commit_object,objeto commit>> cont챕m uma lista (possivelmente vazia) dos predecessores l처gicos na linha de desenvolvimento, ou seja, as suas origens."
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr "[[def_pickaxe]]pickaxe"
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr "O termo <<def_pickaxe,pickaxe>> refere-se a uma op챌찾o para as rotinas `diffcore` que ajudam a selecionar as altera챌천es que adicionam ou excluem uma determinada string. Com a op챌찾o `--pickaxe-all`, ela pode ser utilizada para visualizar completamente o <<def_changeset,changeset>> que introduziu ou removeu, digamos, uma determinada linha de texto. Consulte linkgit:git-diff[1]."
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr "[[def_plumbing]]plumbing (encanamento)"
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr "Um nome bonito para <<def_core_git,n첬cleo do Git>>."
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr "[[def_porcelain]]porcelain (porcelana)"
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr "Nome bonito para programas e conjunto de programas, dependendo do <<def_core_git,n첬cleo do Git>>, apresentando um acesso de alto n챠vel ao n첬cleo do Git principal. As porcelanas exp천em mais uma interface <<def_SCM,SCM>> do que o <<def_plumbing,plumbing>>."
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr "[[def_per_worktree_ref]]per-worktree ref (refer챗ncia por 찼rvore de trabalho)"
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr "As refs que s찾o por-<<def_work_tree,worktree>> em vez de global. Atualmente isto 챕 apresentado apenas como <<def_HEAD,HEAD>> e qualquer outra `refs` que inicie com `refs/bisect/`, mas podem posteriormente, incluir outras `refs` incomuns."
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr "[[def_pseudoref]]pseudoref (pseudo refer챗ncia)"
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr "`Pseudorefs` s찾o uma classe de arquivos em `$GIT_DIR` que se comporta como `refs` para fins de an찼lise de revis찾o, no entanto, s찾o tratados especialmente pelo git. Os `pseudorefs` t챗m nomes com mai첬sculas e sempre come챌am com uma linha que consiste em <<def_SHA1,SHA-1>>, seguido por um espa챌o. Portanto, `HEAD` n찾o 챕 um `pseudoref` pois 횪s vezes 챕 um `ref` simb처lico. Opcionalmente eles podem conter alguns dados adicionais. S찾o exemplos `MERGE_HEAD` e `CHERRY_PICK_HEAD`. Ao contr찼rio do <<def_per_worktree_ref,per-worktree refs>>, estes arquivos n찾o podem ser `refs` simb처licos e nunca possuem um `reflogs`. Eles tamb챕m n찾o podem ser atualizados atrav챕s do mecanismo `ref` normal de atualiza챌찾o. Em vez disso, eles s찾o atualizados gravando diretamente nos arquivos. No entanto, eles podem ser lidos como se fossem `refs`, portanto, `git rev-parse MERGE_HEAD` funcionar찼."
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr "[[def_pull]]pull (captura, puxar, atrair, apertar)"
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr "Captura um <<def_branch,ramo>> significa <<def_fetch,fetch (obter)>> e <<def_merge,merge (mesclar)>>. Consulte tamb챕m linkgit:git-pull[1]."
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr "[[def_push]]push (impulsionar, impulso, empurrar, apertar, pressionar, for챌ar, investida)"
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr "Fazer um impulsionamento ao <<def_branch,ramo>> significa pegar a <<def_head_ref,ref do cabe챌alho>> do ramo de um <<def_repository,reposit처rio>> remoto, descobrir se 챕 um ancestral da ref (refer챗ncia) do cabe챌alho local e nesse caso, colocar todos os objetos que s찾o <<def_reachable,acess챠veis>> com base na ref do cabe챌alho local e que est찾o faltando a partir do reposit처rio remoto, para o <<def_object_database,banco de dados do objeto>> que atualiza a ref do cabe챌alho remoto. Caso o <<def_head,cabe챌alho>> n찾o seja um ancestral do cabe챌alho local, o impulsionamento (push) vai falhar."
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr "[[def_reachable]]reachable (acess챠vel ou alcan챌찼vel)"
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr "Todos os ancestrais de um determinado <<def_commit,commit>> s찾o considerados \"reachable\" (ou acess챠veis) a partir deste commit. De um modo mais geral, um <<def_object,objeto>> 챕 acess챠vel a partir do outro se pudermos alcan챌찼-lo atrav챕s de um <<def_chain,chain>> seguido de <<def_tag,tags>> para o que quer que eles marque com uma tag, <<def_commit_object,commits>> para as suas origens ou 찼rvores, e as <<def_tree_object,찼rvores>> para as 찼rvores ou as <<def_blob_object,bolhas>> que os cont챕m."
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr "[[def_rebase]]rebase (reconstru챌찾o da funda챌찾o ou reconstru챌찾o)"
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr "Para reaplicar uma s챕rie de altera챌천es de uma <<def_branch,ramo>> para uma base diferente e redefinir o <<def_head,head>> dessa ramifica챌찾o para o resultado."
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr "[[def_ref]]ref (refer챗ncia)"
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr "Um nome que comece com `refs/` (por exemplo, `refs/heads/master`) que aponte para um <<def_object_name,object name>> ou outro ref (o 첬ltimo 챕 chamado de <<def_symref,ref simb처lica>>). Por conveni챗ncia, uma `ref` as vezes pode ser abreviado quando utilizado como um argumento em um comando Git; Para mais detalhes consulte linkgit:gitrevisions[7]. As `refs` s찾o armazenadas no <<def_repository,reposit처rio>>."
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr "O espa챌o de nomes da ref 챕 hier찼rquico. Sub-hierarquias diferentes s찾o utilizadas para diferentes prop처sitos (por exemplo, a hierarquia `refs/heads/` 챕 utilizada para representar as ramifica챌천es locais)."
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr "Existem algumas refer챗ncias especiais que n찾o come챌am com `refs/`. O exemplo mais not찼vel 챕 `HEAD`."
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr "[[def_reflog]]reflog"
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr "Um `reflog` exibe o \"hist처rico\" local de uma `ref`. Em outras palavras, ele pode informar qual foi a 3짧 첬ltima revis찾o _neste_ reposit처rio e qual era a sua condi챌찾o atual, ontem 횪s 21:14. Para mais detalhes consulte o comando linkgit:git-reflog[1]."
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr "[[def_refspec]]refspec"
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr "Um `refspec` 챕 utilizado por <<def_fetch,fetch>> e <<def_push,push>> para descrever o mapeamento entre <<def_ref,ref>> remoto e o `ref` local."
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr "[[def_remote]]remote repository (reposit처rio remoto)"
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr "Um <<def_repository,reposit처rio>> que 챕 utilizado para rastrear os mesmo projeto por챕m reside em um outro lugar. Para se comunicar com ramos remotos, consulte <<def_fetch,fetch>> ou <<def_push,push>>."
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr "[[def_remote_tracking_branch]]remote-tracking branch (monitorando os ramos remotamente)"
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr "Um <<def_ref,ref>> que 챕 utilizado para rastrear as modifica챌천es de outro <<def_repository,reposit처rio>>. Normalmente se parece com 'refs/remotes/foo/bar' (indicando que rastreia um ramo com nome 'bar' e um remoto chamado 'foo'), coincide o lado direito do `fetch` configurado <<def_refspec,refspec>>. Um ramo monitorado remotamente n찾o deve conter altera챌천es diretas, t찾o pouco, ter commits locais."
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr "[[def_repository]]repository (reposit처rio)"
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr "Uma cole챌찾o de <<def_ref,refs>> junto com um <<def_object_database,banco de dados do objeto>> contendo todos os objetos que s찾o <<def_reachable,acess챠vel>> vindas das `refs`, possivelmente acompanhados por metadados de um ou mais <<def_porcelain,porcelanas>>. Um reposit처rio pode compartilhar um banco de dados de objetos com outros reposit처rios atrav챕s de <<def_alternate_object_database,mecanismo alternativo>>."
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr "[[def_resolve]]resolve"
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr "A a챌찾o de corrigir manualmente o que uma falha autom찼tica <<def_merge,mesclagem>> deixou para tr찼s."
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr "[[def_revision]]revision (revis찾o)"
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr "Um sin척nimo de <<def_commit,commit>> (o substantivo)."
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr "[[def_rewind]]rewind (rebobinar, retroceder)"
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr "Para jogar fora parte do desenvolvimento, ou seja, atribuir <<def_head,head>> a um <<def_revision,revis찾o>> anterior."
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr "[[def_SCM]]SCM"
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr "Gerenciamento do c처digo fonte (ferramenta)."
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr "[[def_SHA1]]SHA-1"
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr "\"Secure Hash Algorithm 1\"; uma fun챌찾o hash de criptogr찼fica. No contexto do Git utilizado como sin척nimo de <<def_object_name,object name>>."
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr "[[def_shallow_clone]]shallow clone (clonagem superficial)"
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr "Em geral um sin척nimo para <<def_shallow_repository,shallow repository>> por챕m a frase a torna mais explicita criada ao executar o comando `git clone --depth=...`."
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr "[[def_shallow_repository]]shallow repository (reposit처rio raso)"
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr "Um <<def_repository,reposit처rio>> reposit처rio raso possui um hist처rico incompleto da quais <<def_commit,commits>> possui <<def_parent,parents>> dos quais cauterizam (em outras palavras, o Git 챕 informado para fingir que estes commits n찾o possuam origens, ainda que esteja cadastrados no <<def_commit_object,objeto commit>>). Algumas vezes 챕 첬til quando voc챗 est찼 interessado apenas no hist처rico recente de um projeto, ainda que o hist처rico real registrado no \"upstream\" seja muito maior. Um reposit처rio raso 챕 criado, ao usar a op챌찾o `--depth` para linkgit:git-clone[1] e o seu hist처rico pode ser aprofundado posteriormente com linkgit:git-fetch[1]."
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr "[[def_stash]]stash entry (lan챌amento para a armazenagem)"
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr "Um <<def_object,objeto>> 챕 utilizado para armazenar temporariamente o conte첬do de um diret처rio de trabalho <<def_dirty,sujo>> e o seu 챠ndice para utiliza챌찾o futura."
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr "[[def_submodule]]submodule (subm처dulo)"
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr "Um <<def_repository,reposit처rio>> ret챕m o hist처rico de um projeto separado dentro de um outro reposit처rio (o 첬ltimo na qual 챕 chamado de <<def_superproject, superproject>>)."
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr "[[def_superproject]]superproject (superprojeto)"
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr "Um <<def_repository,reposit처rio>> se refere a reposit처rios de outros projetos em suas pr처prias 찼rvores de trabalho como <<def_submodule,subm처dulo>>. O superprojeto conhece os nomes dos (mas n찾o mant챕m c처pias de nenhum deles) commits dos objetos que contenham os subm처dulos."
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr "[[def_symref]]symref (refer챗ncia simb처lica)"
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr "Uma refer챗ncia simb처lica: em vez de conter o pr처prio id <<def_SHA1,SHA-1>>, ele tem o formato 'ref: refs/some/thing' e quando 챕 referenciado faz uma refer챗ncia recursiva a essa refer챗ncia. '<<def_HEAD,HEAD>>' 챕 o exemplo prim찼rio de um `symref`. As refer챗ncias simb처licas s찾o manipuladas com o comando linkgit:git-symbolic-ref[1]."
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr "[[def_tag]]tag (etiqueta)"
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr "Um <<def_ref,ref>> sob `refs/tags/` no espa챌o de nomes que aponte para um objeto arbitr찼rio (em geral uma tag que aponta seja para <<def_tag_object,tag>> ou um <<def_commit_object,objeto commit>>). Em contraste de um <<def_head,head>>, a tag n찾o 챕 atualizada pelo comando `commit`. Uma tag Git n찾o tem nada a ver com uma tag `Lisp` (que seria chamada de <<def_object_type,object type>> dentro do contexto do Git). Uma tag 챕 normalmente utilizada para marcar um ponto espec챠fico na ancestralidade de um commit <<def_chain,chain>>."
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr "[[def_tag_object]]objeto tag (objeto etiqueta, objeto da etiqueta)"
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr "Um <<def_object,objeto>> contendo um <<def_ref,ref>> apontando para outro objeto que pode conter uma mensagem como um <<def_commit_object,objeto commit>>. Tamb챕m pode conter uma assinatura (PGP); nesse caso, 챕 chamado de \"signed tag object\"."
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr "[[def_topic_branch]]topic branch (t처pico do ramo)"
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr "Um Git comum <<def_branch,ramo>> que 챕 utilizado por um desenvolvedor para identificar uma linha conceitual de desenvolvimento. Como as ramifica챌천es s찾o muito f찼ceis e baratas, muitas vezes 챕 desej찼vel ter v찼rias ramifica챌천es pequenas, cada uma contendo conceitos muito bem definidos ou pequenas altera챌천es incrementais, por챕m relacionadas."
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr "[[def_tree]]tree (찼rvore)"
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr "Entre um <<def_working_tree,찼rvore de trabalho>> ou um <<def_tree_object,objeto 찼rvore>> junto com os objetos dependentes <<def_blob_object,blob>> e os objetos das 찼rvores (uma representa챌찾o de uma 찼rvore de trabalho)."
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr "[[def_tree_object]]tree object (objeto 찼rvore)"
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr "Um <<def_object,objeto>> contendo uma lista de nomes e modos em conjunto com `refs` associados as sua bolhas e ou objetos da 찼rvore. Um <<def_tree,tree>> 챕 equivalente a um <<def_directory,diret처rio>>."
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr "[[def_tree-ish]]tree-ish (tamb챕m treeish)"
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr "Um <<def_tree_object,objeto 찼rvore>> ou um <<def_object,objeto>> que pode perder uma refer챗ncia recursivamente em um objeto da 찼rvore. Perder um <<def_commit_object,objeto commit>> retorna o objeto da 찼rvore <<def_revision,revis찾o>> correspondente ao topo <<def_directory,diret처rio>>. S찾o todos os tree-ishes: um <<def_commit-ish,commit-ish>>, um objeto da 찼rvore, um <<def_tag_object,objeto tag>> que aponta para o objeto da 찼rvore, um objeto tag que aponta para o objeto tag que aponta para o objeto 찼rvore, etc."
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr "[[def_unmerged_index]]unmerged index (챠ndices n찾o mesclados)"
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr "Um <<def_index,챠ndice>> que contenha 챠ndices n찾o mesclados <<def_index_entry,entradas do 챠ndice>>."
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr "[[def_unreachable_object]]unreachable object (objetos inacess챠veis)"
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr "Um <<def_object,objeto>> que n찾o 챕 <<def_reachable,acess챠vel>> de um <<def_branch,ramo>>, <<def_tag,tag>>, ou de qualquer outra refer챗ncia."
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr "[[def_upstream_branch]]upstream branch (ramo upstream)"
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr "횋 predefinido que o <<def_branch,ramo>> que seja mesclado na 찼rvore em quest찾o (ou no ramo onde uma reconstru챌찾o (rebase) seja feita). 횋 configurado atrav챕s do `branch.<nome>.remote` e `branch.<nome>.merge`. Caso o ramo \"upstream\" de 'A' seja 'origin/B' algumas vezes n처s dizemos que \"'A' est찼 monitorando 'origin/B'\"."
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr "[[def_working_tree]]working tree (찼rvore de trabalho)"
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr "A 찼rvore dos arquivos atualmente averiguados. A 찼rvore de trabalho normalmente cont챕m o conte첬do <<def_HEAD,HEAD>> do commit da 찼rvore, al챕m de quaisquer altera챌천es locais que voc챗 fizer, mas ainda o commit n찾o foi feito."
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr "[[def_worktree]]worktree"
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 1b8c240..aa290e8 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6394,7 +6394,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr ""
@@ -6406,7 +6406,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr ""
@@ -6423,7 +6423,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr ""
@@ -7113,7 +7113,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7125,13 +7125,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18623,7 +18623,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20648,19 +20648,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20669,25 +20669,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20699,109 +20699,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21158,283 +21158,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21443,55 +21443,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21501,31 +21501,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21535,259 +21535,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21799,19 +21799,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21823,433 +21823,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22266,241 +22266,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22508,259 +22508,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22768,73 +22768,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22846,55 +22846,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22903,25 +22903,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22929,19 +22929,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22951,43 +22951,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -22995,31 +22995,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23029,25 +23029,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23057,19 +23057,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23077,31 +23077,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23109,67 +23109,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23177,283 +23177,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23462,49 +23462,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23524,7 +23524,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23533,7 +23533,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23544,13 +23544,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23565,13 +23565,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23580,19 +23580,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23607,307 +23607,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59449,1266 +59449,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.ro.po b/po/documentation.ro.po
index 589d2b6..c41ec5a 100644
--- a/po/documentation.ro.po
+++ b/po/documentation.ro.po
@@ -6461,7 +6461,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "NUME"
@@ -6473,7 +6473,7 @@ msgstr "git-add - Adaug훱 con�inutul fi�ierului la index"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "REZUMAT"
@@ -6501,7 +6501,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "DESCRIERE"
@@ -7217,7 +7217,7 @@ msgstr "modificarea con�inutului liniilor de context sau de eliminare"
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "VEZI �I"
@@ -7229,13 +7229,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "Parte a suitei linkgit:git[1]"
@@ -18768,7 +18768,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20793,19 +20793,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20814,25 +20814,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20844,109 +20844,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21302,283 +21302,283 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21587,55 +21587,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21645,31 +21645,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21679,259 +21679,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21943,19 +21943,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21967,433 +21967,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22410,241 +22410,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22652,259 +22652,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22912,73 +22912,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22990,55 +22990,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -23047,25 +23047,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -23073,19 +23073,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23095,43 +23095,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23139,31 +23139,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23173,25 +23173,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23201,19 +23201,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23221,31 +23221,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23253,67 +23253,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23321,283 +23321,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23606,49 +23606,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23668,7 +23668,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23677,7 +23677,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23688,13 +23688,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23709,13 +23709,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23724,19 +23724,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23751,307 +23751,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59604,1261 +59604,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 8e89668..2ca050a 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -6401,7 +6401,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "��������"
@@ -6413,7 +6413,7 @@ msgstr "git-add - �棘閨逵勻龜�� �棘畇筠�菌龜劇棘筠 �逵橘剋逵 勻 龜戟畇筠克
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "�����"
@@ -6441,7 +6441,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "���鬼����"
@@ -7155,7 +7155,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "鬼��龜�� 龜����"
@@ -7167,13 +7167,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "赳勻剋�筠��� �逵���� 極逵克筠�逵 linkgit:git[1]"
@@ -18711,7 +18711,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20746,19 +20746,19 @@ msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr "鬼�逵勻戟筠戟龜筠 �棘畇筠�菌龜劇棘均棘 龜 �筠菌龜劇逵 畇勻棘龜�戟�� 棘閨�筠克�棘勻, 戟逵橘畇筠戟戟�� 極棘 畇勻�劇 棘閨�筠克�逵劇 畇筠�筠勻逵"
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20767,25 +20767,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr "鬼�逵勻戟筠戟龜筠 �棘畇筠�菌龜劇棘均棘 龜 �筠菌龜劇逵 畇勻棘龜�戟�� 棘閨�筠克�棘勻, 戟逵橘畇筠戟戟�� 極棘 畇勻�劇 棘閨�筠克�逵劇 畇筠�筠勻逵"
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20797,109 +20797,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, fuzzy, priority:100
+#, fuzzy, priority:80
msgid "recurse into sub-trees"
msgstr "極�棘�棘畇龜�� �筠克���龜勻戟棘 勻 極棘畇畇筠�筠勻��"
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21260,283 +21260,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21545,55 +21545,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21603,31 +21603,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21637,259 +21637,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21901,19 +21901,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21925,433 +21925,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "Commands"
msgstr "克棘劇逵戟畇逵"
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22368,241 +22368,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22610,259 +22610,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22870,73 +22870,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22948,55 +22948,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -23005,25 +23005,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -23031,19 +23031,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23053,43 +23053,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23097,31 +23097,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23131,25 +23131,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23159,19 +23159,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23179,31 +23179,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23211,67 +23211,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23279,283 +23279,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr "極�龜戟�畇龜�筠剋�戟棘"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "get-mark"
msgstr "`get-mark`"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "cat-blob"
msgstr "`cat-blob`"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr "均棘�棘勻棘"
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23564,49 +23564,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23626,7 +23626,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23635,7 +23635,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23646,13 +23646,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23667,13 +23667,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23682,19 +23682,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23709,307 +23709,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59614,1265 +59614,1265 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr "gitglossary - �剋棘��逵�龜橘 Git"
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr "*\n"
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[�棘剋�鈞棘勻逵�筠剋��克棘筠 ��克棘勻棘畇��勻棘 Git]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr "��勻棘畇 �極龜�克逵 ���剋棘克 勻棘 勻戟筠�戟筠劇 �筠極棘鈞龜�棘�龜龜"
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr "勻�極棘剋戟龜�� 畇筠橘��勻龜� 戟逵 棘��剋筠菌龜勻逵筠劇�� 勻戟筠�戟龜� 勻筠�克逵�"
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.sk.po b/po/documentation.sk.po
index 0fa7a70..76eef35 100644
--- a/po/documentation.sk.po
+++ b/po/documentation.sk.po
@@ -6392,7 +6392,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr ""
@@ -6404,7 +6404,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr ""
@@ -6421,7 +6421,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr ""
@@ -7111,7 +7111,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7123,13 +7123,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18614,7 +18614,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20639,19 +20639,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20660,25 +20660,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20690,109 +20690,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21148,283 +21148,283 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21433,55 +21433,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21491,31 +21491,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21525,259 +21525,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21789,19 +21789,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21813,433 +21813,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22256,241 +22256,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22498,259 +22498,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22758,73 +22758,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22836,55 +22836,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22893,25 +22893,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22919,19 +22919,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22941,43 +22941,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -22985,31 +22985,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23019,25 +23019,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23047,19 +23047,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23067,31 +23067,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23099,67 +23099,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23167,283 +23167,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23452,49 +23452,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23514,7 +23514,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23523,7 +23523,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23534,13 +23534,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23555,13 +23555,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23570,19 +23570,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23597,307 +23597,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59423,1261 +59423,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 61e0e6d..e264e6c 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -6384,7 +6384,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "캅S캅M"
@@ -6396,7 +6396,7 @@ msgstr "git-add - Dosya i챌eriklerini indekse ekle"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "횜ZET"
@@ -6424,7 +6424,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "A횉IKLAMA"
@@ -7114,7 +7114,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7126,13 +7126,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18618,7 +18618,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20643,19 +20643,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20664,25 +20664,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20694,109 +20694,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21152,283 +21152,283 @@ msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcor
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21437,55 +21437,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21495,31 +21495,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21529,259 +21529,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<ad>:<dosya>"
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21793,19 +21793,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21817,433 +21817,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22260,241 +22260,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22502,259 +22502,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22762,73 +22762,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22840,55 +22840,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22897,25 +22897,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22923,19 +22923,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22945,43 +22945,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -22989,31 +22989,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23023,25 +23023,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23051,19 +23051,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23071,31 +23071,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23103,67 +23103,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23171,283 +23171,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23456,49 +23456,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23518,7 +23518,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23527,7 +23527,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23538,13 +23538,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23559,13 +23559,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23574,19 +23574,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23601,307 +23601,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59434,1261 +59434,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[Git Kullan캇m K캇lavuzu]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr "top"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr "literal"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr "glob"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr "exclude"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.uk.po b/po/documentation.uk.po
index 2ab4330..080648e 100644
--- a/po/documentation.uk.po
+++ b/po/documentation.uk.po
@@ -6385,7 +6385,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "�����"
@@ -6397,7 +6397,7 @@ msgstr "git-add - �棘畇逵� 勻劇��� �逵橘剋� 畇棘 �戟畇筠克��勻逵戟戟�
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "鬼����鬼�鬼"
@@ -6425,7 +6425,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "���鬼"
@@ -7115,7 +7115,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7127,13 +7127,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr ""
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18637,7 +18637,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20662,19 +20662,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20683,25 +20683,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20713,109 +20713,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21171,283 +21171,283 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21456,55 +21456,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21514,31 +21514,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21548,259 +21548,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21812,19 +21812,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21836,433 +21836,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22279,241 +22279,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22521,259 +22521,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22781,73 +22781,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22859,55 +22859,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22916,25 +22916,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22942,19 +22942,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22964,43 +22964,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23008,31 +23008,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23042,25 +23042,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23070,19 +23070,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23090,31 +23090,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23122,67 +23122,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23190,283 +23190,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23475,49 +23475,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23537,7 +23537,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23546,7 +23546,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23557,13 +23557,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23578,13 +23578,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23593,19 +23593,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23620,307 +23620,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59446,1261 +59446,1261 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, priority:100
+#, priority:310
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "top"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "literal"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "glob"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "exclude"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index d928069..14c8200 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -6500,7 +6500,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "�띸㎞"
@@ -6512,7 +6512,7 @@ msgstr "git-add - 曆삣뒥�뉏뻑�끻��곁뇨凉�"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "礖귟염"
@@ -6540,7 +6540,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "�뤺염"
@@ -7255,7 +7255,7 @@ msgstr "岳�뵻訝듾툔�뉑닑�좈솮烏뚨쉪�끻�"
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:310
msgid "SEE ALSO"
msgstr "�귟쭅"
@@ -7267,13 +7267,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, fuzzy, priority:300
+#, fuzzy, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr "linkgit:git[1] 瀯꾡뻑�꾡��ⓨ늽"
@@ -19023,7 +19023,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -21078,19 +21078,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -21099,25 +21099,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -21129,109 +21129,109 @@ msgstr "<瓮�푶>..."
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21609,283 +21609,283 @@ msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcor
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr "--tag-of-filtered-object=(abort|drop|rewrite)"
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr "--export-marks=<file>"
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr "--import-marks=<file>"
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr "--anonymize-map=<from>[:<to>]"
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr "--reencode=(yes|no|abort)"
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr "[<git-rev-list-args>...]"
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21897,55 +21897,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21959,31 +21959,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21997,260 +21997,260 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr "--cat-blob-fd=<fd>"
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr "--date-format=<fmt>"
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr "--import-marks-if-exists=<file>"
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr "--rewrite-submodules-from=<name>:<file>"
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
#| msgid "--recurse-submodules[=<pathspec]"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<name>:<file>"
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr "--active-branches=<n>"
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr "--big-file-threshold=<n>"
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -22262,19 +22262,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr "--export-pack-edges=<file>"
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -22286,433 +22286,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "See linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr "烏①렟"
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "Date Formats"
msgstr "�ζ쐿�쇔폀"
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "`rfc2822`"
msgstr "`rfc2822`"
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "Commands"
msgstr "�썰빱"
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22729,241 +22729,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22971,259 +22971,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr "\t'C' SP <path> SP <path> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr "\t'R' SP <path> SP <path> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr "\t'N' SP <dataref> SP <commit-ish> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -23231,73 +23231,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr "\t'mark' SP ':' <idnum> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -23309,55 +23309,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -23366,25 +23366,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -23392,19 +23392,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -23414,43 +23414,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23458,31 +23458,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23492,25 +23492,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23520,19 +23520,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23540,31 +23540,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23572,67 +23572,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr "\t'cat-blob' SP <dataref> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23640,283 +23640,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr "\t'ls' SP <path> LF\n"
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr "\t'ls' SP <dataref> SP <path> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "relative-marks"
msgstr "relative-marks"
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "no-relative-marks"
msgstr "no-relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "force"
msgstr "��"
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "get-mark"
msgstr "get-mark"
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "cat-blob"
msgstr "cat-blob"
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "ls"
msgstr "ls"
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "notes"
msgstr "鸚뉑낏"
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "done"
msgstr "若뚧닇"
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr "`<option>` �썰빱�꾡��ⓨ늽��꺗�끻맜�됮」�ⓨ늽訝�닓�븀쉪訝띷쎍�밧��θ�阿됬쉪餓삡퐬�됮」竊뚩�뚥툖�닸뵻�띶� '--'竊뚦뭉訝붷쨪�녷뼶凉뤹쎑�뚣��"
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23925,49 +23925,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -24001,7 +24001,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -24013,7 +24013,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -24029,13 +24029,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -24050,13 +24050,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr "M 777 inline bob\n"
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -24065,19 +24065,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "0 refs/heads/master"
msgstr "0 refs/heads/master"
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -24092,307 +24092,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, fuzzy, priority:100
+#, fuzzy, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr "------------------- END OF CRASH REPORT"
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -60728,1266 +60728,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:310
msgid "gitglossary - A Git Glossary"
msgstr "gitglossary - A Git Glossary"
#. type: Plain text
#: en/gitglossary.txt:11
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "*\n"
msgstr "*\n"
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr "[[def_alternate_object_database]]alternate object database"
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr "[[def_bare_repository]]bare repository"
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr "[[def_blob_object]]blob object"
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr "[[def_branch]]branch"
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr "[[def_cache]]cache"
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr "[[def_chain]]chain"
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr "[[def_checkout]]checkout"
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr "[[def_clean]]clean"
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr "[[def_commit]]commit"
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr "[[def_commit_object]]commit object"
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr "[[def_commit-ish]]commit-ish (also committish)"
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr "[[def_core_git]]core Git"
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr "[[def_DAG]]DAG"
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr "[[def_dangling_object]]dangling object"
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr "[[def_detached_HEAD]]detached HEAD"
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr "[[def_directory]]directory"
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr "[[def_dirty]]dirty"
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr "[[def_evil_merge]]evil merge"
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr "[[def_fast_forward]]fast-forward"
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr "[[def_fetch]]fetch"
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr "[[def_file_system]]file system"
#. type: Plain text
#: en/glossary-content.txt:165
-#, fuzzy, priority:100
+#, fuzzy, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr "Linus Torvalds ���앭컛 Git 溫얕�訝븀뵪�루㈉�닸뻼餓띄내瀯잞펽�녕뵪雅롣퓷耶섉뻼餓뜹뭽��퐬�꾢읃簾�瀯볠엫�귟퓳簾�퓷雅� Git �꾣븞�뉐뭽�잌벧��"
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, fuzzy, priority:100
+#, fuzzy, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr "Synonym for <<def_repository,repository>> (for arch people)."
#. type: Labeled list
#: en/glossary-content.txt:169
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr "[[def_gitfile]]gitfile"
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr "[[def_grafts]]grafts"
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr "[[def_hash]]hash"
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr "[[def_head]]head"
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr "[[def_HEAD]]HEAD"
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr "[[def_head_ref]]head ref"
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr "[[def_hook]]hook"
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr "[[def_index]]index"
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr "[[def_index_entry]]index entry"
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr "[[def_master]]master"
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr "[[def_merge]]merge"
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, fuzzy, priority:100
+#, fuzzy, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
#. type: Labeled list
#: en/glossary-content.txt:260
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr "[[def_object_database]]object database"
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, fuzzy, priority:100
+#, fuzzy, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr "Synonym for <<def_object_name,object name>>."
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr "[[def_octopus]]octopus"
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr "[[def_origin]]origin"
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr "[[def_overlay]]overlay"
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr "[[def_pack]]pack"
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr "[[def_pack_index]]pack index"
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr "[[def_pathspec]]pathspec"
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "窈띌깿"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "訝�, �뉑쑍"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "icase"
msgstr "icase"
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "�ⓨ�"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "attr"
msgstr "掠욄��"
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "�믧솮"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr "[[def_parent]]parent"
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr "[[def_pickaxe]]pickaxe"
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr "[[def_porcelain]]porcelain"
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr "[[def_per_worktree_ref]]per-worktree ref"
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr "[[def_pseudoref]]pseudoref"
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr "[[def_pull]]pull"
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr "[[def_reachable]]reachable"
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr "[[def_rebase]]rebase"
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr "[[def_reflog]]reflog"
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr "[[def_refspec]]refspec"
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr "[[def_repository]]repository"
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr "[[def_resolve]]resolve"
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr "[[def_revision]]revision"
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr "[[def_rewind]]rewind"
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr "[[def_SHA1]]SHA-1"
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr "[[def_shallow_clone]]shallow clone"
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr "[[def_shallow_repository]]shallow repository"
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr "[[def_stash]]stash entry"
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr "[[def_submodule]]submodule"
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr "[[def_symref]]symref"
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr "[[def_tag_object]]tag object"
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr "[[def_topic_branch]]topic branch"
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr "[[def_tree_object]]tree object"
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr "[[def_tree-ish]]tree-ish (also treeish)"
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr "[[def_unmerged_index]]unmerged index"
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr "[[def_upstream_branch]]upstream branch"
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr "[[def_per_worktree_ref]]per-worktree ref"
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index e10cc3f..1df1307 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -6401,7 +6401,7 @@ msgstr "git-add(1)"
#. type: Title -
#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "NAME"
msgstr "�띸㉠"
@@ -6413,7 +6413,7 @@ msgstr "git-add - �①뇨凉뺜릎�졾뀯茹붹죭"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-range-diff.txt:9 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SYNOPSIS"
msgstr "�쇔폀"
@@ -6441,7 +6441,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:17 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:17 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "DESCRIPTION"
msgstr "沃ゆ삇"
@@ -7131,7 +7131,7 @@ msgstr ""
#. type: Title -
#: en/git-add.txt:435 en/git-am.txt:265 en/git-annotate.txt:28 en/git-apply.txt:290 en/git-archive.txt:205 en/git-bisect.txt:504 en/git-blame.txt:246 en/git-branch.txt:404 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:577 en/git-difftool.txt:145 en/git-diff.txt:217 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:131 en/git-fetch.txt:296 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:422 en/git-format-patch.txt:756 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:447 en/git-ls-files.txt:258 en/git-ls-remote.txt:116 en/git-merge.txt:397 en/git-pack-objects.txt:425 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:249 en/git-range-diff.txt:288 en/git-read-tree.txt:428 en/git-receive-pack.txt:256 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:225 en/git-replace.txt:149 en/git-restore.txt:212 en/git-revert.txt:140 en/git-rm.txt:199 en/git-send-email.txt:538 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:387 en/git-status.txt:461 en/git-submodule.txt:455 en/git-svn.txt:1169 en/git-switch.txt:269 en/git-tag.txt:386 en/git.txt:1054 en/git-update-index.txt:599 en/git-upload-pack.txt:60 en/git-var.txt:66 en/gitglossary.txt:18
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "SEE ALSO"
msgstr ""
@@ -7143,13 +7143,13 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title -
#: en/git-add.txt:444 en/git-am.txt:269 en/git-annotate.txt:32 en/git-apply.txt:294 en/git-archimport.txt:112 en/git-archive.txt:209 en/git-bisect.txt:509 en/git-blame.txt:250 en/git-branch.txt:412 en/git-bugreport.txt:53 en/git-bundle.txt:341 en/git-cat-file.txt:361 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:53 en/git-checkout-index.txt:182 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:368 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:585 en/git-config.txt:542 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-credential.txt:164 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:431 en/git-daemon.txt:339 en/git-describe.txt:210 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:156 en/git-diff-tree.txt:130 en/git-diff.txt:227 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:135 en/git-fetch.txt:300 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:81 en/git-for-each-ref.txt:426 en/git-format-patch.txt:760 en/git-fsck-objects.txt:21 en/git-fsck.txt:166 en/git-gc.txt:162 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:211 en/git-http-backend.txt:300 en/git-http-fetch.txt:61 en/git-http-push.txt:95 en/git-imap-send.txt:143 en/git-index-pack.txt:144 en/git-init-db.txt:22 en/git-init.txt:173 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:451 en/git-log.txt:245 en/git-ls-files.txt:262 en/git-ls-remote.txt:120 en/git-ls-tree.txt:164 en/git-mailinfo.txt:119 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:97 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:52 en/git-mergetool.txt:117 en/git-merge-tree.txt:28 en/git-merge.txt:406 en/git-mktag.txt:65 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:114 en/git-notes.txt:404 en/git-p4.txt:767 en/git-pack-objects.txt:431 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:253 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 en/git-read-tree.txt:433 en/git-rebase.txt:1256 en/git-receive-pack.txt:260 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:230 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:504 en/git-restore.txt:217 en/git-revert.txt:144 en/git-rev-list.txt:128 en/git-rev-parse.txt:481 en/git-rm.txt:203 en/git-send-email.txt:542 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:395 en/git-status.txt:465 en/git-stripspace.txt:93 en/git-submodule.txt:459 en/git-svn.txt:1173 en/git-switch.txt:274 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1062 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:605 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:64 en/git-var.txt:72 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:504 en/git-write-tree.txt:41 en/gitglossary.txt:26
-#, no-wrap, priority:300
+#, no-wrap, priority:310
msgid "GIT"
msgstr "GIT"
#. type: Plain text
#: en/git-add.txt:445 en/git-am.txt:270 en/git-annotate.txt:33 en/git-apply.txt:295 en/git-archimport.txt:113 en/git-archive.txt:210 en/git-bisect.txt:510 en/git-blame.txt:251 en/git-branch.txt:413 en/git-bugreport.txt:54 en/git-bundle.txt:342 en/git-cat-file.txt:362 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:54 en/git-checkout-index.txt:183 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:369 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:586 en/git-config.txt:543 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-credential.txt:165 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:432 en/git-daemon.txt:340 en/git-describe.txt:211 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:157 en/git-diff-tree.txt:131 en/git-diff.txt:228 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:136 en/git-fetch.txt:301 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:82 en/git-for-each-ref.txt:427 en/git-format-patch.txt:761 en/git-fsck-objects.txt:22 en/git-fsck.txt:167 en/git-gc.txt:163 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:212 en/git-http-backend.txt:301 en/git-http-fetch.txt:62 en/git-http-push.txt:96 en/git-imap-send.txt:144 en/git-index-pack.txt:145 en/git-init-db.txt:23 en/git-init.txt:174 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:452 en/git-log.txt:246 en/git-ls-files.txt:263 en/git-ls-remote.txt:121 en/git-ls-tree.txt:165 en/git-mailinfo.txt:120 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:98 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:53 en/git-mergetool.txt:118 en/git-merge-tree.txt:29 en/git-merge.txt:407 en/git-mktag.txt:66 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:115 en/git-notes.txt:405 en/git-p4.txt:768 en/git-pack-objects.txt:432 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:254 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 en/git-read-tree.txt:434 en/git-rebase.txt:1257 en/git-receive-pack.txt:261 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:231 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:505 en/git-restore.txt:218 en/git-revert.txt:145 en/git-rev-list.txt:129 en/git-rev-parse.txt:482 en/git-rm.txt:204 en/git-send-email.txt:543 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:396 en/git-status.txt:466 en/git-stripspace.txt:94 en/git-submodule.txt:460 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1063 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:606 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:65 en/git-var.txt:73 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:505 en/git-write-tree.txt:42 en/gitglossary.txt:27
-#, priority:300
+#, priority:310
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -18649,7 +18649,7 @@ msgstr ""
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "LIMITATIONS"
msgstr ""
@@ -20674,19 +20674,19 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-#, priority:100
+#, priority:80
msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:80
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
@@ -20695,25 +20695,25 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:19
-#, priority:100
+#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-#, priority:100
+#, priority:80
msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-#, priority:100
+#, priority:80
msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:31
-#, priority:100
+#, priority:80
msgid "The id of a tree object."
msgstr ""
@@ -20725,109 +20725,109 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:35
-#, priority:100
+#, priority:80
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-#, priority:100
+#, priority:80
msgid "recurse into sub-trees"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:41
-#, priority:100
+#, priority:80
msgid "show tree entry itself as well as subtrees. Implies -r."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:45
-#, priority:100
+#, priority:80
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:50
-#, priority:100
+#, priority:80
msgid "Instead of comparing the <tree-ish>s directly, use the merge base between the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s given and they must both be commits."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:57
-#, priority:100
+#, priority:80
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:62
-#, priority:100
+#, priority:80
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:67
-#, priority:100
+#, priority:80
msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:70
-#, priority:100
+#, priority:80
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:76
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:82
-#, priority:100
+#, priority:80
msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:86
-#, priority:100
+#, priority:80
msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:89
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:80
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:92
-#, priority:100
+#, priority:80
msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:102
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:112
-#, priority:100
+#, priority:80
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:119
-#, priority:100
+#, priority:80
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-#, priority:100
+#, priority:80
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -21184,283 +21184,283 @@ msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-export - Git data exporter"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "'git fast-export [<options>]' | 'git fast-import'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-#, priority:100
+#, priority:90
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:23
-#, priority:100
+#, priority:90
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:26
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--progress=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-#, priority:100
+#, priority:90
msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:30
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--signed-tags=(verbatim|warn|warn-strip|strip|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-#, priority:100
+#, priority:90
msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag. With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:42
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--tag-of-filtered-object=(abort|drop|rewrite)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-#, priority:100
+#, priority:90
msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-#, priority:100
+#, priority:90
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-#, priority:100
+#, priority:90
msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-#, priority:100
+#, priority:90
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored. Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks. The file will not be written if no new object has been marked/exported."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:74 en/git-fast-import.txt:102
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:79
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--mark-tags"
msgstr "--mark-tags"
#. type: Plain text
#: en/git-fast-export.txt:87
-#, priority:100
+#, priority:90
msgid "In addition to labelling blobs and commits with mark ids, also label tags. This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags. It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:92
-#, priority:100
+#, priority:90
msgid "Any commits (or tags) that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:93
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:98
-#, priority:100
+#, priority:90
msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:99
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:102
-#, priority:100
+#, priority:90
msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:103
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:110
-#, priority:100
+#, priority:90
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:82
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:116
-#, priority:100
+#, priority:90
msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:117
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:121
-#, priority:100
+#, priority:90
msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--anonymize-map=<from>[:<to>]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:126
-#, priority:100
+#, priority:90
msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:127
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
#: en/git-fast-export.txt:138
-#, priority:100
+#, priority:90
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:139
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
#: en/git-fast-export.txt:145
-#, priority:100
+#, priority:90
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:152
-#, priority:100
+#, priority:90
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:153
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:156
-#, priority:100
+#, priority:90
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:157
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:165
-#, priority:100
+#, priority:90
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:171
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:176
-#, priority:100
+#, priority:90
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:181
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export master~5..master |\n"
"\tsed \"s|refs/heads/master|refs/heads/other|\" |\n"
@@ -21469,55 +21469,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:185
-#, priority:100
+#, priority:90
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:189
-#, priority:100
+#, priority:90
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
#: en/git-fast-export.txt:192
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:200
-#, priority:100
+#, priority:90
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:212
-#, priority:100
+#, priority:90
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:215
-#, priority:100
+#, priority:90
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:218
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:223
-#, priority:100
+#, priority:90
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:229
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:90
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -21527,31 +21527,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:236
-#, priority:100
+#, priority:90
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:239
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:245
-#, priority:100
+#, priority:90
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:251
-#, priority:100
+#, priority:90
msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:257
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"$ git fast-export --anonymize --all \\\n"
" --anonymize-map=sensitive:foo \\\n"
@@ -21561,259 +21561,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:261
-#, priority:100
+#, priority:90
msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:266
-#, priority:100
+#, priority:90
msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:270
-#, priority:100
+#, priority:90
msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:277
-#, priority:100
+#, priority:90
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
-#, priority:100
+#, priority:90
msgid "git-fast-import - Backend for fast Git data importers"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:13
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "frontend | 'git fast-import' [<options>]\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-#, priority:100
+#, priority:90
msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
-#, priority:100
+#, priority:90
msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
-#, priority:100
+#, priority:90
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-#, priority:100
+#, priority:90
msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:47
-#, priority:100
+#, priority:90
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
-#, priority:100
+#, priority:90
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:54
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--allow-unsafe-features"
msgstr "--allow-unsafe-features"
#. type: Plain text
#: en/git-fast-import.txt:63
-#, priority:100
+#, priority:90
msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line. This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:68
-#, priority:100
+#, priority:90
msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Options for Frontends"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:72
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--cat-blob-fd=<fd>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:77
-#, priority:100
+#, priority:90
msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--date-format=<fmt>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:83
-#, priority:100
+#, priority:90
msgid "Specify the type of dates the frontend will supply to fast-import within `author`, `committer` and `tagger` commands. See ``Date Formats'' below for details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:84
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:89
-#, priority:100
+#, priority:90
msgid "Terminate with error if there is no `done` command at the end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Locations of Marks Files"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:101
-#, priority:100
+#, priority:90
msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
-#, priority:100
+#, priority:90
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:110
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--import-marks-if-exists=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:113
-#, priority:100
+#, priority:90
msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:114
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:121
-#, priority:100
+#, priority:90
msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:124
-#, priority:100
+#, priority:90
msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:126
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Submodule Rewriting"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-from=<name>:<file>"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
+#, priority:90
msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:139
-#, priority:100
+#, priority:90
msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:144
-#, priority:100
+#, priority:90
msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Performance and Compression Tuning"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--active-branches=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:151
-#, priority:100
+#, priority:90
msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:152
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--big-file-threshold=<n>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
-#, priority:100
+#, priority:90
msgid "Maximum size of a blob that fast-import will attempt to create a delta for, expressed in bytes. The default is 512m (512 MiB). Some importers may wish to lower this on systems with constrained memory."
msgstr ""
@@ -21825,19 +21825,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:161
-#, priority:100
+#, priority:90
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "--export-pack-edges=<file>"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:170
-#, priority:100
+#, priority:90
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
@@ -21849,433 +21849,433 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-#, priority:100
+#, priority:90
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:175
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/git-fast-import.txt:177
-#, priority:100
+#, priority:90
msgid "See linkgit:git-config[1]"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:179 en/git-filter-branch.txt:463 en/git-p4.txt:548
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PERFORMANCE"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:186
-#, priority:100
+#, priority:90
msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:192
-#, priority:100
+#, priority:90
msgid "Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the destination Git repository (due to less IO contention)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:195
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "DEVELOPMENT COST"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:202
-#, priority:100
+#, priority:90
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:205
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PARALLEL OPERATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:210
-#, priority:100
+#, priority:90
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:219
-#, priority:100
+#, priority:90
msgid "fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:223
-#, priority:100
+#, priority:90
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TECHNICAL DISCUSSION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:233
-#, priority:100
+#, priority:90
msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:242
-#, priority:100
+#, priority:90
msgid "fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by `GIT_DIR`.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:244
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "INPUT FORMAT"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:250
-#, priority:100
+#, priority:90
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-#, priority:100
+#, priority:90
msgid "fast-import is very strict about its input. Where we say SP below we mean *exactly* one space. Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Stream Comments"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:267
-#, priority:100
+#, priority:90
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:269
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Date Formats"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:273
-#, priority:100
+#, priority:90
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:274
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:278
-#, priority:100
+#, priority:90
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:282
-#, priority:100
+#, priority:90
msgid "The time of the event is specified by `<time>` as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:288
-#, priority:100
+#, priority:90
msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
-#, priority:100
+#, priority:90
msgid "If the local offset is not available in the source material, use ``+0000'', or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:298
-#, priority:100
+#, priority:90
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:299
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`raw-permissive`"
msgstr "`raw-permissive`"
#. type: Plain text
#: en/git-fast-import.txt:304
-#, priority:100
+#, priority:90
msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:305
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:307
-#, priority:100
+#, priority:90
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:312
-#, priority:100
+#, priority:90
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:318
-#, priority:100
+#, priority:90
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:323
-#, priority:100
+#, priority:90
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:328
-#, priority:100
+#, priority:90
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:333
-#, priority:100
+#, priority:90
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:334
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:337
-#, priority:100
+#, priority:90
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:342
-#, priority:100
+#, priority:90
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:347
-#, priority:100
+#, priority:90
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:354
-#, priority:100
+#, priority:90
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Commands"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:360
-#, priority:100
+#, priority:90
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:365
-#, priority:100
+#, priority:90
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:371
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:376
-#, priority:100
+#, priority:90
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:381
-#, priority:100
+#, priority:90
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
#: en/git-fast-import.txt:388
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:394
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:399
-#, priority:100
+#, priority:90
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:404
-#, priority:100
+#, priority:90
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:409
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:414
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:419
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:423
-#, priority:100
+#, priority:90
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:428
-#, priority:100
+#, priority:90
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:433
-#, priority:100
+#, priority:90
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:446
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'commit' SP <ref> LF\n"
"\tmark?\n"
@@ -22292,241 +22292,241 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:454
-#, priority:100
+#, priority:90
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:460
-#, priority:100
+#, priority:90
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:466
-#, priority:100
+#, priority:90
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:474
-#, priority:100
+#, priority:90
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:481
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:483
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:489
-#, priority:100
+#, priority:90
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:491
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:494
-#, priority:100
+#, priority:90
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:502
-#, priority:100
+#, priority:90
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-#, priority:100
+#, priority:90
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
#: en/git-fast-import.txt:513
-#, priority:100
+#, priority:90
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:515
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:521
-#, priority:100
+#, priority:90
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:531
-#, priority:100
+#, priority:90
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:534
-#, priority:100
+#, priority:90
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:536
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-#, priority:100
+#, priority:90
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:542
-#, priority:100
+#, priority:90
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:548
-#, priority:100
+#, priority:90
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:550
-#, priority:100
+#, priority:90
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:552
-#, priority:100
+#, priority:90
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
-#, priority:100
+#, priority:90
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:558
-#, priority:100
+#, priority:90
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
-#, priority:100
+#, priority:90
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
#: en/git-fast-import.txt:563
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:570
-#, priority:100
+#, priority:90
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:572
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:580
-#, priority:100
+#, priority:90
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:583
-#, priority:100
+#, priority:90
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:585
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:589
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "External data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:593
-#, priority:100
+#, priority:90
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:596
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:603
-#, priority:100
+#, priority:90
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Inline data format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
-#, priority:100
+#, priority:90
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:612
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
"\tdata\n"
@@ -22534,259 +22534,259 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
-#, priority:100
+#, priority:90
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:618
-#, priority:100
+#, priority:90
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:622
-#, priority:100
+#, priority:90
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:623
-#, priority:100
+#, priority:90
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624
-#, priority:100
+#, priority:90
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:627
-#, priority:100
+#, priority:90
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
-#, priority:100
+#, priority:90
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:632
-#, priority:100
+#, priority:90
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:636
-#, priority:100
+#, priority:90
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:643
-#, priority:100
+#, priority:90
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:645
-#, priority:100
+#, priority:90
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:647
-#, priority:100
+#, priority:90
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:648
-#, priority:100
+#, priority:90
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-#, priority:100
+#, priority:90
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:651
-#, priority:100
+#, priority:90
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:653
-#, priority:100
+#, priority:90
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:655
-#, priority:100
+#, priority:90
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:657
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:663
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:666
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:671
-#, priority:100
+#, priority:90
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:673
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:678
-#, priority:100
+#, priority:90
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:681
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
-#, priority:100
+#, priority:90
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:692
-#, priority:100
+#, priority:90
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:694
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:698
-#, priority:100
+#, priority:90
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:701
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:712
-#, priority:100
+#, priority:90
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-#, priority:100
+#, priority:90
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:723
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:728
-#, priority:100
+#, priority:90
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:731
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:737
-#, priority:100
+#, priority:90
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:745
-#, priority:100
+#, priority:90
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:747
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:756
-#, priority:100
+#, priority:90
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-#, priority:100
+#, priority:90
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:764
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:769
-#, priority:100
+#, priority:90
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:774
-#, priority:100
+#, priority:90
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:778
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
"\tdata\n"
@@ -22794,73 +22794,73 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:784
-#, priority:100
+#, priority:90
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:786
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:792
-#, priority:100
+#, priority:90
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:795
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-#, priority:100
+#, priority:90
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:805
-#, priority:100
+#, priority:90
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:807
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:812
-#, priority:100
+#, priority:90
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
-#, priority:100
+#, priority:90
msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:823
-#, priority:100
+#, priority:90
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:831
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'tag' SP <name> LF\n"
"\tmark?\n"
@@ -22872,55 +22872,55 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:834
-#, priority:100
+#, priority:90
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:839
-#, priority:100
+#, priority:90
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:843
-#, priority:100
+#, priority:90
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-#, priority:100
+#, priority:90
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:849
-#, priority:100
+#, priority:90
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:855
-#, priority:100
+#, priority:90
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:863
-#, priority:100
+#, priority:90
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:870
-#, priority:100
+#, priority:90
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:875
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'reset' SP <ref> LF\n"
"\t('from' SP <commit-ish> LF)?\n"
@@ -22929,25 +22929,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:879
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
-#, priority:100
+#, priority:90
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:884
-#, priority:100
+#, priority:90
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:888
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\treset refs/tags/938\n"
"\tfrom :938\n"
@@ -22955,19 +22955,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:892
-#, priority:100
+#, priority:90
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:899
-#, priority:100
+#, priority:90
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:905
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'blob' LF\n"
"\tmark?\n"
@@ -22977,43 +22977,43 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:911
-#, priority:100
+#, priority:90
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:913
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:90
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:920
-#, priority:100
+#, priority:90
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:925
-#, priority:100
+#, priority:90
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:926
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:928
-#, priority:100
+#, priority:90
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:932
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP <count> LF\n"
"\t<raw> LF?\n"
@@ -23021,31 +23021,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:938
-#, priority:100
+#, priority:90
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:943
-#, priority:100
+#, priority:90
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:944
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Delimited format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:949
-#, priority:100
+#, priority:90
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:955
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'data' SP '<<' <delim> LF\n"
"\t<raw> LF\n"
@@ -23055,25 +23055,25 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:963
-#, priority:100
+#, priority:90
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:965
-#, priority:100
+#, priority:90
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:970
-#, priority:100
+#, priority:90
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:976
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'alias' LF\n"
"\tmark\n"
@@ -23083,19 +23083,19 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:979
-#, priority:100
+#, priority:90
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
-#, priority:100
+#, priority:90
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:989
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'checkpoint' LF\n"
"\tLF?\n"
@@ -23103,31 +23103,31 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:995
-#, priority:100
+#, priority:90
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1000
-#, priority:100
+#, priority:90
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1006
-#, priority:100
+#, priority:90
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1019
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t'progress' SP <any> LF\n"
"\tLF?\n"
@@ -23135,67 +23135,67 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1025
-#, priority:100
+#, priority:90
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1028
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1033
-#, priority:100
+#, priority:90
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1041
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1044
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
-#, priority:100
+#, priority:90
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1056
-#, priority:100
+#, priority:90
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1059
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1064
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1066
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1070
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
"\t<contents> LF\n"
@@ -23203,283 +23203,283 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1076
-#, priority:100
+#, priority:90
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1087
-#, priority:100
+#, priority:90
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1090
-#, priority:100
+#, priority:90
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1091
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1095
-#, priority:100
+#, priority:90
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1100
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1106
-#, priority:100
+#, priority:90
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1109
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1112
-#, priority:100
+#, priority:90
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1114
-#, priority:100
+#, priority:90
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1117
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1122
-#, priority:100
+#, priority:90
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1125
-#, priority:100
+#, priority:90
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1128
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1137
-#, priority:100
+#, priority:90
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1140
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1143
-#, priority:100
+#, priority:90
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "date-format"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "export-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1146
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "relative-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1147
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "force"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1152
-#, priority:100
+#, priority:90
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1154
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
-#, priority:100
+#, priority:90
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1163
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "get-mark"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1164
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "cat-blob"
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1165
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "ls"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1173
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1174
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "notes"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
-#, priority:100
+#, priority:90
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:1180
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "done"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1187
-#, priority:100
+#, priority:90
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1194
-#, priority:100
+#, priority:90
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
#: en/git-fast-import.txt:1197
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
-#, priority:100
+#, priority:90
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1206
-#, priority:100
+#, priority:90
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1209
-#, priority:100
+#, priority:90
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1214
-#, priority:100
+#, priority:90
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1220
-#, priority:100
+#, priority:90
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1224
-#, priority:100
+#, priority:90
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1226
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1233
-#, priority:100
+#, priority:90
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1240
-#, priority:100
+#, priority:90
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1245
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tmkfifo fast-import-output\n"
"\tfrontend <fast-import-output |\n"
@@ -23488,49 +23488,49 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1249
-#, priority:100
+#, priority:90
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1253
-#, priority:100
+#, priority:90
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1255
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1261
-#, priority:100
+#, priority:90
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
-#, priority:100
+#, priority:90
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1276
-#, priority:100
+#, priority:90
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1278
-#, priority:100
+#, priority:90
msgid "An example crash:"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1294
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
"\t# my very first test commit\n"
@@ -23550,7 +23550,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1298
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ git fast-import <in\n"
"\tfatal: Corrupt mode: M 777 inline bob\n"
@@ -23559,7 +23559,7 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1304
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
"\tfast-import crash report:\n"
@@ -23570,13 +23570,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1306
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1316
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"\tMost Recent Commands Before Crash\n"
"\t---------------------------------\n"
@@ -23591,13 +23591,13 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1317
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Active Branch LRU\n"
"-----------------\n"
@@ -23606,19 +23606,19 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1324
-#, priority:100
+#, priority:90
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1325
-#, priority:100
+#, priority:90
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid ""
"Inactive Branches\n"
"-----------------\n"
@@ -23633,307 +23633,307 @@ msgstr ""
#. type: delimited block =
#: en/git-fast-import.txt:1339
-#, priority:100
+#, priority:90
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1342
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1345
-#, priority:100
+#, priority:90
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1347
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1355
-#, priority:100
+#, priority:90
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-#, priority:100
+#, priority:90
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1361
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1366
-#, priority:100
+#, priority:90
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1370
-#, priority:100
+#, priority:90
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1372
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Handling Renames"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1377
-#, priority:100
+#, priority:90
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1379
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1383
-#, priority:100
+#, priority:90
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-#, priority:100
+#, priority:90
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1396
-#, priority:100
+#, priority:90
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1402
-#, priority:100
+#, priority:90
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-#, priority:100
+#, priority:90
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1407
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1411
-#, priority:100
+#, priority:90
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
-#, priority:100
+#, priority:90
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1423
-#, priority:100
+#, priority:90
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1425
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1432
-#, priority:100
+#, priority:90
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1434
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1441
-#, priority:100
+#, priority:90
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1444
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1450
-#, priority:100
+#, priority:90
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1458
-#, priority:100
+#, priority:90
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1465
-#, priority:100
+#, priority:90
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1472
-#, priority:100
+#, priority:90
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1480
-#, priority:100
+#, priority:90
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1482
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1488
-#, priority:100
+#, priority:90
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1490
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per object"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1497
-#, priority:100
+#, priority:90
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1503
-#, priority:100
+#, priority:90
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per mark"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1511
-#, priority:100
+#, priority:90
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1513
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per branch"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1516
-#, priority:100
+#, priority:90
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1522
-#, priority:100
+#, priority:90
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1529
-#, priority:100
+#, priority:90
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1533
-#, priority:100
+#, priority:90
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1538
-#, priority:100
+#, priority:90
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1540
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active tree"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1545
-#, priority:100
+#, priority:90
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:1547
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "per active file entry"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1553
-#, priority:100
+#, priority:90
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1558
-#, priority:100
+#, priority:90
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
#: en/git-fast-import.txt:1560
-#, no-wrap, priority:100
+#, no-wrap, priority:90
msgid "SIGNALS"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1566
-#, priority:100
+#, priority:90
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -59517,1266 +59517,1266 @@ msgstr ""
#. type: Title =
#: en/gitglossary.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:310
msgid "gitglossary(7)"
msgstr "gitglossary(7)"
#. type: Plain text
#: en/gitglossary.txt:7
-#, priority:100
+#, priority:310
msgid "gitglossary - A Git Glossary"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:11
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "*\n"
msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
+#, fuzzy, priority:310
#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Labeled list
#: en/glossary-content.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_alternate_object_database]]alternate object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:5
-#, priority:100
+#, priority:310
msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:6
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:16
-#, priority:100
+#, priority:310
msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:17
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_blob_object]]blob object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:19
-#, priority:100
+#, priority:310
msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:20
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_branch]]branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
-#, priority:100
+#, priority:310
msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:31
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cache]]cache"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:33
-#, priority:100
+#, priority:310
msgid "Obsolete for: <<def_index,index>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:34
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_chain]]chain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:38
-#, priority:100
+#, priority:310
msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:39
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_changeset]]changeset"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:43
-#, priority:100
+#, priority:310
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:44
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_checkout]]checkout"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:51
-#, priority:100
+#, priority:310
msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:52
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_cherry-picking]]cherry-picking"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:59
-#, priority:100
+#, priority:310
msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_clean]]clean"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:64
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:65
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit]]commit"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:72
-#, priority:100
+#, priority:310
msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:77
-#, priority:100
+#, priority:310
msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:78
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit_object]]commit object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:84
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:85
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_commit-ish]]commit-ish (also committish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:96
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:97
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:100
-#, priority:100
+#, priority:310
msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:101
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_DAG]]DAG"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:106
-#, priority:100
+#, priority:310
msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:107
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dangling_object]]dangling object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:112
-#, priority:100
+#, priority:310
msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:113
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_detached_HEAD]]detached HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:122
-#, priority:100
+#, priority:310
msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:131
-#, priority:100
+#, priority:310
msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:132
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_directory]]directory"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:134
-#, priority:100
+#, priority:310
msgid "The list you get with \"ls\" :-)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:135
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_dirty]]dirty"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:139
-#, priority:100
+#, priority:310
msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:140
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_evil_merge]]evil merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:143
-#, priority:100
+#, priority:310
msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:144
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fast_forward]]fast-forward"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:153
-#, priority:100
+#, priority:310
msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:160
-#, priority:100
+#, priority:310
msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:161
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:165
-#, priority:100
+#, priority:310
msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:166
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_git_archive]]Git archive"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:168
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_repository,repository>> (for arch people)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:169
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_gitfile]]gitfile"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:172
-#, priority:100
+#, priority:310
msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:173
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_grafts]]grafts"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:179
-#, priority:100
+#, priority:310
msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:183
-#, priority:100
+#, priority:310
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:184
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hash]]hash"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:186
-#, priority:100
+#, priority:310
msgid "In Git's context, synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:187
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head]]head"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, priority:310
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:193
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_HEAD]]HEAD"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:200
-#, priority:100
+#, priority:310
msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:201
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_head_ref]]head ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:203
-#, priority:100
+#, priority:310
msgid "A synonym for <<def_head,head>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_hook]]hook"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:213
-#, priority:100
+#, priority:310
msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:214
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index]]index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:220
-#, priority:100
+#, priority:310
msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:221
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:226
-#, priority:100
+#, priority:310
msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:227
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_master]]master"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:233
-#, priority:100
+#, priority:310
msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:234
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_merge]]merge"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:247
-#, priority:100
+#, priority:310
msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <<def_pull,pull>>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:254
-#, priority:100
+#, priority:310
msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:255
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object]]object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:259
-#, priority:100
+#, priority:310
msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:260
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:264
-#, priority:100
+#, priority:310
msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:265
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_identifier]]object identifier"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:267
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:268
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:272
-#, priority:100
+#, priority:310
msgid "The unique identifier of an <<def_object,object>>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:273
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:278
-#, priority:100
+#, priority:310
msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:279
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_octopus]]octopus"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:281
-#, priority:100
+#, priority:310
msgid "To <<def_merge,merge>> more than two <<def_branch,branches>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:282
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_origin]]origin"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:289
-#, priority:100
+#, priority:310
msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:290
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_overlay]]overlay"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:298
-#, priority:100
+#, priority:310
msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:299
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack]]pack"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:302
-#, priority:100
+#, priority:310
msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:303
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pack_index]]pack index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:307
-#, priority:100
+#, priority:310
msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:308
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pathspec]]pathspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:310
-#, priority:100
+#, priority:310
msgid "Pattern used to limit paths in Git commands."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:318
-#, priority:100
+#, priority:310
msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:322
-#, priority:100
+#, priority:310
msgid "any path matches itself"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:325
-#, priority:100
+#, priority:310
msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:329
-#, priority:100
+#, priority:310
msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:335
-#, priority:100
+#, priority:310
msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:345
-#, priority:100
+#, priority:310
msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:350
-#, priority:100
+#, priority:310
msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:353
-#, priority:100
+#, priority:310
msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--stop"
msgid "top"
msgstr "--stop"
#. type: Plain text
#: en/glossary-content.txt:359
-#, priority:100
+#, priority:310
msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--literally"
msgid "literal"
msgstr "--literally"
#. type: Plain text
#: en/glossary-content.txt:363
-#, priority:100
+#, priority:310
msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:364
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "icase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:366
-#, priority:100
+#, priority:310
msgid "Case insensitive match."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--global"
msgid "glob"
msgstr "--global"
#. type: Plain text
#: en/glossary-content.txt:374
-#, priority:100
+#, priority:310
msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:377
-#, priority:100
+#, priority:310
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:383
-#, priority:100
+#, priority:310
msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:387
-#, priority:100
+#, priority:310
msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:391
-#, priority:100
+#, priority:310
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:393
-#, priority:100
+#, priority:310
msgid "Other consecutive asterisks are considered invalid."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:395
-#, priority:100
+#, priority:310
msgid "Glob magic is incompatible with literal magic."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:396
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "attr"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, priority:310
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:405
-#, priority:100
+#, priority:310
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:407
-#, priority:100
+#, priority:310
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:409
-#, priority:100
+#, priority:310
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:412
-#, priority:100
+#, priority:310
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:415
-#, priority:100
+#, priority:310
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:418
-#, priority:100
+#, priority:310
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:310
#| msgid "--include"
msgid "exclude"
msgstr "--include"
#. type: Plain text
#: en/glossary-content.txt:425
-#, priority:100
+#, priority:310
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:427
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_parent]]parent"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:431
-#, priority:100
+#, priority:310
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:432
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pickaxe]]pickaxe"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:438
-#, priority:100
+#, priority:310
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:439
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_plumbing]]plumbing"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:441
-#, priority:100
+#, priority:310
msgid "Cute name for <<def_core_git,core Git>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:442
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_porcelain]]porcelain"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:447
-#, priority:100
+#, priority:310
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:448
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_per_worktree_ref]]per-worktree ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:453
-#, priority:100
+#, priority:310
msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:454
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pseudoref]]pseudoref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:469
-#, priority:100
+#, priority:310
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:470
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_pull]]pull"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:473
-#, priority:100
+#, priority:310
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:474
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_push]]push"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:485
-#, priority:100
+#, priority:310
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:486
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reachable]]reachable"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:495
-#, priority:100
+#, priority:310
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:496
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:500
-#, priority:100
+#, priority:310
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:501
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_ref]]ref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:509
-#, priority:100
+#, priority:310
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:513
-#, priority:100
+#, priority:310
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:516
-#, priority:100
+#, priority:310
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:517
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_reflog]]reflog"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:522
-#, priority:100
+#, priority:310
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:523
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_refspec]]refspec"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:527
-#, priority:100
+#, priority:310
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:528
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:532
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:533
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:541
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:542
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_repository]]repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:549
-#, priority:100
+#, priority:310
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:550
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_resolve]]resolve"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:553
-#, priority:100
+#, priority:310
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:554
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_revision]]revision"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:556
-#, priority:100
+#, priority:310
msgid "Synonym for <<def_commit,commit>> (the noun)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:557
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_rewind]]rewind"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:560
-#, priority:100
+#, priority:310
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:561
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SCM]]SCM"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:563
-#, priority:100
+#, priority:310
msgid "Source code management (tool)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:564
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_SHA1]]SHA-1"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:567
-#, priority:100
+#, priority:310
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:568
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_clone]]shallow clone"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:572
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:310
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:573
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_shallow_repository]]shallow repository"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:583
-#, priority:100
+#, priority:310
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:584
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_stash]]stash entry"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:587
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:588
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_submodule]]submodule"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:592
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:593
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_superproject]]superproject"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:598
-#, priority:100
+#, priority:310
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:599
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_symref]]symref"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:606
-#, priority:100
+#, priority:310
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:607
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag]]tag"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:616
-#, priority:100
+#, priority:310
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:617
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tag_object]]tag object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:622
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:623
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_topic_branch]]topic branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:629
-#, priority:100
+#, priority:310
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:630
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree]]tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:634
-#, priority:100
+#, priority:310
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:635
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree_object]]tree object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:639
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:640
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_tree-ish]]tree-ish (also treeish)"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:653
-#, priority:100
+#, priority:310
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:654
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unmerged_index]]unmerged index"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:657
-#, priority:100
+#, priority:310
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:658
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_unreachable_object]]unreachable object"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:661
-#, priority:100
+#, priority:310
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:662
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:667
-#, priority:100
+#, priority:310
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:668
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_working_tree]]working tree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:672
-#, priority:100
+#, priority:310
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:673
-#, no-wrap, priority:100
+#, no-wrap, priority:310
msgid "[[def_worktree]]worktree"
msgstr ""
#. type: Plain text
#: en/glossary-content.txt:680
-#, priority:100
+#, priority:310
msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
msgstr ""
--
GitLab