diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index d86771ae8929d7e55cf771d62317306a3fb34689..c51235ed1be36be48e22a336ac8d3d0511494b69 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -7477,30 +7477,48 @@ msgstr "--exclude=<motif-de-chemin>"
#, priority:100
msgid "Don't apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to exclude certain files or directories."
msgstr ""
+"Ne pas appliquer les modifications aux fichiers correspondant au mod챔le de "
+"chemin donn챕. Cela peut 챗tre utile lors de l'importation d'ensembles de "
+"rustines, lorsque vous souhaitez exclure certains fichiers ou r챕pertoires."
#. type: Labeled list
#: en/git-apply.txt:171
#, no-wrap, priority:100
msgid "--include=<path-pattern>"
-msgstr ""
+msgstr "--include = <mod챔le-de-chemin>"
#. type: Plain text
#: en/git-apply.txt:175
#, priority:100
msgid "Apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to include certain files or directories."
msgstr ""
+"Appliquer les modifications aux fichiers correspondant au mod챔le de chemin "
+"donn챕. Cela peut 챗tre utile lors de l'importation d'ensembles de rustines, "
+"lorsque vous souhaitez inclure certains fichiers ou r챕pertoires."
#. type: Plain text
#: en/git-apply.txt:181
#, priority:100
msgid "When `--exclude` and `--include` patterns are used, they are examined in the order they appear on the command line, and the first match determines if a patch to each path is used. A patch to a path that does not match any include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern."
msgstr ""
+"Lorsque des motifs `--exclude` et `--include` sont utilis챕s, ils sont "
+"examin챕s dans l'ordre o첫 ils apparaissent sur la ligne de commande, et la "
+"premi챔re correspondance d챕termine si une rustine est utilis챕e pour chaque "
+"chemin. Une rustine pour un chemin qui ne correspond 횪 aucun motif d'"
+"inclusion/exclusion est utilis챕e par d챕faut s'il n'y a pas de motif "
+"d'inclusion sur la ligne de commande, et ignor챕e s'il y a un motif "
+"d'inclusion."
#. type: Plain text
#: en/git-apply.txt:189
#, priority:100
msgid "When applying a patch, ignore changes in whitespace in context lines if necessary. Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though."
msgstr ""
+"Lors de l�셙pplication d�셵ne rustine, ignorer les modifications d�셞spaces "
+"blancs dans les lignes de contexte si n챕cessaire. Les lignes contextatives "
+"pr챕serveront leurs espaces blancs, et elles ne subiront pas de correction d��"
+"espaces blancs quelle que soit la valeur de l�셭ption `--whitespace`. Les "
+"nouvelles lignes seront toutefois encore corrig챕es."
#. type: Labeled list
#: en/git-apply.txt:190
@@ -7513,48 +7531,70 @@ msgstr "--whitespace=<action>"
#, priority:100
msgid "When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors."
msgstr ""
+"Lors de l'application d'une rustine, d챕tecter une ligne nouvelle ou modifi챕e "
+"qui comporte des erreurs d'espacement. Ce qui est consid챕r챕 comme des "
+"erreurs d'espacement est contr척l챕 par la configuration `core.whitespace`. "
+"Par d챕faut, les espaces de fin de ligne (y compris les lignes qui ne sont "
+"compos챕es que d'espaces) et un caract챔re espace qui est imm챕diatement suivi "
+"d'un caract챔re de tabulation 횪 l'int챕rieur de l'indentation initiale de la "
+"ligne sont consid챕r챕s comme des erreurs d'espacement."
#. type: Plain text
#: en/git-apply.txt:202
#, priority:100
msgid "By default, the command outputs warning messages but applies the patch. When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`."
msgstr ""
+"Par d챕faut, la commande 챕met des messages d'avertissement mais applique la "
+"rustine. Lorsque `git-apply` est utilis챕 pour des statistiques et non pour "
+"appliquer une rustine, la valeur par d챕faut est `nowarn`."
#. type: Plain text
#: en/git-apply.txt:205
#, priority:100
msgid "You can use different `<action>` values to control this behavior:"
msgstr ""
+"Vous pouvez utiliser diff챕rentes valeurs de `<action>` pour contr척ler ce "
+"comportement :"
#. type: Plain text
#: en/git-apply.txt:207
#, priority:100
msgid "`nowarn` turns off the trailing whitespace warning."
-msgstr ""
+msgstr "`nowarn` d챕sactive l'alerte d'espace blanc."
#. type: Plain text
#: en/git-apply.txt:209
#, priority:100
msgid "`warn` outputs warnings for a few such errors, but applies the patch as-is (default)."
msgstr ""
+"`warn` 챕met des avertissements pour quelques erreurs de ce type, mais "
+"applique la rustine tel quel (par d챕faut)."
#. type: Plain text
#: en/git-apply.txt:213
#, priority:100
msgid "`fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym --- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more)."
msgstr ""
+"`fix` 챕met des avertissements pour quelques erreurs de ce type, et applique "
+"la rustine apr챔s les avoir corrig챕es (`strip` est un synonyme --- l'outil "
+"utilis챕 pour ne consid챕rer que les caract챔res d'espacement de fin de ligne "
+"comme des erreurs, et le correctif impliquait de les \"d챕pouiller\" "
+"(`stripping`), mais les Gits modernes font plus)."
#. type: Plain text
#: en/git-apply.txt:215
#, priority:100
msgid "`error` outputs warnings for a few such errors, and refuses to apply the patch."
msgstr ""
+"`error` g챕n챔re des avertissements pour quelques-unes de ces erreurs et "
+"refuse d'appliquer la rustine."
#. type: Plain text
#: en/git-apply.txt:216
#, priority:100
msgid "`error-all` is similar to `error` but shows all errors."
msgstr ""
+"Le terme `error-all` est similaire 횪 `error` mais montre toutes les erreurs."
#. type: Labeled list
#: en/git-apply.txt:217
@@ -7567,12 +7607,20 @@ msgstr "--inaccurate-eof"
#, priority:100
msgid "Under certain circumstances, some versions of 'diff' do not correctly detect a missing new-line at the end of the file. As a result, patches created by such 'diff' programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug."
msgstr ""
+"Dans certaines circonstances, certaines versions de 'diff' ne d챕tectent pas "
+"correctement une nouvelle ligne manquante 횪 la fin du fichier. Par "
+"cons챕quent, les rustines cr챕챕es par ces programmes de 'diff' n'enregistrent "
+"pas correctement les lignes incompl챔tes. Cette option permet d'appliquer ces "
+"rustines en contournant ce bogue."
#. type: Plain text
#: en/git-apply.txt:229
#, priority:100
msgid "Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported."
msgstr ""
+"Afficher l'챕tat d'avancement sur stderr. Par d챕faut, seul un message "
+"concernant la rustine en cours d'application sera imprim챕. Cette option "
+"entra챤nera l'affichage d'informations suppl챕mentaires."
#. type: Labeled list
#: en/git-apply.txt:230
@@ -7585,6 +7633,9 @@ msgstr "--recount"
#, priority:100
msgid "Do not trust the line counts in the hunk headers, but infer them by inspecting the patch (e.g. after editing the patch without adjusting the hunk headers appropriately)."
msgstr ""
+"Ne pas se fier au nombre de lignes dans les en-t챗tes de sections, mais le "
+"d챕duire en inspectant la rustine (par exemple, apr챔s avoir modifi챕 la "
+"rustine sans avoir ajust챕 les en-t챗tes de section de mani챔re appropri챕e)."
#. type: Labeled list
#: en/git-apply.txt:235
@@ -7597,12 +7648,17 @@ msgstr "--directory=<racine>"
#, priority:100
msgid "Prepend <root> to all filenames. If a \"-p\" argument was also passed, it is applied before prepending the new root."
msgstr ""
+"Pr챕fixer <racine> 횪 tous les noms de fichiers. Si un argument \"-p\" a "
+"챕galement 챕t챕 pass챕, il est appliqu챕 avant de pr챕fixer la nouvelle racine."
#. type: Plain text
#: en/git-apply.txt:242
#, priority:100
msgid "For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by running `git apply --directory=modules/git-gui`."
msgstr ""
+"Par exemple, une rustine qui parle de mettre 횪 jour `a/git-gui.sh` en `b/git-"
+"gui.sh` peut 챗tre appliqu챕e au fichier dans l'arbre de travail `modules/"
+"git-gui/git-gui.sh` en lan챌ant `git apply --directory=modules/git-gui`."
#. type: Labeled list
#: en/git-apply.txt:243
@@ -7733,66 +7789,99 @@ msgstr "'git archimport' utilise beaucoup `tla` en arri챔re-plan pour acc챕der a
#, priority:100
msgid "For the initial import, 'git archimport' expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun 'git archimport' with the same parameters as the initial import to perform incremental imports."
msgstr ""
+"Pour l'importation initiale, 'git archimport' s'attend 횪 se retrouver dans "
+"un r챕pertoire vide. Pour suivre le d챕veloppement d'un projet qui utilise "
+"Arch, relancez 'git archimport' avec les m챗mes param챔tres que l'importation "
+"initiale pour effectuer des importations incr챕mentales."
#. type: Plain text
#: en/git-archimport.txt:49
#, priority:100
msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"."
msgstr ""
+"Alors que 'git archimport' essaiera de cr챕er des noms de branches sensibles "
+"pour les archives qu'il importe, il est 챕galement possible de sp챕cifier "
+"manuellement les noms de branches Git. Pour ce faire, 챕crivez un nom de "
+"branche Git apr챔s chaque param챔tre <archive/branche>, s챕par챕 par deux "
+"points. De cette fa챌on, vous pouvez raccourcir les noms de branches Arch et "
+"convertir le jargon Arch en jargon Git, par exemple en faisant correspondre "
+"une branche \"PROJECT{litdd}devo{litdd}VERSION\" 횪 \"master\"."
#. type: Plain text
#: en/git-archimport.txt:54
#, priority:100
msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically."
msgstr ""
+"Il est possible d'associer plusieurs branches Arch 횪 une branche Git ; le "
+"r챕sultat n'aura de sens que si aucun commit n'est pouss챕 sur la premi챔re "
+"branche, apr챔s la cr챕ation de la deuxi챔me branche. N챕anmoins, cela est "
+"utile pour convertir les d챕p척ts Arch qui ont fait l'objet d'une rotation "
+"p챕riodique."
#. type: Title -
#: en/git-archimport.txt:57
#, no-wrap, priority:100
msgid "MERGES"
-msgstr ""
+msgstr "FUSIONS"
#. type: Plain text
#: en/git-archimport.txt:63
#, priority:100
msgid "Patch merge data from Arch is used to mark merges in Git as well. Git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result is that Git will have a good idea of how far branches have diverged. So the import process does lose some patch-trading metadata."
msgstr ""
+"Les donn챕es de fusion de rustines d'Arch sont utilis챕es pour marquer les "
+"fusions dans Git 챕galement. Git ne se soucie pas beaucoup du suivi des "
+"rustines, et ne consid챔re une fusion que lorsqu'une branche incorpore tous "
+"les commits depuis le point o첫 ils ont bifurqu챕. Le r챕sultat final est que "
+"Git aura une bonne id챕e de l'챕tendue de la divergence des branches. Le "
+"processus d'importation perd donc certaines m챕tadonn챕es d'챕change de "
+"rustines."
#. type: Plain text
#: en/git-archimport.txt:67
#, priority:100
msgid "Fortunately, when you try and merge branches imported from Arch, Git will find a good merge base, and it has a good chance of identifying patches that have been traded out-of-sequence between the branches."
msgstr ""
+"Heureusement, lorsque vous essayez de fusionner des branches import챕es "
+"d'Arch, Git trouve une bonne base de fusion, et il a de bonnes chances "
+"d'identifier les rustines qui ont 챕t챕 챕chang챕s hors s챕quence entre les "
+"branches."
#. type: Plain text
#: en/git-archimport.txt:73
#, priority:100
msgid "Display usage."
-msgstr ""
+msgstr "Afficher l'utilisation."
#. type: Plain text
#: en/git-archimport.txt:76
#, priority:100
msgid "Verbose output."
-msgstr ""
+msgstr "Sortie verbeuse."
#. type: Labeled list
#: en/git-archimport.txt:77
#, no-wrap, priority:100
msgid "-T"
-msgstr ""
+msgstr "-T"
#. type: Plain text
#: en/git-archimport.txt:80
#, priority:100
msgid "Many tags. Will create a tag for every commit, reflecting the commit name in the Arch repository."
msgstr ""
+"Beaucoup d'챕tiquettes. Cr챕era une 챕tiquette pour chaque commit, refl챕tant le "
+"nom du commit dans le d챕p척t Arch."
#. type: Plain text
#: en/git-archimport.txt:85
#, priority:100
msgid "Use the fast patchset import strategy. This can be significantly faster for large trees, but cannot handle directory renames or permissions changes. The default strategy is slow and safe."
msgstr ""
+"Utiliser la strat챕gie d'importation rapide d'ensembles de rustines. Cela "
+"peut 챗tre beaucoup plus rapide pour les grands arbres, mais ne permet pas de "
+"g챕rer les renommages de r챕pertoires ou les modifications de permissions. La "
+"strat챕gie par d챕faut est lente et s청re."
#. type: Labeled list
#: en/git-archimport.txt:86 en/git-commit.txt:262 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29
@@ -7805,48 +7894,61 @@ msgstr "-o"
#, priority:100
msgid "Use this for compatibility with old-style branch names used by earlier versions of 'git archimport'. Old-style branch names were category{litdd}branch, whereas new-style branch names are archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones."
msgstr ""
+"Utilisez-le pour assurer la compatibilit챕 avec les noms de branche 횪 "
+"l'ancienne utilis챕s par les versions ant챕rieures de 'git archimport'. Les "
+"anciens noms de branches 챕taient categorie{litdd}branche, tandis que les "
+"nouveaux noms de branches sont archive,categorie{litdd}branche{litdd}"
+"version. Dans les deux cas, les noms donn챕s sur la ligne de commande "
+"remplaceront les noms g챕n챕r챕s automatiquement."
#. type: Labeled list
#: en/git-archimport.txt:94
#, no-wrap, priority:100
msgid "-D <depth>"
-msgstr ""
+msgstr "-D <profondeur>"
#. type: Plain text
#: en/git-archimport.txt:98
#, priority:100
msgid "Follow merge ancestry and attempt to import trees that have been merged from. Specify a depth greater than 1 if patch logs have been pruned."
msgstr ""
+"Suivre l'ascendance de la fusion et essayer d'importer des arbres qui ont "
+"챕t챕 fusionn챕s. Sp챕cifier une profondeur sup챕rieure 횪 1 si les journaux de "
+"rustine ont 챕t챕 챕lagu챕s."
#. type: Plain text
#: en/git-archimport.txt:102
#, priority:100
msgid "Attempt to auto-register archives at `http://mirrors.sourcecontrol.net` This is particularly useful with the -D option."
msgstr ""
+"Essayer d'enregistrer automatiquement les archives sur `http://mirrors."
+"sourcecontrol.net`. Ceci est particuli챔rement utile avec l'option -D."
#. type: Labeled list
#: en/git-archimport.txt:103
#, no-wrap, priority:100
msgid "-t <tmpdir>"
-msgstr ""
+msgstr "-t <r챕p-temporaire>"
#. type: Plain text
#: en/git-archimport.txt:105
#, priority:100
msgid "Override the default tempdir."
-msgstr ""
+msgstr "Remplacer le r챕pertoire temporaire par d챕faut."
#. type: Labeled list
#: en/git-archimport.txt:107
#, no-wrap, priority:100
msgid "<archive/branch>"
-msgstr ""
+msgstr "<archive/branche>"
#. type: Plain text
#: en/git-archimport.txt:109
#, priority:100
msgid "Archive/branch identifier in a format that `tla log` understands."
msgstr ""
+"Identificateur de l'archive/branche dans un format compr챕hensible par `tla "
+"log`."
#. type: Title =
#: en/git-archive.txt:2
@@ -7869,18 +7971,33 @@ msgid ""
"\t [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>\n"
"\t [<path>...]\n"
msgstr ""
+"'git archive' [--format=<fmt>] [--list] [--prefix=<pr챕fixe>/] [<extra>]\n"
+"\t [-o <fichier> | --output=<fichier>] [--worktree-attributes]\n"
+"\t [--remote=<d챕p척t> [--exec=<git-upload-archive>]] <arbre-esque>\n"
+"\t [<chemin>...]\n"
#. type: Plain text
#: en/git-archive.txt:23
#, priority:100
msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If <prefix> is specified it is prepended to the filenames in the archive."
msgstr ""
+"Cr챕e une archive du format sp챕cifi챕 contenant l'arborescence de l'arbre "
+"nomm챕, et l'챕crit sur la sortie standard. Si <pr챕fixe> est sp챕cifi챕, il "
+"pr챕fixe le nom des fichiers dans l'archive."
#. type: Plain text
#: en/git-archive.txt:32
#, priority:100
msgid "'git archive' behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as the modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using 'git get-tar-commit-id'. In ZIP files it is stored as a file comment."
msgstr ""
+"'git archive' se comporte diff챕remment lorsqu'on lui donne un ID d'arbre et "
+"lorsqu'on lui donne un ID de commit ou d'챕tiquette. Dans le premier cas, "
+"l'heure actuelle est utilis챕e comme heure de modification de chaque fichier "
+"dans l'archive. Dans le second cas, l'heure de validation enregistr챕e dans "
+"l'objet commit r챕f챕renc챕 est utilis챕e 횪 la place. En outre, l'ID de commit "
+"est stock챕 dans un en-t챗te pax 챕tendu global si le format tar est utilis챕 ; "
+"il peut 챗tre extrait en utilisant 'git get-tar-commit-id'. Dans les fichiers "
+"ZIP, il est stock챕 sous forme de commentaire de fichier."
#. type: Labeled list
#: en/git-archive.txt:36
@@ -7893,6 +8010,10 @@ msgstr "--format=<fmt>"
#, priority:100
msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not given, and the output file is specified, the format is inferred from the filename if possible (e.g. writing to \"foo.zip\" makes the output to be in the zip format). Otherwise the output format is `tar`."
msgstr ""
+"Format de l'archive r챕sultante : 'tar' ou 'zip'. Si cette option n'est pas "
+"donn챕e, et que le fichier de sortie est sp챕cifi챕, le format est d챕duit du "
+"nom du fichier si possible (par exemple, en 챕crivant \"foo.zip\", la sortie "
+"sera au format zip). Sinon, le format de sortie est `tar`."
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
@@ -7904,7 +8025,7 @@ msgstr "--list"
#: en/git-archive.txt:46
#, priority:100
msgid "Show all available formats."
-msgstr ""
+msgstr "Afficher tous les formats disponibles."
#. type: Plain text
#: en/git-archive.txt:50
@@ -7934,7 +8055,7 @@ msgstr "-o <fichier>"
#: en/git-archive.txt:57
#, priority:100
msgid "Write the archive to <file> instead of stdout."
-msgstr ""
+msgstr "Ecrire l'archive dans <fichier> au lieu de stdout."
#. type: Labeled list
#: en/git-archive.txt:58
@@ -7947,6 +8068,10 @@ msgstr "--add-file=<fichier>"
#, priority:100
msgid "Add a non-tracked file to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value for `--prefix` (if any) and the basename of <file>."
msgstr ""
+"Ajouter un fichier non suivi 횪 l'archive. Peut 챗tre r챕p챕t챕 pour ajouter "
+"plusieurs fichiers. Le chemin du fichier dans l'archive est construit en "
+"concat챕nant la valeur de `--prefix` (le cas 챕ch챕ant) et le nom de base de "
+"<fichier>."
#. type: Labeled list
#: en/git-archive.txt:64
@@ -7959,30 +8084,39 @@ msgstr "--worktree-attributes"
#, priority:100
msgid "Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>)."
msgstr ""
+"Rechercher 챕galement les attributs dans les fichiers .gitattributs de "
+"l'arbre de travail (voir <<ATTRIBUTES>>)."
#. type: Labeled list
#: en/git-archive.txt:68
#, no-wrap, priority:100
msgid "<extra>"
-msgstr ""
+msgstr "<extra>"
#. type: Plain text
#: en/git-archive.txt:71
#, priority:100
msgid "This can be any options that the archiver backend understands. See next section."
msgstr ""
+"Il peut s'agir de n'importe quelle option que le moteur de l'archiveur "
+"comprend. Voir la section suivante."
#. type: Labeled list
#: en/git-archive.txt:72
#, no-wrap, priority:100
msgid "--remote=<repo>"
-msgstr ""
+msgstr "--remote=<d챕p척t>"
#. type: Plain text
#: en/git-archive.txt:78
#, priority:100
msgid "Instead of making a tar archive from the local repository, retrieve a tar archive from a remote repository. Note that the remote repository may place restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See linkgit:git-upload-archive[1] for details."
msgstr ""
+"Au lieu de cr챕er une archive tar 횪 partir du d챕p척t local, r챕cup챕rer une "
+"archive tar 횪 partir d'un d챕p척t distant. Notez que le d챕p척t distant peut "
+"imposer des restrictions sur les expressions sha1 qui peuvent 챗tre "
+"autoris챕es dans `<arbre-esque>`. Voir linkgit:git-upload-archive[1] pour "
+"plus de d챕tails."
#. type: Labeled list
#: en/git-archive.txt:79
@@ -7995,6 +8129,8 @@ msgstr "--exec=<git-upload-archive>"
#, priority:100
msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side."
msgstr ""
+"Utilis챕 avec --remote pour sp챕cifier le chemin d'acc챔s 횪 'git-upload-"
+"archive' du c척t챕 distant."
#. type: Labeled list
#: en/git-archive.txt:83 en/git-checkout.txt:354 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
@@ -8006,7 +8142,7 @@ msgstr "<arbre-esque>"
#: en/git-archive.txt:85
#, priority:100
msgid "The tree or commit to produce an archive for."
-msgstr ""
+msgstr "L'arbre ou le commit pour lequel produire une archive ."
#. type: Labeled list
#: en/git-archive.txt:86
@@ -8019,18 +8155,21 @@ msgstr "<chemin>"
#, priority:100
msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included."
msgstr ""
+"Sans param챔tre de chemin optionnel, tous les fichiers et sous-r챕pertoires du "
+"r챕pertoire de travail actuel sont inclus dans l'archive. Si un ou plusieurs "
+"chemins sont sp챕cifi챕s, seuls ceux-ci sont inclus."
#. type: Title -
#: en/git-archive.txt:92
#, no-wrap, priority:100
msgid "BACKEND EXTRA OPTIONS"
-msgstr ""
+msgstr "OPTIONS SUPPL횋MENTAIRES DE MOTEUR"
#. type: Title ~
#: en/git-archive.txt:95
#, no-wrap, priority:100
msgid "zip"
-msgstr ""
+msgstr "zip"
#. type: Labeled list
#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
@@ -8042,7 +8181,7 @@ msgstr "-0"
#: en/git-archive.txt:98
#, priority:100
msgid "Store the files instead of deflating them."
-msgstr ""
+msgstr "Stocker les fichiers au lieu de les compresser."
#. type: Labeled list
#: en/git-archive.txt:98
@@ -8055,78 +8194,106 @@ msgstr "-9"
#, priority:100
msgid "Highest and slowest compression level. You can specify any number from 1 to 9 to adjust compression speed and ratio."
msgstr ""
+"Niveau de compression le plus 챕lev챕 et le plus lent. Vous pouvez sp챕cifier "
+"un nombre quelconque de 1 횪 9 pour ajuster la vitesse et le ratio de "
+"compression."
#. type: Labeled list
#: en/git-archive.txt:106
#, no-wrap, priority:100
msgid "tar.umask"
-msgstr ""
+msgstr "tar.umask"
#. type: Plain text
#: en/git-archive.txt:113
#, priority:100
msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect."
msgstr ""
+"Cette variable peut 챗tre utilis챕e pour limiter les bits de permission des "
+"entr챕es d'archives tar. La valeur par d챕faut est 0002, ce qui d챕sactive le "
+"bit d'챕criture g챕n챕rale. La valeur sp챕ciale \"user\" indique que l'umask de "
+"l'utilisateur d'archivage sera utilis챕 횪 la place. Voir umask(2) pour plus "
+"de d챕tails. Si `--remote` est utilis챕 alors seule la configuration du d챕p척t "
+"distant prend effet."
#. type: Labeled list
#: en/git-archive.txt:114
#, no-wrap, priority:100
msgid "tar.<format>.command"
-msgstr ""
+msgstr "tar.<format>.command"
#. type: Plain text
#: en/git-archive.txt:123
#, priority:100
msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., \"-9\"). An output file with the same extension as `<format>` will be use this format if no other format is given."
msgstr ""
+"Cette variable sp챕cifie une commande shell 횪 travers laquelle la sortie tar "
+"g챕n챕r챕e par `git archive` doit 챗tre envoy챕e. La commande est ex챕cut챕e en "
+"utilisant le shell avec le fichier tar g챕n챕r챕 sur son entr챕e standard, et "
+"devrait produire la sortie finale sur sa sortie standard. Toute option de "
+"niveau de compression sera pass챕e 횪 la commande (par exemple, \"-9\"). Un "
+"fichier de sortie avec la m챗me extension que `<format>` utilisera ce format "
+"si aucun autre format n'est donn챕."
#. type: Plain text
#: en/git-archive.txt:126
#, priority:100
msgid "The \"tar.gz\" and \"tgz\" formats are defined automatically and default to `gzip -cn`. You may override them with custom commands."
msgstr ""
+"Les formats \"tar.gz\" et \"tgz\" sont d챕finis automatiquement et se "
+"pr챕sentent par d챕faut sous la forme `gzip -cn`. Vous pouvez les remplacer "
+"par des commandes personnalis챕es."
#. type: Labeled list
#: en/git-archive.txt:127
#, no-wrap, priority:100
msgid "tar.<format>.remote"
-msgstr ""
+msgstr "tar.<format>.remote"
#. type: Plain text
#: en/git-archive.txt:132
#, priority:100
msgid "If true, enable `<format>` for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the \"tar.gz\" and \"tgz\" formats."
msgstr ""
+"Si vrai, activer `<format>` pour une utilisation par des clients distants "
+"via linkgit:git-upload-archive[1]. Par d챕faut 횪 faux pour les formats "
+"d챕finis par l�셵tilisateur, mais vrai pour les formats 짬혻tar.gz혻쨩 et 짬혻tgz혻쨩."
#. type: Title -
#: en/git-archive.txt:135
#, no-wrap, priority:100
msgid "ATTRIBUTES"
-msgstr ""
+msgstr "ATTRIBUTS"
#. type: Labeled list
#: en/git-archive.txt:137
#, no-wrap, priority:100
msgid "export-ignore"
-msgstr ""
+msgstr "export-ignore"
#. type: Plain text
#: en/git-archive.txt:140
#, priority:100
msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details."
msgstr ""
+"Les fichiers et r챕pertoires avec l'attribut export-ignore ne seront pas "
+"ajout챕s aux fichiers d'archives. Voir linkgit:gitattributes[5] pour plus de "
+"d챕tails."
#. type: Labeled list
#: en/git-archive.txt:141
#, no-wrap, priority:100
msgid "export-subst"
-msgstr ""
+msgstr "export-subst"
#. type: Plain text
#: en/git-archive.txt:145
#, priority:100
msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details."
msgstr ""
+"Si l'attribut export-subst est d챕fini pour un fichier, Git d챕veloppera "
+"plusieurs caract챔res de remplissage lors de l'ajout de ce fichier 횪 une "
+"archive. Voir linkgit:gitattributes[5] pour plus de d챕tails."
#. type: Plain text
#: en/git-archive.txt:153
@@ -45207,7 +45374,13 @@ msgstr "--exclude=<motif-glob>"
#: en/git-rev-parse.txt:193 en/rev-list-options.txt:173
#, priority:260
msgid "Do not include refs matching '<glob-pattern>' that the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. Repetitions of this option accumulate exclusion patterns up to the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options or arguments do not clear accumulated patterns)."
-msgstr "Ne pas inclure les r챕f챕rences correspondant 횪'<glob-pattern>' que les `--all`, `--branches`, `--tags`, `--remotes`, ou `--glob` suivantes consid챕reraient autrement. Les r챕p챕titions de cette option accumulent les motifs d'exclusion jusqu'횪 la prochaine option `--all`, `--branches`, `--tags`, `--tags`, `--remotes` ou `--glob` (les autres options ou arguments n'챕liminent pas les motifs accumul챕s)."
+msgstr ""
+"Ne pas inclure les r챕f챕rences correspondant 횪'<glob-pattern>' que les `--all`"
+", `--branches`, `--tags`, `--remotes`, ou `--glob` suivantes consid챕reraient "
+"autrement. Les r챕p챕titions de cette option accumulent les motifs d'exclusion "
+"jusqu'횪 la prochaine option `--all`, `--branches`, `--tags`, `--remotes` ou "
+"`--glob` (les autres options ou arguments n'챕liminent pas les motifs "
+"accumul챕s)."
#. type: Plain text
#: en/git-rev-parse.txt:199 en/rev-list-options.txt:179
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 2984385a1255f7481f665ca0c5840208dc453831..2965f235d02176e4623d6d744d820da2c0207f1f 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -5,19 +5,20 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-12-16 23:08+0100\n"
-"PO-Revision-Date: 2020-09-27 02:40+0000\n"
-"Last-Translator: 槻筠�筠極 槻筠�筠極棘勻龜� <cranium256@gmail.com>\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
+"PO-Revision-Date: 2020-12-14 06:29+0000\n"
+"Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.4-dev\n"
#. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:679 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
#, ignore-same, no-wrap, priority:280
msgid "-b"
msgstr "-b"
@@ -29,7 +30,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:359 en/git-fsck.txt:38 en/git-rebase.txt:582
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351 en/git-fsck.txt:38 en/git-rebase.txt:582
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -65,242 +66,242 @@ msgid "-L :<funcname>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:17
+#: en/blame-options.txt:16
#, priority:100
-msgid "Annotate only the line range given by '<start>,<end>', or by the function name regex '<funcname>'. May be specified multiple times. Overlapping ranges are allowed."
+msgid "Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:20
+#: en/blame-options.txt:19
#, priority:100
-msgid "'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans from '<start>' to end of file. `-L ,<end>` spans from start of file to '<end>'."
+msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:45 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, ignore-same, no-wrap, priority:300
msgid "-l"
msgstr "-l"
#. type: Plain text
-#: en/blame-options.txt:25
+#: en/blame-options.txt:24
#, priority:100
msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:26 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
+#: en/blame-options.txt:25 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151
#, ignore-same, no-wrap, priority:280
msgid "-t"
msgstr "-t"
#. type: Plain text
-#: en/blame-options.txt:28
+#: en/blame-options.txt:27
#, priority:100
msgid "Show raw timestamp (Default: off)."
msgstr "�棘克逵鈞�勻逵�� 戟筠棘閨�逵閨棘�逵戟戟�筠 勻�筠劇筠戟戟�筠 劇筠�克龜 (�棘 �劇棘剋�逵戟龜�: 棘�克剋��筠戟棘)."
#. type: Labeled list
-#: en/blame-options.txt:29
+#: en/blame-options.txt:28
#, no-wrap, priority:100
msgid "-S <revs-file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:31
+#: en/blame-options.txt:30
#, fuzzy, priority:100
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
msgstr "��極棘剋�鈞棘勻逵�� �筠畇逵克�龜龜 龜鈞 <�逵橘剋逵> 勻劇筠��棘 勻�鈞棘勻逵 git-rev-list"
#. type: Labeled list
-#: en/blame-options.txt:32
+#: en/blame-options.txt:31
#, no-wrap, priority:100
msgid "--reverse <rev>..<rev>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:39
+#: en/blame-options.txt:38
#, priority:100
msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:39 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
#, ignore-same, no-wrap, priority:260
msgid "--first-parent"
msgstr "--first-parent"
#. type: Plain text
-#: en/blame-options.txt:45
+#: en/blame-options.txt:44
#, priority:100
msgid "Follow only the first parent commit upon seeing a merge commit. This option can be used to determine when a line was introduced to a particular integration branch, rather than when it was introduced to the history overall."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:72 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:45 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
#. type: Labeled list
-#: en/blame-options.txt:47 en/git-commit.txt:115 en/git-push.txt:176 en/git-worktree.txt:217
+#: en/blame-options.txt:46 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:216
#, ignore-same, no-wrap, priority:280
msgid "--porcelain"
msgstr "--porcelain"
#. type: Plain text
-#: en/blame-options.txt:49
+#: en/blame-options.txt:48
#, fuzzy, priority:100
msgid "Show in a format designed for machine consumption."
msgstr "�棘克逵鈞逵�� 勻 �棘�劇逵�筠 畇剋� 極�棘均�逵劇劇戟棘均棘 �逵鈞閨棘�逵."
#. type: Labeled list
-#: en/blame-options.txt:50
+#: en/blame-options.txt:49
#, ignore-same, no-wrap, priority:100
msgid "--line-porcelain"
msgstr "--line-porcelain"
#. type: Plain text
-#: en/blame-options.txt:54
+#: en/blame-options.txt:53
#, priority:100
msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:55 en/git-pack-objects.txt:138 en/git-svn.txt:373
+#: en/blame-options.txt:54 en/git-pack-objects.txt:138 en/git-svn.txt:373
#, ignore-same, no-wrap, priority:100
msgid "--incremental"
msgstr "--incremental"
#. type: Plain text
-#: en/blame-options.txt:58
+#: en/blame-options.txt:57
#, priority:100
msgid "Show the result incrementally in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:59 en/git-mailinfo.txt:62 en/pretty-options.txt:35
+#: en/blame-options.txt:58 en/git-mailinfo.txt:62 en/pretty-options.txt:35
#, no-wrap, priority:260
msgid "--encoding=<encoding>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:65
+#: en/blame-options.txt:64
#, priority:100
msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:66
+#: en/blame-options.txt:65
#, no-wrap, priority:100
msgid "--contents <file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:72
+#: en/blame-options.txt:71
#, priority:100
msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:73
+#: en/blame-options.txt:72
#, no-wrap, priority:100
msgid "--date <format>"
msgstr "--date <�棘�劇逵�>"
#. type: Plain text
-#: en/blame-options.txt:79
+#: en/blame-options.txt:78
#, priority:100
msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:80 en/git-fsck.txt:100
+#: en/blame-options.txt:79 en/git-fsck.txt:100
#, ignore-same, no-wrap, priority:100
msgid "--[no-]progress"
msgstr "--[no-]progress"
#. type: Plain text
-#: en/blame-options.txt:86
+#: en/blame-options.txt:85
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:87
+#: en/blame-options.txt:86
#, no-wrap, priority:100
msgid "-M[<num>]"
msgstr "-M[<�龜�剋棘>]"
#. type: Plain text
-#: en/blame-options.txt:97
+#: en/blame-options.txt:96
#, priority:100
msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:102
+#: en/blame-options.txt:101
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:103
+#: en/blame-options.txt:102
#, no-wrap, priority:100
msgid "-C[<num>]"
msgstr "-C[<�龜�剋棘>]"
#. type: Plain text
-#: en/blame-options.txt:112
+#: en/blame-options.txt:111
#, priority:100
msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:119
+#: en/blame-options.txt:118
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will take effect."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:120
+#: en/blame-options.txt:119
#, no-wrap, priority:100
msgid "--ignore-rev <rev>"
msgstr "--ignore-rev <�筠勻龜鈞龜�>"
#. type: Plain text
-#: en/blame-options.txt:131
+#: en/blame-options.txt:130
#, priority:100
msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132
+#: en/blame-options.txt:131
#, fuzzy, no-wrap, priority:100
#| msgid "--ignore-removal"
msgid "--ignore-revs-file <file>"
msgstr "--ignore-removal"
#. type: Plain text
-#: en/blame-options.txt:138
+#: en/blame-options.txt:137
#, priority:100
msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:139 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
+#: en/blame-options.txt:138 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
#. type: Plain text
-#: en/blame-options.txt:140
+#: en/blame-options.txt:139
#, priority:100
msgid "Show help message."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:235
+#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:233
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -2065,7 +2066,7 @@ msgid "Update auxiliary info file to help dumb servers."
msgstr "�閨戟棘勻剋筠戟龜筠 �逵橘剋逵 �棘 勻�極棘劇棘均逵�筠剋�戟棘橘 龜戟�棘�劇逵�龜筠橘 畇剋� 均剋�極�� �筠�勻筠�棘勻"
#. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:275
+#: en/config.txt:2 en/git-worktree.txt:274
#, no-wrap, priority:240
msgid "CONFIGURATION FILE"
msgstr ""
@@ -2133,7 +2134,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:73
#, priority:100
-msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backslash and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim."
+msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backquote and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim."
msgstr ""
#. type: Plain text
@@ -2203,9 +2204,15 @@ msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If
msgstr ""
#. type: Plain text
-#: en/config.txt:125
+#: en/config.txt:124
#, priority:100
-msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the .git file is."
+msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the"
+msgstr ""
+
+#. type: Block title
+#: en/config.txt:124
+#, no-wrap, priority:100
+msgid "git file is."
msgstr ""
#. type: Plain text
@@ -2299,7 +2306,7 @@ msgid "Note that \"../\" is not special and will match literally, which is unlik
msgstr ""
#. type: Title ~
-#: en/config.txt:180 en/git-rev-parse.txt:371 en/git-rev-parse.txt:427
+#: en/config.txt:180 en/git-rev-parse.txt:367 en/git-rev-parse.txt:423
#, no-wrap, priority:100
msgid "Example"
msgstr ""
@@ -2432,109 +2439,109 @@ msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:248
+#: en/config.txt:247
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
-#: en/config.txt:249
+#: en/config.txt:248
#, no-wrap, priority:100
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:252
+#: en/config.txt:250
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
-#: en/config.txt:256
+#: en/config.txt:254
#, priority:100
msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)."
msgstr ""
#. type: Labeled list
-#: en/config.txt:257
+#: en/config.txt:255
#, no-wrap, priority:100
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:261
+#: en/config.txt:259
#, ignore-ellipsis, priority:100
msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
msgstr ""
#. type: Labeled list
-#: en/config.txt:262 en/diff-options.txt:361 en/git-for-each-ref.txt:175
+#: en/config.txt:260 en/diff-options.txt:361 en/git-for-each-ref.txt:175
#, ignore-same, no-wrap, priority:280
msgid "color"
msgstr "color"
#. type: Plain text
-#: en/config.txt:266
+#: en/config.txt:264
#, priority:100
msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces."
msgstr ""
#. type: Plain text
-#: en/config.txt:272
+#: en/config.txt:270
#, priority:100
-msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:277
+#: en/config.txt:275
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
-#: en/config.txt:284
+#: en/config.txt:282
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
-#: en/config.txt:287
+#: en/config.txt:285
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
-#: en/config.txt:296
+#: en/config.txt:294
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
-#: en/config.txt:297
+#: en/config.txt:295
#, no-wrap, priority:100
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:303
+#: en/config.txt:301
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
-#: en/config.txt:306
+#: en/config.txt:304
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:311
+#: en/config.txt:309
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
-#: en/config.txt:316
+#: en/config.txt:314
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
@@ -3086,7 +3093,7 @@ msgid ":100644 100644 5be4a4a 0000000 M file.c\n"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:85 en/git-ls-files.txt:213 en/git-ls-tree.txt:102
+#: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
#, priority:280
msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
msgstr ""
@@ -3598,7 +3605,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:84
+#: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:93
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3610,13 +3617,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:73 en/git-restore.txt:49 en/git-stash.txt:184
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:269 en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -3634,7 +3641,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67 en/git-diff-tree.txt:77 en/git-format-patch.txt:121 en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
+#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67 en/git-commit.txt:166 en/git-diff-tree.txt:72 en/git-format-patch.txt:120 en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
#, ignore-same, no-wrap, priority:300
msgid "-s"
msgstr "-s"
@@ -3666,13 +3673,13 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:40
#, priority:280
-msgid "Generate diffs with <n> lines of context instead of the usual three."
+msgid "Generate diffs with <n> lines of context instead of the usual three. Implies `--patch`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:42 en/diff-options.txt:447
+#: en/diff-options.txt:42
#, no-wrap, priority:280
-msgid "\tImplies `--patch`.\n"
+msgid "\tImplies `-p`.\n"
msgstr ""
#. type: Labeled list
@@ -4059,7 +4066,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:131
+#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:140
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
@@ -4083,7 +4090,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:124 en/git-config.txt:215 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
@@ -4115,7 +4122,7 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:244 en/git-config.txt:224 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:244 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
@@ -4234,7 +4241,7 @@ msgid "Moved lines are not highlighted."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:291 en/git-commit.txt:206
+#: en/diff-options.txt:291 en/git-commit.txt:212
#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
@@ -4342,7 +4349,7 @@ msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"
#. type: Plain text
-#: en/diff-options.txt:335 en/diff-options.txt:678
+#: en/diff-options.txt:335 en/diff-options.txt:674
#, priority:280
msgid "Ignore changes in whitespace at EOL."
msgstr ""
@@ -4354,7 +4361,7 @@ msgid "ignore-space-change"
msgstr "ignore-space-change"
#. type: Plain text
-#: en/diff-options.txt:339 en/diff-options.txt:684
+#: en/diff-options.txt:339 en/diff-options.txt:680
#, priority:280
msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr ""
@@ -4560,71 +4567,71 @@ msgstr "--binary"
#. type: Plain text
#: en/diff-options.txt:445
#, priority:280
-msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`."
+msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:449 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
+#: en/diff-options.txt:446 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
#, no-wrap, priority:280
msgid "--abbrev[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:458
+#: en/diff-options.txt:454
#, priority:280
-msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=<n>`."
+msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:459
+#: en/diff-options.txt:455
#, no-wrap, priority:280
msgid "-B[<n>][/<m>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:460
+#: en/diff-options.txt:456
#, no-wrap, priority:280
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:463
+#: en/diff-options.txt:459
#, priority:280
msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:473
+#: en/diff-options.txt:469
#, priority:280
msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:481
+#: en/diff-options.txt:477
#, priority:280
msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:482
+#: en/diff-options.txt:478
#, no-wrap, priority:280
msgid "-M[<n>]"
msgstr "-M[<�龜�剋棘>]"
#. type: Labeled list
-#: en/diff-options.txt:483 en/git-status.txt:147
+#: en/diff-options.txt:479 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:486
+#: en/diff-options.txt:482
#, no-wrap, priority:280
msgid "\tDetect renames.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:491
+#: en/diff-options.txt:487
#, no-wrap, priority:280
msgid ""
"\tIf generating diffs, detect and report renames for each commit.\n"
@@ -4633,7 +4640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:501
+#: en/diff-options.txt:497
#, no-wrap, priority:280
msgid ""
"\tIf `n` is specified, it is a threshold on the similarity\n"
@@ -4648,139 +4655,139 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:502
+#: en/diff-options.txt:498
#, no-wrap, priority:280
msgid "-C[<n>]"
msgstr "-C[<�龜�剋棘>]"
#. type: Labeled list
-#: en/diff-options.txt:503
+#: en/diff-options.txt:499
#, no-wrap, priority:280
msgid "--find-copies[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:506
+#: en/diff-options.txt:502
#, priority:280
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:507 en/git-svn.txt:626
+#: en/diff-options.txt:503 en/git-svn.txt:626
#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
#. type: Plain text
-#: en/diff-options.txt:515
+#: en/diff-options.txt:511
#, priority:280
msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:516 en/git-branch.txt:103 en/git-http-push.txt:45
+#: en/diff-options.txt:512 en/git-branch.txt:103 en/git-http-push.txt:45
#, no-wrap, priority:280
msgid "-D"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:517
+#: en/diff-options.txt:513
#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
#. type: Plain text
-#: en/diff-options.txt:525
+#: en/diff-options.txt:521
#, priority:280
msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:528
+#: en/diff-options.txt:524
#, priority:280
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:529 en/git-svn.txt:625
+#: en/diff-options.txt:525 en/git-svn.txt:625
#, no-wrap, priority:280
msgid "-l<num>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:535
+#: en/diff-options.txt:531
#, priority:280
msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:537
+#: en/diff-options.txt:533
#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:548
+#: en/diff-options.txt:544
#, ignore-ellipsis, priority:280
msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:551
+#: en/diff-options.txt:547
#, priority:280
msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:557
+#: en/diff-options.txt:553
#, priority:280
msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:558
+#: en/diff-options.txt:554
#, no-wrap, priority:280
msgid "-S<string>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:562
+#: en/diff-options.txt:558
#, priority:280
msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:568
+#: en/diff-options.txt:564
#, priority:280
msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:570
+#: en/diff-options.txt:566
#, priority:280
msgid "Binary files are searched as well."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:571
+#: en/diff-options.txt:567
#, no-wrap, priority:280
msgid "-G<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:574
+#: en/diff-options.txt:570
#, priority:280
msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:578
+#: en/diff-options.txt:574
#, priority:280
msgid "To illustrate the difference between `-S<regex> --pickaxe-regex` and `-G<regex>`, consider a commit with the following diff in the same file:"
msgstr ""
#. type: delimited block -
-#: en/diff-options.txt:583
+#: en/diff-options.txt:579
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -4789,410 +4796,391 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:588
+#: en/diff-options.txt:584
#, priority:280
msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:591
+#: en/diff-options.txt:587
#, priority:280
msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:594
+#: en/diff-options.txt:590
#, priority:280
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:595
+#: en/diff-options.txt:591
#, no-wrap, priority:280
msgid "--find-object=<object-id>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:600
+#: en/diff-options.txt:596
#, priority:280
msgid "Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific object id."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:603
+#: en/diff-options.txt:599
#, priority:280
msgid "The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:604
+#: en/diff-options.txt:600
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
#. type: Plain text
-#: en/diff-options.txt:608
+#: en/diff-options.txt:604
#, priority:280
msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:609
+#: en/diff-options.txt:605
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
#. type: Plain text
-#: en/diff-options.txt:612
+#: en/diff-options.txt:608
#, priority:280
msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:615 en/git-mergetool.txt:95
+#: en/diff-options.txt:611 en/git-mergetool.txt:95
#, no-wrap, priority:280
msgid "-O<orderfile>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:620
+#: en/diff-options.txt:616
#, priority:280
msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:632
+#: en/diff-options.txt:628
#, priority:280
msgid "The output order is determined by the order of glob patterns in <orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:634
+#: en/diff-options.txt:630
#, priority:280
msgid "<orderfile> is parsed as follows:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:638
+#: en/diff-options.txt:634
#, priority:280
msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:642
+#: en/diff-options.txt:638
#, priority:280
msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:644
+#: en/diff-options.txt:640
#, priority:280
msgid "Each other line contains a single pattern."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:651
+#: en/diff-options.txt:647
#, priority:280
msgid "Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:653 en/git-apply.txt:104 en/git-cvsimport.txt:168
+#: en/diff-options.txt:649 en/git-apply.txt:104 en/git-cvsimport.txt:168
#, no-wrap, priority:280
msgid "-R"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:656
+#: en/diff-options.txt:652
#, priority:280
msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:658
+#: en/diff-options.txt:654
#, no-wrap, priority:280
msgid "--relative[=<path>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:659
+#: en/diff-options.txt:655
#, ignore-same, no-wrap, priority:280
msgid "--no-relative"
msgstr "--no-relative"
#. type: Plain text
-#: en/diff-options.txt:668
+#: en/diff-options.txt:664
#, priority:280
msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument. `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:669 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:66 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:665 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:670 en/git-grep.txt:103
+#: en/diff-options.txt:666 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
#. type: Plain text
-#: en/diff-options.txt:672
+#: en/diff-options.txt:668
#, priority:280
msgid "Treat all files as text."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:669
#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
#. type: Plain text
-#: en/diff-options.txt:675
+#: en/diff-options.txt:671
#, priority:280
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:676
+#: en/diff-options.txt:672
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
-#: en/diff-options.txt:680 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:676 en/git-am.txt:107 en/git-apply.txt:182
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:685 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:681 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
msgid "-w"
msgstr "-w"
#. type: Labeled list
-#: en/diff-options.txt:686
+#: en/diff-options.txt:682
#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
#. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:686
#, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:691
+#: en/diff-options.txt:687
#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
#. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:689
#, priority:280
msgid "Ignore changes whose lines are all blank."
msgstr "�均戟棘�龜�棘勻逵�� 龜鈞劇筠戟筠戟龜�, 勻 克棘�棘��� 勻�筠 ���棘克龜 極����筠."
#. type: Labeled list
-#: en/diff-options.txt:694
-#, no-wrap, priority:280
-msgid "-I<regex>"
-msgstr ""
-
-#. type: Labeled list
-#: en/diff-options.txt:695
-#, fuzzy, no-wrap, priority:280
-#| msgid "--ignore-blank-lines"
-msgid "--ignore-matching-lines=<regex>"
-msgstr "--ignore-blank-lines"
-
-#. type: Plain text
-#: en/diff-options.txt:698
-#, priority:280
-msgid "Ignore changes whose all lines match <regex>. This option may be specified more than once."
-msgstr ""
-
-#. type: Labeled list
-#: en/diff-options.txt:699
+#: en/diff-options.txt:690
#, no-wrap, priority:280
msgid "--inter-hunk-context=<lines>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:704
+#: en/diff-options.txt:695
#, priority:280
msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:705 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:58
+#: en/diff-options.txt:696 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
#, no-wrap, priority:280
msgid "-W"
msgstr "-W"
#. type: Labeled list
-#: en/diff-options.txt:706 en/git-grep.txt:265
+#: en/diff-options.txt:697 en/git-grep.txt:265
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
#. type: Plain text
-#: en/diff-options.txt:711
+#: en/diff-options.txt:699
#, priority:280
-msgid "Show whole function as context lines for each change. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
+msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:714 en/git-ls-remote.txt:48
+#: en/diff-options.txt:702 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
msgstr "--exit-code"
#. type: Plain text
-#: en/diff-options.txt:718
+#: en/diff-options.txt:706
#, priority:280
msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:719 en/fetch-options.txt:238 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:324 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:339 en/git-gc.txt:68 en/git-grep.txt:318 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:223 en/merge-options.txt:138 en/rev-list-options.txt:219
+#: en/diff-options.txt:707 en/fetch-options.txt:238 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:222 en/merge-options.txt:147 en/rev-list-options.txt:219
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
#. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:709
#, priority:280
msgid "Disable all output of the program. Implies `--exit-code`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:724
+#: en/diff-options.txt:712
#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
msgstr "--ext-diff"
#. type: Plain text
-#: en/diff-options.txt:728
+#: en/diff-options.txt:716
#, priority:280
msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:729
+#: en/diff-options.txt:717
#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
#. type: Plain text
-#: en/diff-options.txt:731
+#: en/diff-options.txt:719
#, priority:280
msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:732 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:720 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:733 en/git-grep.txt:109
+#: en/diff-options.txt:721 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
#. type: Plain text
-#: en/diff-options.txt:742
+#: en/diff-options.txt:730
#, priority:280
msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:743 en/git-status.txt:87
+#: en/diff-options.txt:731 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:755
+#: en/diff-options.txt:743
#, priority:280
msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:756
+#: en/diff-options.txt:744
#, no-wrap, priority:280
msgid "--src-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:758
+#: en/diff-options.txt:746
#, priority:280
msgid "Show the given source prefix instead of \"a/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:759
+#: en/diff-options.txt:747
#, no-wrap, priority:280
msgid "--dst-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:761
+#: en/diff-options.txt:749
#, priority:280
msgid "Show the given destination prefix instead of \"b/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:762
+#: en/diff-options.txt:750
#, ignore-same, no-wrap, priority:280
msgid "--no-prefix"
msgstr "--no-prefix"
#. type: Plain text
-#: en/diff-options.txt:764
+#: en/diff-options.txt:752
#, priority:280
msgid "Do not show any source or destination prefix."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:765
+#: en/diff-options.txt:753
#, no-wrap, priority:280
msgid "--line-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:767
+#: en/diff-options.txt:755
#, priority:280
msgid "Prepend an additional prefix to every line of output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:768
+#: en/diff-options.txt:756
#, ignore-same, no-wrap, priority:280
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
#. type: Plain text
-#: en/diff-options.txt:775
+#: en/diff-options.txt:763
#, priority:280
msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:777
+#: en/diff-options.txt:765
#, priority:280
msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:67 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5240,7 +5228,7 @@ msgid "Similar to --depth, except it specifies the number of commits from the cu
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:22 en/git-clone.txt:233 en/git-fetch-pack.txt:90
+#: en/fetch-options.txt:22 en/git-clone.txt:232 en/git-fetch-pack.txt:90
#, no-wrap, priority:300
msgid "--shallow-since=<date>"
msgstr "--shallow-since=<畇逵�逵>"
@@ -5252,7 +5240,7 @@ msgid "Deepen or shorten the history of a shallow repository to include all reac
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:26 en/git-clone.txt:236 en/git-fetch-pack.txt:94
+#: en/fetch-options.txt:26 en/git-clone.txt:235 en/git-fetch-pack.txt:94
#, no-wrap, priority:300
msgid "--shallow-exclude=<revision>"
msgstr "--shallow-exclude=<�筠勻龜鈞龜�>"
@@ -5324,7 +5312,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:327 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:213
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:212
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5348,13 +5336,13 @@ msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly u
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:76 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:154
+#: en/fetch-options.txt:76 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:153
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:77 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:333 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:155
+#: en/fetch-options.txt:77 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:154
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
@@ -5386,7 +5374,7 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:116 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
+#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
@@ -5482,13 +5470,13 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:138 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:169 en/git-format-patch.txt:101 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:212 en/merge-options.txt:83
+#: en/fetch-options.txt:138 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:211 en/merge-options.txt:92
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
#. type: Labeled list
-#: en/fetch-options.txt:140 en/git-clone.txt:251
+#: en/fetch-options.txt:140 en/git-clone.txt:250
#, ignore-same, no-wrap, priority:300
msgid "--no-tags"
msgstr "--no-tags"
@@ -5566,7 +5554,7 @@ msgid "Typically, parallel recursive and multi-remote fetches will be faster. By
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:194 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
+#: en/fetch-options.txt:194 en/git-checkout.txt:295 en/git-push.txt:377 en/git-restore.txt:108 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -5578,7 +5566,7 @@ msgid "Disable recursive fetching of submodules (this has the same effect as usi
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:199 en/git-branch.txt:227 en/git-push.txt:373
+#: en/fetch-options.txt:199 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -5626,7 +5614,7 @@ msgid "By default 'git fetch' refuses to update the head which corresponds to th
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:230 en/git-clone.txt:200
+#: en/fetch-options.txt:230 en/git-clone.txt:199
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <極���>"
@@ -5638,7 +5626,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:323 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:338 en/git-grep.txt:317 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:222 en/merge-options.txt:137
+#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:221 en/merge-options.txt:146
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
@@ -5650,31 +5638,31 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:308 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:391 en/git-read-tree.txt:63 en/git-rebase.txt:401 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:226 en/merge-options.txt:141
+#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:401 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:225 en/merge-options.txt:150
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:309 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:392 en/git-rebase.txt:402 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:227 en/merge-options.txt:142
+#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:402 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:226 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
+#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:153
#, priority:300
msgid "Be verbose."
msgstr "���� 劇戟棘均棘�剋棘勻戟筠筠."
#. type: Labeled list
-#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:366 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
+#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:400
+#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
@@ -5696,6 +5684,12 @@ msgstr "--server-option=<棘極�龜�>"
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
+"�筠�筠畇逵�� 畇逵戟戟�� ���棘克� 戟逵 �筠�勻筠� 極�龜 棘閨劇筠戟筠 畇逵戟戟�劇龜 極棘 極�棘�棘克棘剋� 勻筠��龜龜 2. "
+"�逵戟戟逵� ���棘克逵 戟筠 畇棘剋菌戟逵 �棘畇筠�菌逵�� �龜劇勻棘剋� NUL 龜剋龜 LF. 龜棘 克逵克 �筠�勻筠� 閨�畇筠� "
+"棘閨�逵閨逵��勻逵�� ��龜 棘極�龜龜, 勻 �棘劇 �龜�剋筠 戟筠龜鈞勻筠��戟�筠, 鈞逵勻龜�龜� �棘剋�克棘 棘� �筠�勻筠�逵. "
+"��剋龜 極逵�逵劇筠�� `--server-option = <option>` �克逵鈞逵戟 戟筠�克棘剋�克棘 �逵鈞, �棘 勻�筠 ��龜 "
+"���棘克龜 棘�極�逵勻剋����� 畇��均棘橘 ��棘�棘戟筠 勻 �棘劇 極棘��畇克筠, 勻 克棘�棘�棘劇 棘戟龜 �克逵鈞逵戟戟棘劇 勻 "
+"克棘劇逵戟畇戟棘橘 ���棘克筠."
#. type: Labeled list
#: en/fetch-options.txt:263
@@ -5722,37 +5716,37 @@ msgid "By default, git checks if a branch is force-updated during fetch. Pass --
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:276 en/git-push.txt:422
+#: en/fetch-options.txt:276 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:277 en/git-push.txt:423
+#: en/fetch-options.txt:277 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:279 en/git-push.txt:425
+#: en/fetch-options.txt:279 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv4 畇�筠�逵, 龜均戟棘�龜��� IPv6 逵畇�筠�逵."
#. type: Labeled list
-#: en/fetch-options.txt:280 en/git-push.txt:426
+#: en/fetch-options.txt:280 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:281 en/git-push.txt:427
+#: en/fetch-options.txt:281 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:282 en/git-push.txt:429
+#: en/fetch-options.txt:282 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr "��極棘剋�鈞棘勻逵�� �棘剋�克棘 IPv6 逵畇�筠�逵, 龜均戟棘�龜��� 逵畇�筠�逵 IPv4."
@@ -5798,7 +5792,7 @@ msgstr ""
"\t [--] [<�極筠�龜�龜克逵�棘�-極��龜>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 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:28 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 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:20 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:61 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:15 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:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 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:19 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-parse-remote.txt:15 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-read-tree.txt:19 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:17 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
+#: en/git-add.txt:18 en/git-am.txt:22 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:28 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 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:20 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:61 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:36 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:15 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:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 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:19 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-parse-remote.txt:15 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-read-tree.txt:19 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:17 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
msgid "DESCRIPTION"
msgstr "���鬼����"
@@ -5808,18 +5802,34 @@ msgstr "���鬼����"
#, priority:300
msgid "This command updates the index using the current content found in the working tree, to prepare the content staged for the next commit. It typically adds the current content of existing paths as a whole, but with some options it can also be used to add content with only part of the changes made to the working tree files applied, or remove paths that do not exist in the working tree anymore."
msgstr ""
+"葵�逵 克棘劇逵戟畇逵 棘閨戟棘勻剋�筠� 龜戟畇筠克�, 棘�戟棘勻�勻逵��� 戟逵 �筠克��筠劇 �棘畇筠�菌龜劇棘劇 �逵閨棘�筠均棘 "
+"克逵�逵剋棘均逵, ��棘閨� 極棘畇均棘�棘勻龜�� �極龜�棘克 龜鈞劇筠戟筠戟龜橘 畇剋� �剋筠畇���筠均棘 克棘劇劇龜�逵. �閨��戟棘 "
+"棘戟逵 畇棘閨逵勻剋�筠� �筠克��筠筠 �棘畇筠�菌龜劇棘筠 ���筠��勻���龜� �逵橘剋棘勻 克逵克 筠畇龜戟棘筠 �筠剋棘筠, 戟棘 "
+"極�龜 極�龜劇筠戟筠戟龜龜 棘極�筠畇筠剋�戟戟�� 極逵�逵劇筠��棘勻 筠� �逵克菌筠 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� 畇剋� "
+"龜戟畇筠克�龜�棘勻逵戟龜� �棘剋�克棘 �逵��龜 龜鈞劇筠戟筠戟龜橘, 龜劇筠��龜��� 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠, 龜剋龜 "
+"�畇逵剋筠戟龜� 極��筠橘, 克棘�棘��筠 閨棘剋筠筠 戟筠 ���筠��勻��� 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠."
#. type: Plain text
#: en/git-add.txt:31
#, priority:300
msgid "The \"index\" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit. Thus after making any changes to the working tree, and before running the commit command, you must use the `add` command to add any new or modified files to the index."
msgstr ""
+"龜逵克 戟逵鈞�勻逵筠劇�橘 짬龜戟畇筠克�쨩 �棘畇筠�菌龜� �戟龜劇棘克 �棘畇筠�菌龜劇棘均棘 �逵閨棘�筠均棘 克逵�逵剋棘均逵, 龜 "
+"龜劇筠戟戟棘 ��棘� �戟龜劇棘克 龜�極棘剋�鈞�筠��� 勻 克逵�筠��勻筠 �棘畇筠�菌龜劇棘均棘 極棘�剋筠畇���筠均棘 克棘劇劇龜�逵. "
+"龜逵克龜劇 棘閨�逵鈞棘劇, 極棘�剋筠 勻戟筠�筠戟龜� 剋�閨�� 龜鈞劇筠戟筠戟龜橘 勻 �逵閨棘�龜橘 克逵�逵剋棘均 龜 極筠�筠畇 "
+"鈞逵極��克棘劇 克棘劇逵戟畇� commit 勻� 畇棘剋菌戟� 畇棘閨逵勻龜�� 剋�閨�筠 戟棘勻�筠 龜剋龜 龜鈞劇筠戟�戟戟�筠 �逵橘剋� "
+"勻 龜戟畇筠克� � 極棘劇棘��� 克棘劇逵戟畇� `add`."
#. type: Plain text
#: en/git-add.txt:36
#, priority:300
msgid "This command can be performed multiple times before a commit. It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then you must run `git add` again to add the new content to the index."
msgstr ""
+"葵�� 克棘劇逵戟畇� 劇棘菌戟棘 勻�極棘剋戟龜�� 戟筠�克棘剋�克棘 �逵鈞 極筠�筠畇 克棘劇劇龜�棘劇. �筠極棘��筠畇��勻筠戟戟棘 勻棘 "
+"勻�筠劇� 勻�極棘剋戟筠戟龜� ��逵 克棘劇逵戟畇� �棘剋�克棘 畇棘閨逵勻剋�筠� �棘畇筠�菌龜劇棘筠 �克逵鈞逵戟戟棘均棘 �逵橘剋逵 "
+"(棘勻); 筠�剋龜 勻� �棘�龜�筠, ��棘閨� 龜鈞劇筠戟筠戟龜�, �畇筠剋逵戟戟�筠 極棘�剋筠 鈞逵極��克逵 棘戟棘橘, 閨�剋龜 "
+"勻克剋��筠戟� 勻 �剋筠畇���龜橘 克棘劇劇龜�, 勻� 畇棘剋菌戟� 鈞逵極���龜�� `git add` 筠�� �逵鈞, ��棘閨� "
+"畇棘閨逵勻龜�� 戟棘勻棘筠 �棘畇筠�菌龜劇棘筠 勻 龜戟畇筠克�."
#. type: Plain text
#: en/git-add.txt:39
@@ -5832,6 +5842,14 @@ msgstr "�棘劇逵戟畇逵 `git status` 劇棘菌筠� 閨��� 龜�極棘剋�鈞棘勻逵戟逵
#, priority:300
msgid "The `git add` command will not add ignored files by default. If any ignored files were explicitly specified on the command line, `git add` will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The 'git add' command can be used to add ignored files with the `-f` (force) option."
msgstr ""
+"�棘劇逵戟畇逵 `git add` 極棘 �劇棘剋�逵戟龜� 戟筠 畇棘閨逵勻剋�筠� 龜均戟棘�龜��筠劇�筠 �逵橘剋�. ��剋龜 克逵克龜筠-"
+"剋龜閨棘 龜均戟棘�龜��筠劇�筠 �逵橘剋� 閨�剋龜 �勻戟棘 �克逵鈞逵戟� 勻 克棘劇逵戟畇戟棘橘 ���棘克筠, `git add` "
+"鈞逵勻筠��龜��� 棘�龜閨克棘橘 �棘 �極龜�克棘劇 龜均戟棘�龜��筠劇�� �逵橘剋棘勻. �均戟棘�龜��筠劇�筠 �逵橘剋�, "
+"戟逵橘畇筠戟戟�筠 勻 �筠鈞�剋��逵�筠 �筠克���龜勻戟棘均棘 棘閨�棘畇逵 克逵�逵剋棘均棘勻 龜剋龜 極棘畇��逵戟棘勻克龜 "
+"�逵閨剋棘戟棘勻 龜劇�戟 (globbing), 克棘�棘��筠 勻�極棘剋戟�筠� �逵劇 Git (鈞逵克剋��龜�筠 �逵閨剋棘戟 勻 "
+"克逵勻��克龜, ��棘閨� 棘戟 戟筠 棘閨�逵閨逵��勻逵剋�� 棘閨棘剋棘�克棘橘), 閨�畇�� 極�棘龜均戟棘�龜�棘勻逵戟� 閨筠鈞 "
+"勻�勻棘畇逵 畇棘極棘剋戟龜�筠剋�戟�� �勻筠畇棘劇剋筠戟龜橘. �逵��逵勻龜�� 克棘劇逵戟畇� `git add` 棘閨�逵閨逵��勻逵�� "
+"龜均戟棘�龜��筠劇�筠 �逵橘剋� 劇棘菌戟棘 � 極棘劇棘��� 極逵�逵劇筠��逵 `-f` (force, 極�龜戟�畇龜�筠剋�戟棘)."
#. type: Plain text
#: en/git-add.txt:49
@@ -5840,13 +5858,13 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
msgstr "�棘 ���剋克筠 linkgit:git-commit[1] 畇棘���極戟� 逵剋��筠�戟逵�龜勻戟�筠 極��龜 畇棘閨逵勻剋筠戟龜� �逵橘剋棘勻 勻 克棘劇劇龜�."
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:65 en/git-config.txt:75 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:116 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:89 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:152 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:108 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:151 en/git-write-tree.txt:29
#, no-wrap, priority:300
msgid "OPTIONS"
msgstr "������龜�竅"
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:355 en/git-grep.txt:330 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:358 en/git-commit.txt:361 en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<�極筠�龜�龜克逵�棘�-極��龜>��"
@@ -5858,7 +5876,7 @@ msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add al
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:336
+#: en/git-add.txt:68 en/git-grep.txt:334
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "�棘剋筠筠 畇筠�逵剋�戟棘 �龜戟�逵克�龜� <�極筠�龜�龜克逵�棘�逵-極��龜> �逵��劇逵��龜勻逵筠��� 勻 �逵鈞畇筠剋筠 'pathspec' 勻 linkgit:gitglossary[7]."
@@ -5876,7 +5894,7 @@ msgid "Allow adding otherwise ignored files."
msgstr "�逵鈞�筠�龜�� 畇棘閨逵勻剋筠戟龜筠 �逵橘剋棘勻, 克棘�棘��筠 龜戟逵�筠 閨�剋龜 閨� 極�棘龜均戟棘�龜�棘勻逵戟�."
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:255 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
@@ -5906,13 +5924,13 @@ msgid "This effectively runs `add --interactive`, but bypasses the initial comma
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:214 en/git-config.txt:261 en/git-grep.txt:297 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:295 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, ignore-same, no-wrap, priority:300
msgid "-e"
msgstr "-e"
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:215 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, ignore-same, no-wrap, priority:300
msgid "--edit"
msgstr "--edit"
@@ -5996,7 +6014,7 @@ msgid "This option is primarily to help users who are used to older versions of
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:147 en/git-format-patch.txt:105 en/git-submodule.txt:351
+#: en/git-add.txt:147 en/git-format-patch.txt:104 en/git-submodule.txt:351
#, no-wrap, priority:300
msgid "-N"
msgstr "-N"
@@ -6086,31 +6104,31 @@ msgid "Override the executable bit of the added files. The executable bit is on
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:276 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:78 en/git-stash.txt:198
+#: en/git-add.txt:191 en/git-checkout.txt:312 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr "--pathspec-from-file=<�逵橘剋>"
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:283 en/git-reset.txt:119 en/git-restore.txt:136 en/git-rm.txt:85 en/git-stash.txt:207
+#: en/git-add.txt:198 en/git-checkout.txt:319 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:284 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:86 en/git-stash.txt:208
+#: en/git-add.txt:199 en/git-checkout.txt:320 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
#, ignore-same, no-wrap, priority:300
msgid "--pathspec-file-nul"
msgstr "--pathspec-file-nul"
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:288 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:90 en/git-stash.txt:214
+#: en/git-add.txt:203 en/git-checkout.txt:324 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:352 en/git-grep.txt:326 en/git-ls-files.txt:183 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:355 en/git-commit.txt:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
@@ -6122,7 +6140,7 @@ msgid "This option can be used to separate command-line options from the list of
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:316 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:352 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294 en/git-format-patch.txt:677 en/git-grep.txt:338 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:156 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:594 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-parse.txt:442 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:394
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:306 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:511 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:135 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:169 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:393
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "������竅"
@@ -6486,7 +6504,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 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:531 en/git-difftool.txt:137 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:246 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1001 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:597 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:537 en/git-difftool.txt:137 en/git-diff.txt:205 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:386 en/git.txt:1001 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr "鬼��龜�� 龜����"
@@ -6498,13 +6516,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 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:354 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:508 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:148 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:419 en/git-format-patch.txt:726 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 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:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:275 en/git-ls-files.txt:250 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 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:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:467 en/git-rm.txt:195 en/git-send-email.txt:525 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:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 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:420 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:602 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:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:215 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:419 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:288 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 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:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:178 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 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:419 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap, priority:300
msgid "GIT"
msgstr "GIT"
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 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:355 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:509 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:149 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:727 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 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:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:276 en/git-ls-files.txt:251 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 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:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:468 en/git-rm.txt:196 en/git-send-email.txt:526 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:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 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:421 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:603 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:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:216 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:289 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 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:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:179 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 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:420 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr "赳勻剋�筠��� �逵���� 極逵克筠�逵 linkgit:git[1]"
@@ -6571,15 +6589,15 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101
-#, ignore-same, no-wrap, priority:100
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:498 en/git-revert.txt:101 en/merge-options.txt:80
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
#. type: Plain text
-#: en/git-am.txt:39 en/git-format-patch.txt:126
+#: en/git-am.txt:39
#, priority:100
-msgid "Add a `Signed-off-by` trailer to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
+msgid "Add a `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Plain text
@@ -6613,7 +6631,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:117 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:130 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6643,7 +6661,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:137 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:150 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6861,25 +6879,25 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:343 en/git-rebase.txt:388 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:388 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:344 en/git-rebase.txt:389 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:389 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:345 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64
+#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:351 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
#. type: Plain text
-#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:351 en/git-rebase.txt:396 en/git-revert.txt:99
+#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:396 en/git-revert.txt:99
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
msgstr ""
@@ -6958,7 +6976,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts. If `raw
msgstr ""
#. type: Title -
-#: en/git-am.txt:189 en/git-commit.txt:495 en/git-format-patch.txt:394 en/git-fsck.txt:113 en/git-log.txt:213 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:378 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
+#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:226 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:378 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -7042,7 +7060,7 @@ msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the curren
msgstr ""
#. type: Title -
-#: en/git-am.txt:239 en/git-commit.txt:515 en/git-gc.txt:146
+#: en/git-am.txt:239 en/git-commit.txt:521 en/git-gc.txt:146
#, no-wrap, priority:280
msgid "HOOKS"
msgstr ""
@@ -7140,7 +7158,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:82
+#: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:91
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7470,7 +7488,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:218 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:300 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:231 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr "���圭��叫��揆�赳"
@@ -7640,7 +7658,7 @@ msgid "Use the fast patchset import strategy. This can be significantly faster
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:262 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, ignore-same, no-wrap, priority:280
msgid "-o"
msgstr "-o"
@@ -7740,7 +7758,7 @@ msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not gi
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
#, ignore-same, no-wrap, priority:240
msgid "--list"
msgstr "--list"
@@ -7843,7 +7861,7 @@ msgid "Used with --remote to specify the path to the 'git-upload-archive' on the
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:83 en/git-checkout.txt:354 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
+#: en/git-archive.txt:83 en/git-checkout.txt:351 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
#, fuzzy, no-wrap, priority:240
msgid "<tree-ish>"
msgstr "�克逵鈞逵�筠剋�-畇筠�筠勻逵"
@@ -7879,7 +7897,7 @@ msgid "zip"
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:121
#, ignore-same, no-wrap, priority:280
msgid "-0"
msgstr "-0"
@@ -8992,91 +9010,91 @@ msgid "Ignore whitespace when comparing the parent's version and the child's to
msgstr ""
#. type: Labeled list
-#: en/git-blame.txt:88 en/git-branch.txt:197 en/git-describe.txt:65
+#: en/git-blame.txt:88 en/git-describe.txt:65
#, no-wrap, priority:260
msgid "--abbrev=<n>"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:94
+#: en/git-blame.txt:92
#, priority:100
-msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <m>+1 digits, where <m> is at least <n> but ensures the commit object names are unique. Note that 1 column is used for a caret to mark the boundary commit."
+msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <n>+1 digits. Note that 1 column is used for a caret to mark the boundary commit."
msgstr ""
#. type: Title -
-#: en/git-blame.txt:97
+#: en/git-blame.txt:95
#, no-wrap, priority:100
msgid "THE PORCELAIN FORMAT"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:101
+#: en/git-blame.txt:99
#, priority:100
msgid "In this format, each line is output after a header; the header at the minimum has the first line which has:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:103
+#: en/git-blame.txt:101
#, priority:100
msgid "40-byte SHA-1 of the commit the line is attributed to;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:104
+#: en/git-blame.txt:102
#, priority:100
msgid "the line number of the line in the original file;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:105
+#: en/git-blame.txt:103
#, priority:100
msgid "the line number of the line in the final file;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:108
+#: en/git-blame.txt:106
#, priority:100
msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:111
+#: en/git-blame.txt:109
#, priority:100
msgid "This header line is followed by the following information at least once for each commit:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:115
+#: en/git-blame.txt:113
#, priority:100
msgid "the author name (\"author\"), email (\"author-mail\"), time (\"author-time\"), and time zone (\"author-tz\"); similarly for committer."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:116
+#: en/git-blame.txt:114
#, priority:100
msgid "the filename in the commit that the line is attributed to."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:117
+#: en/git-blame.txt:115
#, priority:100
msgid "the first line of the commit log message (\"summary\")."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:121
+#: en/git-blame.txt:119
#, priority:100
msgid "The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more header elements later."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:129
+#: en/git-blame.txt:127
#, priority:100
msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:134
+#: en/git-blame.txt:132
#, no-wrap, priority:100
msgid ""
"\t# count the number of lines attributed to each author\n"
@@ -9086,25 +9104,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-blame.txt:137 en/revisions.txt:247
+#: en/git-blame.txt:135 en/revisions.txt:247
#, no-wrap, priority:100
msgid "SPECIFYING RANGES"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:143
+#: en/git-blame.txt:141
#, priority:100
msgid "Unlike 'git blame' and 'git annotate' in older versions of git, the extent of the annotation can be limited to both line ranges and revision ranges. The `-L` option, which limits annotation to a range of lines, may be specified multiple times."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:148
+#: en/git-blame.txt:146
#, priority:100
msgid "When you are interested in finding the origin for lines 40-60 for file `foo`, you can use the `-L` option like so (they mean the same thing -- both ask for 21 lines starting at line 40):"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:151
+#: en/git-blame.txt:149
#, no-wrap, priority:100
msgid ""
"\tgit blame -L 40,60 foo\n"
@@ -9112,31 +9130,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:153
+#: en/git-blame.txt:151
#, priority:100
msgid "Also you can use a regular expression to specify the line range:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:155
+#: en/git-blame.txt:153
#, no-wrap, priority:100
msgid "\tgit blame -L '/^sub hello {/,/^}$/' foo\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:157
+#: en/git-blame.txt:155
#, priority:100
msgid "which limits the annotation to the body of the `hello` subroutine."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:161
+#: en/git-blame.txt:159
#, priority:100
msgid "When you are not interested in changes older than version v2.6.18, or changes older than 3 weeks, you can use revision range specifiers similar to 'git rev-list':"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:164
+#: en/git-blame.txt:162
#, no-wrap, priority:100
msgid ""
"\tgit blame v2.6.18.. -- foo\n"
@@ -9144,103 +9162,103 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:170
+#: en/git-blame.txt:168
#, priority:100
msgid "When revision range specifiers are used to limit the annotation, lines that have not changed since the range boundary (either the commit v2.6.18 or the most recent commit that is more than 3 weeks old in the above example) are blamed for that range boundary commit."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:176
+#: en/git-blame.txt:174
#, priority:100
msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:178
+#: en/git-blame.txt:176
#, no-wrap, priority:100
msgid "\tgit log --diff-filter=A --pretty=short -- foo\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:181
+#: en/git-blame.txt:179
#, priority:100
msgid "and then annotate the change between the commit and its parents, using `commit^!` notation:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:183
+#: en/git-blame.txt:181
#, no-wrap, priority:100
msgid "\tgit blame -C -C -f $commit^! -- foo\n"
msgstr ""
#. type: Title -
-#: en/git-blame.txt:186
+#: en/git-blame.txt:184
#, no-wrap, priority:100
msgid "INCREMENTAL OUTPUT"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:193
+#: en/git-blame.txt:191
#, priority:100
msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:197
+#: en/git-blame.txt:195
#, priority:100
msgid "The output format is similar to the Porcelain format, but it does not contain the actual lines from the file that is being annotated."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:199
+#: en/git-blame.txt:197
#, priority:100
msgid "Each blame entry always starts with a line of:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:201
+#: en/git-blame.txt:199
#, no-wrap, priority:100
msgid "<40-byte hex sha1> <sourceline> <resultline> <num_lines>\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:203
+#: en/git-blame.txt:201
#, priority:100
msgid "Line numbers count from 1."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:208
+#: en/git-blame.txt:206
#, priority:100
msgid "The first time that a commit shows up in the stream, it has various other information about it printed out with a one-word tag at the beginning of each line describing the extra commit information (author, email, committer, dates, summary, etc.)."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:211
+#: en/git-blame.txt:209
#, priority:100
msgid "Unlike the Porcelain format, the filename information is always given and terminates the entry:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:213
+#: en/git-blame.txt:211
#, no-wrap, priority:100
msgid "\"filename\" <whitespace-quoted-filename-goes-here>\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:216
+#: en/git-blame.txt:214
#, priority:100
msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:224
+#: en/git-blame.txt:222
#, priority:100
msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
msgstr ""
#. type: Title -
-#: en/git-blame.txt:227 en/git-check-mailmap.txt:40 en/git-shortlog.txt:112
+#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:112
#, no-wrap, priority:260
msgid "MAPPING AUTHORS"
msgstr ""
@@ -9262,7 +9280,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
-"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
+"\t[-v [--abbrev=<length> | --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"
@@ -9345,7 +9363,7 @@ msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, tha
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:97 en/git-checkout.txt:204 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:180
+#: en/git-branch.txt:97 en/git-checkout.txt:201 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:179
#, ignore-same, no-wrap, priority:240
msgid "-d"
msgstr "-d"
@@ -9536,248 +9554,254 @@ msgstr ""
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
+#. type: Labeled list
+#: en/git-branch.txt:197
+#, no-wrap, priority:240
+msgid "--abbrev=<length>"
+msgstr ""
+
#. type: Plain text
-#: en/git-branch.txt:203
+#: en/git-branch.txt:201
#, priority:240
-msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
+msgid "Alter the sha1's minimum display length in the output listing. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:204
+#: en/git-branch.txt:202
#, ignore-same, no-wrap, priority:240
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
-#: en/git-branch.txt:206
+#: en/git-branch.txt:204
#, priority:240
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
+#: en/git-branch.txt:206 en/git-checkout.txt:158 en/git-switch.txt:152
#, ignore-same, no-wrap, priority:240
msgid "--track"
msgstr "--track"
#. type: Plain text
-#: en/git-branch.txt:216
+#: en/git-branch.txt:214
#, priority:240
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:222
+#: en/git-branch.txt:220
#, priority:240
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
+#: en/git-branch.txt:221 en/git-checkout.txt:172 en/git-switch.txt:167
#, ignore-same, no-wrap, priority:240
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
-#: en/git-branch.txt:226
+#: en/git-branch.txt:224
#, priority:240
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:230
+#: en/git-branch.txt:228
#, priority:240
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:231
+#: en/git-branch.txt:229
#, no-wrap, priority:240
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:232
+#: en/git-branch.txt:230
#, no-wrap, priority:240
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:236
+#: en/git-branch.txt:234
#, priority:240
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:237
+#: en/git-branch.txt:235
#, ignore-same, no-wrap, priority:240
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
-#: en/git-branch.txt:240
+#: en/git-branch.txt:238
#, priority:240
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:241
+#: en/git-branch.txt:239
#, ignore-same, no-wrap, priority:240
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
-#: en/git-branch.txt:246
+#: en/git-branch.txt:244
#, priority:240
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:247 en/git-tag.txt:142
+#: en/git-branch.txt:245 en/git-tag.txt:142
#, no-wrap, priority:240
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:250
+#: en/git-branch.txt:248
#, priority:240
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:251 en/git-tag.txt:146
+#: en/git-branch.txt:249 en/git-tag.txt:146
#, no-wrap, priority:240
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:254
+#: en/git-branch.txt:252
#, priority:240
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:255 en/git-tag.txt:150
+#: en/git-branch.txt:253 en/git-tag.txt:150
#, no-wrap, priority:240
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:258
+#: en/git-branch.txt:256
#, priority:240
msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:259 en/git-tag.txt:154
+#: en/git-branch.txt:257 en/git-tag.txt:154
#, no-wrap, priority:240
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:262
+#: en/git-branch.txt:260
#, priority:240
msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:263
+#: en/git-branch.txt:261
#, no-wrap, priority:240
msgid "<branchname>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:268
+#: en/git-branch.txt:266
#, priority:240
msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:269 en/git-switch.txt:42
+#: en/git-branch.txt:267 en/git-switch.txt:42
#, no-wrap, priority:240
msgid "<start-point>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:273
+#: en/git-branch.txt:271
#, priority:240
msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:274
+#: en/git-branch.txt:272
#, no-wrap, priority:240
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:276
+#: en/git-branch.txt:274
#, priority:240
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:277
+#: en/git-branch.txt:275
#, no-wrap, priority:240
msgid "<newbranch>"
msgstr "<戟棘勻逵� 勻筠�克逵>"
#. type: Plain text
-#: en/git-branch.txt:280
+#: en/git-branch.txt:278
#, priority:240
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
+#: en/git-branch.txt:279 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
#, no-wrap, priority:240
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:291
+#: en/git-branch.txt:289
#, ignore-ellipsis, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:293 en/git-tag.txt:158
+#: en/git-branch.txt:291 en/git-tag.txt:158
#, no-wrap, priority:240
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:295
+#: en/git-branch.txt:293
#, priority:240
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:296
+#: en/git-branch.txt:294
#, no-wrap, priority:240
msgid "--format <format>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:300
+#: en/git-branch.txt:298
#, priority:240
msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:306
+#: en/git-branch.txt:304
#, priority:240
msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:310
+#: en/git-branch.txt:308
#, no-wrap, priority:240
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:317
+#: en/git-branch.txt:315
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
@@ -9787,19 +9811,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:321
+#: en/git-branch.txt:319
#, priority:240
msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:322
+#: en/git-branch.txt:320
#, no-wrap, priority:240
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:329
+#: en/git-branch.txt:327
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
@@ -9809,25 +9833,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:334
+#: en/git-branch.txt:332
#, priority:240
msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:336
+#: en/git-branch.txt:334
#, priority:240
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:337
+#: en/git-branch.txt:335
#, no-wrap, priority:240
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:342
+#: en/git-branch.txt:340
#, no-wrap, priority:240
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
@@ -9835,67 +9859,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:346
+#: en/git-branch.txt:344
#, priority:240
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:347
+#: en/git-branch.txt:345
#, priority:240
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:349
+#: en/git-branch.txt:347
#, priority:240
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:356
+#: en/git-branch.txt:354
#, priority:240
msgid "If you are creating a branch that you want to switch to immediately, it is easier to use the \"git switch\" command with its `-c` option to do the same thing with a single command."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:359
+#: en/git-branch.txt:357
#, priority:240
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:363
+#: en/git-branch.txt:361
#, priority:240
msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:366
+#: en/git-branch.txt:364
#, priority:240
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:369
+#: en/git-branch.txt:367
#, priority:240
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:372
+#: en/git-branch.txt:370
#, priority:240
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:382
+#: en/git-branch.txt:380
#, priority:240
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], 均剋逵勻逵 link:user-manual.html#what-is-a-branch[Understanding history: What is a branch?쨩] (짬�棘戟龜劇逵戟龜筠 龜��棘�龜龜: 槻�棘 �逵克棘筠 勻筠�克逵?쨩) 勻 極棘剋�鈞棘勻逵�筠剋��克棘劇 ��克棘勻棘畇��勻筠 Git."
@@ -10665,7 +10689,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:194 en/git-ls-files.txt:191 en/git-push.txt:433 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:194 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10989,7 +11013,7 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:51 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
@@ -11320,8 +11344,8 @@ msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will al
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239 en/git-remote.txt:207
-#, no-wrap, priority:220
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
+#, no-wrap, priority:100
msgid "EXIT STATUS"
msgstr ""
@@ -11517,7 +11541,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-checkout.txt:364 en/git-commit.txt:354 en/git-ls-files.txt:185 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:144 en/git-update-index.txt:229 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-checkout.txt:357 en/git-commit.txt:360 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11838,19 +11862,19 @@ msgid "This is similar to the previous mode, but lets you use the interactive in
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:146
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
#, priority:240
msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
+#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:67 en/git-switch.txt:145 en/merge-options.txt:155
#, ignore-same, no-wrap, priority:240
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
-#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
+#: en/git-checkout.txt:117 en/git-restore.txt:72 en/git-switch.txt:150
#, priority:240
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -11868,13 +11892,13 @@ msgid "When checking out paths from the index, do not fail upon unmerged entries
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
+#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:73
#, ignore-same, no-wrap, priority:240
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
-#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
+#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:74
#, ignore-same, no-wrap, priority:240
msgid "--theirs"
msgstr "--theirs"
@@ -11934,7 +11958,7 @@ msgid "If no `-b` option is given, the name of the new branch will be derived fr
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:175 en/git-switch.txt:173
+#: en/git-checkout.txt:175 en/git-switch.txt:170
#, priority:240
msgid "Do not set up \"upstream\" configuration, even if the `branch.autoSetupMerge` configuration variable is true."
msgstr ""
@@ -11964,283 +11988,277 @@ msgid "If the branch exists in multiple remotes and one of them is named by the
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:196 en/git-switch.txt:106
-#, priority:240
-msgid "`--guess` is the default behavior. Use `--no-guess` to disable it."
-msgstr ""
-
-#. type: Plain text
-#: en/git-checkout.txt:199 en/git-switch.txt:109
+#: en/git-checkout.txt:196
#, priority:240
-msgid "The default behavior can be set via the `checkout.guess` configuration variable."
+msgid "Use `--no-guess` to disable this."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:203
+#: en/git-checkout.txt:200
#, priority:240
msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:205 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:181
+#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:180
#, ignore-same, no-wrap, priority:240
msgid "--detach"
msgstr "--detach"
#. type: Plain text
-#: en/git-checkout.txt:211
+#: en/git-checkout.txt:208
#, priority:240
msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name. See the \"DETACHED HEAD\" section below for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:212
+#: en/git-checkout.txt:209
#, no-wrap, priority:240
msgid "--orphan <new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:218
+#: en/git-checkout.txt:215
#, priority:240
msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:223
+#: en/git-checkout.txt:220
#, priority:240
msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:229
+#: en/git-checkout.txt:226
#, priority:240
msgid "This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is \"clean\", but whose full history contains proprietary or otherwise encumbered bits of code."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:236
+#: en/git-checkout.txt:233
#, priority:240
msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:237 en/git-restore.txt:104
+#: en/git-checkout.txt:234 en/git-restore.txt:100
#, ignore-same, no-wrap, priority:240
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
-#: en/git-checkout.txt:242
+#: en/git-checkout.txt:239
#, priority:240
msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:244 en/git-rebase.txt:348 en/git-rebase.txt:638 en/git-reset.txt:74 en/git-restore.txt:87 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:122 en/rev-list-options.txt:298
+#: en/git-checkout.txt:241 en/git-rebase.txt:348 en/git-rebase.txt:638 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:298
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
#. type: Plain text
-#: en/git-checkout.txt:253
+#: en/git-checkout.txt:250
#, priority:240
msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:258 en/git-switch.txt:135
+#: en/git-checkout.txt:255 en/git-switch.txt:132
#, priority:240
msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:261
+#: en/git-checkout.txt:258
#, priority:240
msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:263
+#: en/git-checkout.txt:260
#, priority:240
msgid "When switching branches with `--merge`, staged changes may be lost."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
+#: en/git-checkout.txt:261 en/git-restore.txt:87 en/git-switch.txt:133
#, no-wrap, priority:240
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
+#: en/git-checkout.txt:267 en/git-restore.txt:93 en/git-switch.txt:139
#, priority:240
msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:277
+#: en/git-checkout.txt:274
#, priority:240
msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:281
+#: en/git-checkout.txt:278
#, priority:240
msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:284
+#: en/git-checkout.txt:281
#, priority:240
msgid "Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:285 en/git-switch.txt:178
+#: en/git-checkout.txt:282 en/git-switch.txt:175
#, ignore-same, no-wrap, priority:240
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
#. type: Plain text
-#: en/git-checkout.txt:290
+#: en/git-checkout.txt:287
#, priority:240
msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:291 en/git-merge.txt:90
+#: en/git-checkout.txt:288 en/git-merge.txt:90
#, ignore-same, no-wrap, priority:240
msgid "--overwrite-ignore"
msgstr "--overwrite-ignore"
#. type: Labeled list
-#: en/git-checkout.txt:292 en/git-merge.txt:91
+#: en/git-checkout.txt:289 en/git-merge.txt:91
#, ignore-same, no-wrap, priority:240
msgid "--no-overwrite-ignore"
msgstr "--no-overwrite-ignore"
#. type: Plain text
-#: en/git-checkout.txt:296
+#: en/git-checkout.txt:293
#, priority:240
msgid "Silently overwrite ignored files when switching branches. This is the default behavior. Use `--no-overwrite-ignore` to abort the operation when the new branch contains ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:111 en/git-switch.txt:184
+#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:107 en/git-switch.txt:181
#, ignore-same, no-wrap, priority:240
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
#. type: Plain text
-#: en/git-checkout.txt:306
+#: en/git-checkout.txt:303
#, priority:240
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:307 en/git-restore.txt:122
+#: en/git-checkout.txt:304 en/git-restore.txt:118
#, ignore-same, no-wrap, priority:240
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
-#: en/git-checkout.txt:308 en/git-restore.txt:123
+#: en/git-checkout.txt:305 en/git-restore.txt:119
#, ignore-same, no-wrap, priority:240
msgid "--no-overlay"
msgstr "--no-overlay"
#. type: Plain text
-#: en/git-checkout.txt:314
+#: en/git-checkout.txt:311
#, priority:240
msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `<tree-ish>` are removed, to make them match `<tree-ish>` exactly."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:328 en/git-rebase.txt:244 en/git-switch.txt:36
+#: en/git-checkout.txt:325 en/git-rebase.txt:244 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr "<勻筠�克逵>"
#. type: Plain text
-#: en/git-checkout.txt:334
+#: en/git-checkout.txt:331
#, priority:240
msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:338
+#: en/git-checkout.txt:335
#, priority:240
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:342 en/git-switch.txt:58
+#: en/git-checkout.txt:339 en/git-switch.txt:58
#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:343
+#: en/git-checkout.txt:340
#, no-wrap, priority:240
msgid "<new_branch>"
msgstr "<戟棘勻逵�-勻筠�克逵>"
#. type: Plain text
-#: en/git-checkout.txt:345 en/git-switch.txt:41
+#: en/git-checkout.txt:342 en/git-switch.txt:41
#, priority:240
msgid "Name for the new branch."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:346
+#: en/git-checkout.txt:343
#, no-wrap, priority:240
msgid "<start_point>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:349
+#: en/git-checkout.txt:346
#, priority:240
msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
+#: en/git-checkout.txt:350
#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:357
+#: en/git-checkout.txt:354
#, priority:240
msgid "Tree to checkout from (when paths are given). If not specified, the index will be used."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:367 en/git-reset.txt:130 en/git-restore.txt:147
+#: en/git-checkout.txt:360 en/git-reset.txt:130 en/git-restore.txt:143
#, priority:280
msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:369 en/git-commit.txt:362 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:45 en/git-stash.txt:236
+#: en/git-checkout.txt:362 en/git-commit.txt:368 en/git-reset.txt:132 en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:371
+#: en/git-checkout.txt:364
#, no-wrap, priority:240
msgid "DETACHED HEAD"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:375
+#: en/git-checkout.txt:368
#, priority:240
msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:384
+#: en/git-checkout.txt:377
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12253,19 +12271,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:391
+#: en/git-checkout.txt:384
#, priority:240
msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:394 en/git-checkout.txt:429 en/git-checkout.txt:446
+#: en/git-checkout.txt:387 en/git-checkout.txt:422 en/git-checkout.txt:439
#, no-wrap, priority:240
msgid "$ edit; git add; git commit\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:402
+#: en/git-checkout.txt:395
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12278,13 +12296,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:408
+#: en/git-checkout.txt:401
#, priority:240
msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:412
+#: en/git-checkout.txt:405
#, no-wrap, priority:240
msgid ""
"$ git checkout v2.0 # or\n"
@@ -12292,7 +12310,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:420
+#: en/git-checkout.txt:413
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'b')\n"
@@ -12305,13 +12323,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:426
+#: en/git-checkout.txt:419
#, priority:240
msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:439
+#: en/git-checkout.txt:432
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'e')\n"
@@ -12326,13 +12344,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:443
+#: en/git-checkout.txt:436
#, priority:240
msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:456
+#: en/git-checkout.txt:449
#, no-wrap, priority:240
msgid ""
"\t HEAD (refers to commit 'f')\n"
@@ -12347,19 +12365,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:460
+#: en/git-checkout.txt:453
#, priority:240
msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout `master`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:463
+#: en/git-checkout.txt:456
#, no-wrap, priority:240
msgid "$ git checkout master\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:471
+#: en/git-checkout.txt:464
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12372,13 +12390,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:478
+#: en/git-checkout.txt:471
#, priority:240
msgid "It is important to realize that at this point nothing refers to commit `f`. Eventually commit `f` (and by extension commit `e`) will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit `f`, any of these will create a reference to it:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:483
+#: en/git-checkout.txt:476
#, no-wrap, priority:240
msgid ""
"$ git checkout -b foo <1>\n"
@@ -12387,31 +12405,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:488
+#: en/git-checkout.txt:481
#, priority:240
msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:491
+#: en/git-checkout.txt:484
#, priority:240
msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:494
+#: en/git-checkout.txt:487
#, priority:240
msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:499
+#: en/git-checkout.txt:492
#, priority:240
msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:503
+#: en/git-checkout.txt:496
#, no-wrap, priority:240
msgid ""
"$ git reflog -2 HEAD # or\n"
@@ -12419,25 +12437,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:506
+#: en/git-checkout.txt:499
#, no-wrap, priority:240
msgid "ARGUMENT DISAMBIGUATION"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:516
+#: en/git-checkout.txt:509
#, priority:240
msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:523
+#: en/git-checkout.txt:516
#, priority:240
msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:529
+#: en/git-checkout.txt:522
#, no-wrap, priority:240
msgid ""
"$ git checkout master <1>\n"
@@ -12447,73 +12465,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:532
+#: en/git-checkout.txt:525
#, priority:240
msgid "switch branch"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:533 en/git-restore.txt:165
+#: en/git-checkout.txt:526 en/git-restore.txt:161
#, priority:240
msgid "take a file out of another commit"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:534
+#: en/git-checkout.txt:527
#, priority:240
msgid "restore `hello.c` from the index"
msgstr "勻棘���逵戟棘勻剋筠戟龜筠 `hello.c` 龜鈞 龜戟畇筠克�逵"
#. type: Plain text
-#: en/git-checkout.txt:537
+#: en/git-checkout.txt:530
#, priority:240
msgid "If you want to check out _all_ C source files out of the index, you can say"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:540
+#: en/git-checkout.txt:533
#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:546
+#: en/git-checkout.txt:539
#, priority:240
msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:550
+#: en/git-checkout.txt:543
#, priority:240
msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:553
+#: en/git-checkout.txt:546
#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:557 en/git-switch.txt:204
+#: en/git-checkout.txt:550 en/git-switch.txt:201
#, priority:240
msgid "After working in the wrong branch, switching to the correct branch would be done using:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:560
+#: en/git-checkout.txt:553
#, no-wrap, priority:240
msgid "$ git checkout mytopic\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:565
+#: en/git-checkout.txt:558
#, priority:240
msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:569
+#: en/git-checkout.txt:562
#, no-wrap, priority:240
msgid ""
"$ git checkout mytopic\n"
@@ -12521,13 +12539,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:573 en/git-switch.txt:220
+#: en/git-checkout.txt:566 en/git-switch.txt:217
#, priority:240
msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:577
+#: en/git-checkout.txt:570
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -12535,19 +12553,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:582 en/git-switch.txt:229
+#: en/git-checkout.txt:575 en/git-switch.txt:226
#, priority:240
msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:585
+#: en/git-checkout.txt:578
#, priority:240
msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:591
+#: en/git-checkout.txt:584
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -12557,13 +12575,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:597
+#: en/git-checkout.txt:590
#, priority:240
msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:601
+#: en/git-checkout.txt:594
#, no-wrap, priority:240
msgid ""
"$ edit frotz\n"
@@ -12571,7 +12589,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:607
+#: en/git-checkout.txt:600
#, ignore-same, priority:240
msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
@@ -12862,7 +12880,7 @@ msgid "With this option, 'git cherry-pick' will let you edit the commit message
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:58 en/git-commit.txt:186 en/git-revert.txt:70 en/git-tag.txt:183 en/merge-options.txt:35
+#: en/git-cherry-pick.txt:58 en/git-commit.txt:192 en/git-revert.txt:70 en/git-tag.txt:183 en/merge-options.txt:35
#, no-wrap, priority:280
msgid "--cleanup=<mode>"
msgstr ""
@@ -12930,7 +12948,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:109 en/git-revert.txt:104
#, priority:100
-msgid "Add a `Signed-off-by` trailer at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information."
+msgid "Add Signed-off-by line at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
@@ -12946,7 +12964,7 @@ msgid "If the current HEAD is the same as the parent of the cherry-pick'ed commi
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:124 en/git-commit.txt:174 en/git-notes.txt:158
+#: en/git-cherry-pick.txt:124 en/git-commit.txt:180 en/git-notes.txt:158
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty"
msgstr "--allow-empty"
@@ -12958,7 +12976,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:137 en/git-commit.txt:180 en/git-rebase.txt:328 en/git-rebase.txt:641
+#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:328 en/git-rebase.txt:641
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12982,7 +13000,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:111
+#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -13000,7 +13018,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:155 en/git-revert.txt:111 en/merge-options.txt:119
+#: en/git-cherry-pick.txt:155 en/git-revert.txt:111 en/merge-options.txt:128
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
msgstr ""
@@ -13668,7 +13686,7 @@ msgid "This default configuration is achieved by creating references to the remo
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
#, ignore-same, no-wrap, priority:300
msgid "--local"
msgstr "--local"
@@ -13853,230 +13871,230 @@ msgid "--origin <name>"
msgstr "--origin <龜劇�>"
#. type: Plain text
-#: en/git-clone.txt:189
+#: en/git-clone.txt:188
#, priority:300
-msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`. Overrides `clone.defaultRemoteName` from the config."
+msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:190
+#: en/git-clone.txt:189
#, no-wrap, priority:300
msgid "-b <name>"
msgstr "-b <勻筠�克逵>"
#. type: Labeled list
-#: en/git-clone.txt:191
+#: en/git-clone.txt:190
#, no-wrap, priority:300
msgid "--branch <name>"
msgstr "--branch <勻筠�克逵>"
#. type: Plain text
-#: en/git-clone.txt:198
+#: en/git-clone.txt:197
#, priority:300
msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `<name>` branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:199
+#: en/git-clone.txt:198
#, no-wrap, priority:300
msgid "-u <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:204
+#: en/git-clone.txt:203
#, priority:300
msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:205 en/git-init.txt:59 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:59 en/git-svn.txt:578
#, no-wrap, priority:300
msgid "--template=<template_directory>"
msgstr "--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>"
#. type: Plain text
-#: en/git-clone.txt:208
+#: en/git-clone.txt:207
#, priority:300
msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:209
+#: en/git-clone.txt:208
#, no-wrap, priority:300
msgid "-c <key>=<value>"
msgstr "-c <克剋��>=<鈞戟逵�筠戟龜筠>"
#. type: Labeled list
-#: en/git-clone.txt:210
+#: en/git-clone.txt:209
#, no-wrap, priority:300
msgid "--config <key>=<value>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:219
+#: en/git-clone.txt:218
#, priority:300
msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:225
+#: en/git-clone.txt:224
#, priority:300
msgid "Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-tags` options instead."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:226
+#: en/git-clone.txt:225
#, no-wrap, priority:300
msgid "--depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:232
+#: en/git-clone.txt:231
#, priority:300
msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:235
+#: en/git-clone.txt:234
#, priority:300
msgid "Create a shallow clone with a history after the specified time."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:240
+#: en/git-clone.txt:239
#, priority:300
msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:241 en/git-submodule.txt:433
+#: en/git-clone.txt:240 en/git-submodule.txt:433
#, ignore-same, no-wrap, priority:300
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
#. type: Plain text
-#: en/git-clone.txt:250
+#: en/git-clone.txt:249
#, priority:300
msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:257
+#: en/git-clone.txt:256
#, priority:300
msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:262
+#: en/git-clone.txt:261
#, priority:300
msgid "Can be used in conjunction with `--single-branch` to clone and maintain a branch with no references other than a single cloned branch. This is useful e.g. to maintain minimal clones of the default branch of some repository for search indexing."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:263
+#: en/git-clone.txt:262
#, fuzzy, no-wrap, priority:300
#| msgid "--recurse-submodules"
msgid "--recurse-submodules[=<pathspec>]"
msgstr "--recurse-submodules"
#. type: Plain text
-#: en/git-clone.txt:271
+#: en/git-clone.txt:270
#, priority:300
msgid "After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries. The resulting clone has `submodule.active` set to the provided pathspec, or \".\" (meaning all submodules) if no pathspec is provided."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:278
+#: en/git-clone.txt:277
#, priority:300
msgid "Submodules are initialized and cloned using their default settings. This is equivalent to running `git submodule update --init --recursive <pathspec>` immediately after the clone is finished. This option is ignored if the cloned repository does not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:279
+#: en/git-clone.txt:278
#, ignore-same, no-wrap, priority:300
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
#. type: Plain text
-#: en/git-clone.txt:281
+#: en/git-clone.txt:280
#, priority:300
msgid "All submodules which are cloned will be shallow with a depth of 1."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:282
+#: en/git-clone.txt:281
#, ignore-same, no-wrap, priority:300
msgid "--[no-]remote-submodules"
msgstr "--[no-]remote-submodules"
#. type: Plain text
-#: en/git-clone.txt:287
+#: en/git-clone.txt:286
#, priority:300
msgid "All submodules which are cloned will use the status of the submodule's remote-tracking branch to update the submodule, rather than the superproject's recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:288 en/git-init.txt:64
+#: en/git-clone.txt:287 en/git-init.txt:64
#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
msgstr "--separate-git-dir=<克逵�逵剋棘均-git>"
#. type: Plain text
-#: en/git-clone.txt:294
+#: en/git-clone.txt:293
#, priority:300
msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:295 en/git-submodule.txt:427
+#: en/git-clone.txt:294 en/git-submodule.txt:427
#, no-wrap, priority:300
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:296 en/git-submodule.txt:428
+#: en/git-clone.txt:295 en/git-submodule.txt:428
#, no-wrap, priority:300
msgid "--jobs <n>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:299
+#: en/git-clone.txt:298
#, priority:300
msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:300 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:299 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
msgstr "<�筠極棘鈞龜�棘�龜橘>"
#. type: Plain text
-#: en/git-clone.txt:304
+#: en/git-clone.txt:303
#, priority:300
msgid "The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> section below for more information on specifying repositories."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:305 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
+#: en/git-clone.txt:304 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
#, no-wrap, priority:300
msgid "<directory>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:311
+#: en/git-clone.txt:310
#, priority:300
msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an existing directory is only allowed if the directory is empty."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:319
+#: en/git-clone.txt:318
#, priority:300
msgid "Clone from upstream:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:324
+#: en/git-clone.txt:323
#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
@@ -14085,13 +14103,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:328
+#: en/git-clone.txt:327
#, priority:300
msgid "Make a local clone that borrows from the current directory, without checking things out:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:333
+#: en/git-clone.txt:332
#, no-wrap, priority:300
msgid ""
"$ git clone -l -s -n . ../copy\n"
@@ -14100,13 +14118,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:337
+#: en/git-clone.txt:336
#, priority:300
msgid "Clone from upstream while borrowing from an existing local directory:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:343
+#: en/git-clone.txt:342
#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"$ git clone --reference /git/linux.git \\\n"
@@ -14116,13 +14134,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:347
+#: en/git-clone.txt:346
#, priority:300
msgid "Create a bare repository to publish your changes to the public:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:350
+#: en/git-clone.txt:349
#, no-wrap, priority:300
msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
msgstr ""
@@ -14380,7 +14398,7 @@ msgid "A paragraph in the commit log message. This can be given more than once a
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:57 en/git-commit.txt:133 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
+#: en/git-commit-tree.txt:57 en/git-commit.txt:132 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
#, no-wrap, priority:280
msgid "-F <file>"
msgstr ""
@@ -14440,7 +14458,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:521 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:91 en/git-commit.txt:527 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
msgstr ""
@@ -14537,355 +14555,361 @@ msgid "If you make a commit and then find a mistake immediately after that, you
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:71
+#: en/git-commit.txt:70
#, priority:280
msgid "Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:77
+#: en/git-commit.txt:76
#, priority:280
msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:78
+#: en/git-commit.txt:77
#, no-wrap, priority:280
msgid "-C <commit>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:79
+#: en/git-commit.txt:78
#, no-wrap, priority:280
msgid "--reuse-message=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:83
+#: en/git-commit.txt:82
#, priority:280
msgid "Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:84
+#: en/git-commit.txt:83
#, no-wrap, priority:280
msgid "-c <commit>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:85
+#: en/git-commit.txt:84
#, no-wrap, priority:280
msgid "--reedit-message=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:88
+#: en/git-commit.txt:87
#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the commit message."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:89
+#: en/git-commit.txt:88
#, no-wrap, priority:280
msgid "--fixup=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:94
+#: en/git-commit.txt:93
#, priority:280
msgid "Construct a commit message for use with `rebase --autosquash`. The commit message will be the subject line from the specified commit with a prefix of \"fixup! \". See linkgit:git-rebase[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:95
+#: en/git-commit.txt:94
#, no-wrap, priority:280
msgid "--squash=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:101
+#: en/git-commit.txt:100
#, priority:280
msgid "Construct a commit message for use with `rebase --autosquash`. The commit message subject line is taken from the specified commit with a prefix of \"squash! \". Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:102
+#: en/git-commit.txt:101
#, ignore-same, no-wrap, priority:280
msgid "--reset-author"
msgstr "--reset-author"
#. type: Plain text
-#: en/git-commit.txt:107
+#: en/git-commit.txt:106
#, priority:280
msgid "When used with -C/-c/--amend options, or when committing after a conflicting cherry-pick, declare that the authorship of the resulting commit now belongs to the committer. This also renews the author timestamp."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:108 en/git-status.txt:28 en/git-symbolic-ref.txt:45
+#: en/git-commit.txt:107 en/git-status.txt:28 en/git-symbolic-ref.txt:45
#, ignore-same, no-wrap, priority:280
msgid "--short"
msgstr "--short"
#. type: Plain text
-#: en/git-commit.txt:111
+#: en/git-commit.txt:110
#, priority:280
msgid "When doing a dry-run, give the output in the short-format. See linkgit:git-status[1] for details. Implies `--dry-run`."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:112 en/git-status.txt:32
+#: en/git-commit.txt:111 en/git-status.txt:32
#, ignore-same, no-wrap, priority:280
msgid "--branch"
msgstr "--branch"
#. type: Plain text
-#: en/git-commit.txt:114 en/git-status.txt:34
+#: en/git-commit.txt:113 en/git-status.txt:34
#, priority:280
msgid "Show the branch and tracking info even in short-format."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:119
+#: en/git-commit.txt:118
#, priority:280
msgid "When doing a dry-run, give the output in a porcelain-ready format. See linkgit:git-status[1] for details. Implies `--dry-run`."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:120 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:119 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
#, ignore-same, no-wrap, priority:280
msgid "--long"
msgstr "--long"
#. type: Plain text
-#: en/git-commit.txt:123
+#: en/git-commit.txt:122
#, priority:280
msgid "When doing a dry-run, give the output in the long-format. Implies `--dry-run`."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:125 en/git-config.txt:216 en/git-grep.txt:208
+#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
#, ignore-same, no-wrap, priority:280
msgid "--null"
msgstr "--null"
#. type: Plain text
-#: en/git-commit.txt:132
+#: en/git-commit.txt:131
#, priority:280
msgid "When showing `short` or `porcelain` status output, print the filename verbatim and terminate the entries with NUL, instead of LF. If no format is given, implies the `--porcelain` output format. Without the `-z` option, filenames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:134 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
+#: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
#, no-wrap, priority:280
msgid "--file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:137
+#: en/git-commit.txt:136
#, priority:280
msgid "Take the commit message from the given file. Use '-' to read the message from the standard input."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:138
+#: en/git-commit.txt:137
#, no-wrap, priority:280
msgid "--author=<author>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:144
+#: en/git-commit.txt:143
#, priority:280
msgid "Override the commit author. Specify an explicit author using the standard `A U Thor <author@example.com>` format. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author (i.e. rev-list --all -i --author=<author>); the commit author is then copied from the first such commit found."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:145
+#: en/git-commit.txt:144
#, no-wrap, priority:280
msgid "--date=<date>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:147
+#: en/git-commit.txt:146
#, priority:280
msgid "Override the author date used in the commit."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:148 en/git-merge.txt:66 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162
+#: en/git-commit.txt:147 en/git-merge.txt:66 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162
#, no-wrap, priority:280
msgid "-m <msg>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:149 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
+#: en/git-commit.txt:148 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
#, no-wrap, priority:280
msgid "--message=<msg>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:153
+#: en/git-commit.txt:152
#, priority:280
msgid "Use the given <msg> as the commit message. If multiple `-m` options are given, their values are concatenated as separate paragraphs."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:155
+#: en/git-commit.txt:154
#, priority:280
msgid "The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:156
+#: en/git-commit.txt:155
#, no-wrap, priority:280
msgid "-t <file>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:157
+#: en/git-commit.txt:156
#, no-wrap, priority:280
msgid "--template=<file>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:166
+#: en/git-commit.txt:165
#, priority:280
msgid "When editing the commit message, start the editor with the contents in the given file. The `commit.template` configuration variable is often used to give this option implicitly to the command. This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order. If the user exits the editor without editing the message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options."
msgstr ""
+#. type: Plain text
+#: en/git-commit.txt:174 en/merge-options.txt:88
+#, priority:280
+msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
+msgstr ""
+
#. type: Labeled list
-#: en/git-commit.txt:170 en/git-rebase.txt:413 en/merge-options.txt:106
+#: en/git-commit.txt:176 en/git-rebase.txt:413 en/merge-options.txt:115
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
#. type: Plain text
-#: en/git-commit.txt:173
+#: en/git-commit.txt:179
#, priority:280
msgid "This option bypasses the pre-commit and commit-msg hooks. See also linkgit:githooks[5]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:179
+#: en/git-commit.txt:185
#, priority:280
msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:185
+#: en/git-commit.txt:191
#, priority:280
msgid "Like --allow-empty this command is primarily for use by foreign SCM interface scripts. It allows you to create a commit with an empty commit message without using plumbing commands like linkgit:git-commit-tree[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:190
+#: en/git-commit.txt:196
#, priority:280
msgid "This option determines how the supplied commit message should be cleaned up before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, `scissors` or `default`."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:192
+#: en/git-commit.txt:198
#, no-wrap, priority:280
msgid "strip"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:195
+#: en/git-commit.txt:201
#, priority:280
msgid "Strip leading and trailing empty lines, trailing whitespace, commentary and collapse consecutive empty lines."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:195
+#: en/git-commit.txt:201
#, no-wrap, priority:280
msgid "whitespace"
msgstr "whitespace"
#. type: Plain text
-#: en/git-commit.txt:197
+#: en/git-commit.txt:203
#, priority:280
msgid "Same as `strip` except #commentary is not removed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:197
+#: en/git-commit.txt:203
#, no-wrap, priority:280
msgid "verbatim"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:199
+#: en/git-commit.txt:205
#, priority:280
msgid "Do not change the message at all."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:199
+#: en/git-commit.txt:205
#, no-wrap, priority:280
msgid "scissors"
msgstr "scissors"
#. type: Plain text
-#: en/git-commit.txt:203
+#: en/git-commit.txt:209
#, priority:280
msgid "Same as `whitespace` except that everything from (and including) the line found below is truncated, if the message is to be edited. \"`#`\" can be customized with core.commentChar."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:205
+#: en/git-commit.txt:211
#, no-wrap, priority:280
msgid "# ------------------------ >8 ------------------------\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:209
+#: en/git-commit.txt:215
#, priority:280
msgid "Same as `strip` if the message is to be edited. Otherwise `whitespace`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:213
+#: en/git-commit.txt:219
#, priority:280
msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:220
+#: en/git-commit.txt:226
#, priority:280
msgid "The message taken from file with `-F`, command line with `-m`, and from commit object with `-C` are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:221 en/git-revert.txt:66 en/merge-options.txt:17
+#: en/git-commit.txt:227 en/git-revert.txt:66 en/merge-options.txt:17
#, ignore-same, no-wrap, priority:280
msgid "--no-edit"
msgstr "--no-edit"
#. type: Plain text
-#: en/git-commit.txt:225
+#: en/git-commit.txt:231
#, priority:280
msgid "Use the selected commit message without launching an editor. For example, `git commit --amend --no-edit` amends a commit without changing its commit message."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:226
+#: en/git-commit.txt:232
#, ignore-same, no-wrap, priority:280
msgid "--amend"
msgstr "--amend"
#. type: Plain text
-#: en/git-commit.txt:236
+#: en/git-commit.txt:242
#, priority:280
msgid "Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the `-i` and `-o` options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:239
+#: en/git-commit.txt:245
#, priority:280
msgid "It is a rough equivalent for:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:243
+#: en/git-commit.txt:249
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"\t$ git reset --soft HEAD^\n"
@@ -14894,169 +14918,169 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:246
+#: en/git-commit.txt:252
#, priority:280
msgid "but can be used to amend a merge commit."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:251
+#: en/git-commit.txt:257
#, priority:280
msgid "You should understand the implications of rewriting history if you amend a commit that has already been published. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:252
+#: en/git-commit.txt:258
#, ignore-same, no-wrap, priority:280
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
#. type: Plain text
-#: en/git-commit.txt:254
+#: en/git-commit.txt:260
#, priority:280
msgid "Bypass the post-rewrite hook."
msgstr "��棘極���龜�� 極筠�筠�勻逵��龜克 post-rewrite."
#. type: Labeled list
-#: en/git-commit.txt:256
+#: en/git-commit.txt:262
#, ignore-same, no-wrap, priority:280
msgid "--include"
msgstr "--include"
#. type: Plain text
-#: en/git-commit.txt:261
+#: en/git-commit.txt:267
#, priority:280
msgid "Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:263
+#: en/git-commit.txt:269
#, ignore-same, no-wrap, priority:280
msgid "--only"
msgstr "--only"
#. type: Plain text
-#: en/git-commit.txt:275
+#: en/git-commit.txt:281
#, priority:280
msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:289 en/git-status.txt:58
+#: en/git-commit.txt:295 en/git-status.txt:58
#, no-wrap, priority:280
msgid "-u[<mode>]"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:290 en/git-status.txt:59
+#: en/git-commit.txt:296 en/git-status.txt:59
#, no-wrap, priority:280
msgid "--untracked-files[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:292 en/git-status.txt:61
+#: en/git-commit.txt:298 en/git-status.txt:61
#, priority:280
msgid "Show untracked files."
msgstr "��棘閨�逵菌逵�� 戟筠棘��剋筠菌龜勻逵筠劇�筠 �逵橘剋�."
#. type: Plain text
-#: en/git-commit.txt:297
+#: en/git-commit.txt:303
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:299 en/git-status.txt:68 en/git-status.txt:110
+#: en/git-commit.txt:305 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:301
+#: en/git-commit.txt:307
#, no-wrap, priority:280
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:302
+#: en/git-commit.txt:308
#, no-wrap, priority:280
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:303 en/git-status.txt:72
+#: en/git-commit.txt:309 en/git-status.txt:72
#, no-wrap, priority:280
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:306 en/git-status.txt:85
+#: en/git-commit.txt:312 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:318
+#: en/git-commit.txt:324
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:322
+#: en/git-commit.txt:328
#, priority:280
msgid "If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:326
+#: en/git-commit.txt:332
#, priority:280
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:331
+#: en/git-commit.txt:337
#, priority:280
msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:332
+#: en/git-commit.txt:338
#, ignore-same, no-wrap, priority:280
msgid "--status"
msgstr "--status"
#. type: Plain text
-#: en/git-commit.txt:337
+#: en/git-commit.txt:343
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:338
+#: en/git-commit.txt:344
#, ignore-same, no-wrap, priority:280
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
-#: en/git-commit.txt:342
+#: en/git-commit.txt:348
#, priority:280
msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:360
+#: en/git-commit.txt:366
#, priority:280
msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:376
+#: en/git-commit.txt:382
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:382
+#: en/git-commit.txt:388
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -15066,13 +15090,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:390
+#: en/git-commit.txt:396
#, priority:280
msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:395
+#: en/git-commit.txt:401
#, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
@@ -15081,19 +15105,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:400
+#: en/git-commit.txt:406
#, priority:280
msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:405
+#: en/git-commit.txt:411
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:411
+#: en/git-commit.txt:417
#, no-wrap, priority:280
msgid ""
"$ edit hello.c hello.h\n"
@@ -15103,31 +15127,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:418
+#: en/git-commit.txt:424
#, priority:280
msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:421 en/git-commit.txt:447
+#: en/git-commit.txt:427 en/git-commit.txt:453
#, no-wrap, priority:280
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:425
+#: en/git-commit.txt:431
#, priority:280
msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:433
+#: en/git-commit.txt:439
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:439
+#: en/git-commit.txt:445
#, no-wrap, priority:280
msgid ""
"$ git status | grep unmerged\n"
@@ -15137,32 +15161,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:444
+#: en/git-commit.txt:450
#, priority:280
msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:455
+#: en/git-commit.txt:461
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:457
+#: en/git-commit.txt:463
#, fuzzy, no-wrap, priority:280
#| msgid "CONFIGURATION"
msgid "COMMIT INFORMATION"
msgstr "���圭��叫��揆�赳"
#. type: Plain text
-#: en/git-commit.txt:461
+#: en/git-commit.txt:467
#, priority:280
msgid "Author and committer information is taken from the following environment variables, if set:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:468
+#: en/git-commit.txt:474
#, no-wrap, priority:280
msgid ""
"\tGIT_AUTHOR_NAME\n"
@@ -15174,73 +15198,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:470
+#: en/git-commit.txt:476
#, priority:280
msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:476
+#: en/git-commit.txt:482
#, priority:280
msgid "The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used, subject to the constraints listed above. This name has no effect on authentication; for that, see the `credential.username` variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:483
+#: en/git-commit.txt:489
#, priority:280
msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:487
+#: en/git-commit.txt:493
#, priority:280
msgid "The `author.name` and `committer.name` and their corresponding email options override `user.name` and `user.email` if set and are overridden themselves by the environment variables."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:490
+#: en/git-commit.txt:496
#, priority:280
msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:504
+#: en/git-commit.txt:510
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr ""
#. type: Title -
-#: en/git-commit.txt:508
+#: en/git-commit.txt:514
#, no-wrap, priority:280
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:513
+#: en/git-commit.txt:519
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:519
+#: en/git-commit.txt:525
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:523
+#: en/git-commit.txt:529
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:529
+#: en/git-commit.txt:535
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:537
+#: en/git-commit.txt:543
#, ignore-same, priority:280
msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -15261,15 +15285,15 @@ msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘
#: en/git-config.txt:27
#, no-wrap, priority:100
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
-"'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all name value [value-pattern]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]\n"
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]\n"
+"'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]\n"
+"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL\n"
-"'git config' [<file-option>] [--fixed-value] --unset name [value-pattern]\n"
-"'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]\n"
+"'git config' [<file-option>] --unset name [value_regex]\n"
+"'git config' [<file-option>] --unset-all name [value_regex]\n"
"'git config' [<file-option>] --rename-section old_name new_name\n"
"'git config' [<file-option>] --remove-section name\n"
"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
@@ -15285,655 +15309,643 @@ msgid "You can query/set/replace/unset options with this command. The name is ac
msgstr "�� 劇棘菌筠�筠 龜�極棘剋�鈞棘勻逵�� ��� 克棘劇逵戟畇� 畇剋� 極�棘勻筠�克龜/���逵戟棘勻克龜/鈞逵劇筠戟� 鈞戟逵�筠戟龜橘 極逵�逵劇筠��棘勻. �劇� �筠克�龜龜 龜 克剋��逵 �逵鈞畇筠剋筠戟� �棘�克棘橘, 龜 鈞戟逵�筠戟龜筠 閨�畇筠� �克���棘."
#. type: Plain text
-#: en/git-config.txt:43
+#: en/git-config.txt:40
#, priority:100
-msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a `value-pattern` (which is an extended regular expression, unless the `--fixed-value` option is given) needs to be given. Only the existing values that match the pattern are updated or unset. If you want to handle the lines that do *not* match the pattern, just prepend a single exclamation mark in front (see also <<EXAMPLES>>), but note that this only works when the `--fixed-value` option is not in use."
+msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a POSIX regexp `value_regex` needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do *not* match the regex, just prepend a single exclamation mark in front (see also <<EXAMPLES>>)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:48
+#: en/git-config.txt:45
#, priority:100
msgid "The `--type=<type>` option instructs 'git config' to ensure that incoming and outgoing values are canonicalize-able under the given <type>. If no `--type=<type>` is given, no canonicalization will be performed. Callers may unset an existing `--type` specifier with `--no-type`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:54
+#: en/git-config.txt:51
#, priority:100
msgid "When reading, the values are read from the system, global and repository local configuration files by default, and options `--system`, `--global`, `--local`, `--worktree` and `--file <filename>` can be used to tell the command to read from only that location (see <<FILES>>)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:60
+#: en/git-config.txt:57
#, priority:100
msgid "When writing, the new value is written to the repository local configuration file by default, and options `--system`, `--global`, `--worktree`, `--file <filename>` can be used to tell the command to write to that location (you can say `--local` but that is the default)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:63
+#: en/git-config.txt:60
#, priority:100
msgid "This command will fail with non-zero status upon error. Some exit codes are:"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:65
+#: en/git-config.txt:62
#, priority:100
msgid "The section or key is invalid (ret=1),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:66
+#: en/git-config.txt:63
#, priority:100
msgid "no section or name was provided (ret=2),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:67
+#: en/git-config.txt:64
#, priority:100
msgid "the config file is invalid (ret=3),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:68
+#: en/git-config.txt:65
#, priority:100
msgid "the config file cannot be written (ret=4),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:69
+#: en/git-config.txt:66
#, priority:100
msgid "you try to unset an option which does not exist (ret=5),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:70
+#: en/git-config.txt:67
#, priority:100
msgid "you try to unset/set an option for which multiple lines match (ret=5), or"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:71
+#: en/git-config.txt:68
#, priority:100
msgid "you try to use an invalid regexp (ret=6)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:73
+#: en/git-config.txt:70
#, priority:100
msgid "On success, the command returns the exit code 0."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:77
+#: en/git-config.txt:74
#, ignore-same, no-wrap, priority:100
msgid "--replace-all"
msgstr "--replace-all"
#. type: Plain text
-#: en/git-config.txt:80
+#: en/git-config.txt:77
#, priority:100
-msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
+msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:81 en/git-update-index.txt:45
+#: en/git-config.txt:78 en/git-update-index.txt:45
#, ignore-same, no-wrap, priority:100
msgid "--add"
msgstr "--add"
#. type: Plain text
-#: en/git-config.txt:85
+#: en/git-config.txt:82
#, priority:100
-msgid "Adds a new line to the option without altering any existing values. This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
+msgid "Adds a new line to the option without altering any existing values. This is the same as providing '^$' as the value_regex in `--replace-all`."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:86
+#: en/git-config.txt:83
#, ignore-same, no-wrap, priority:100
msgid "--get"
msgstr "--get"
#. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:87
#, priority:100
msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:88
#, ignore-same, no-wrap, priority:100
msgid "--get-all"
msgstr "--get-all"
#. type: Plain text
-#: en/git-config.txt:93
+#: en/git-config.txt:90
#, priority:100
msgid "Like get, but returns all values for a multi-valued key."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:94
+#: en/git-config.txt:91
#, ignore-same, no-wrap, priority:100
msgid "--get-regexp"
msgstr "--get-regexp"
#. type: Plain text
-#: en/git-config.txt:100
+#: en/git-config.txt:97
#, priority:100
msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:101
+#: en/git-config.txt:98
#, no-wrap, priority:100
msgid "--get-urlmatch name URL"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:108
+#: en/git-config.txt:105
#, priority:100
msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:109
+#: en/git-config.txt:106
#, ignore-same, no-wrap, priority:100
msgid "--global"
msgstr "--global"
#. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:111
#, priority:100
msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:117
+#: en/git-config.txt:114
#, priority:100
msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:348
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
#, priority:100
msgid "See also <<FILES>>."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:120
+#: en/git-config.txt:117
#, ignore-same, no-wrap, priority:100
msgid "--system"
msgstr "--system"
#. type: Plain text
-#: en/git-config.txt:124
+#: en/git-config.txt:121
#, priority:100
msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:127
+#: en/git-config.txt:124
#, priority:100
msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:133
+#: en/git-config.txt:130
#, priority:100
msgid "For writing options: write to the repository `.git/config` file. This is the default behavior."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:136
+#: en/git-config.txt:133
#, priority:100
msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:139 en/git-restore.txt:59
+#: en/git-config.txt:136 en/git-restore.txt:55
#, ignore-same, no-wrap, priority:100
msgid "--worktree"
msgstr "--worktree"
#. type: Plain text
-#: en/git-config.txt:143
+#: en/git-config.txt:140
#, priority:100
msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:144
+#: en/git-config.txt:141
#, no-wrap, priority:100
msgid "-f config-file"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:142
#, no-wrap, priority:100
msgid "--file config-file"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:147
+#: en/git-config.txt:144
#, priority:100
msgid "Use the given config file instead of the one specified by GIT_CONFIG."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:148
+#: en/git-config.txt:145
#, no-wrap, priority:100
msgid "--blob blob"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:151
#, priority:100
msgid "Similar to `--file` but use the given blob instead of a file. E.g. you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:152
#, ignore-same, no-wrap, priority:100
msgid "--remove-section"
msgstr "--remove-section"
#. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:154
#, priority:100
msgid "Remove the given section from the configuration file."
msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 �克逵鈞逵戟戟�� �筠克�龜�."
#. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:155
#, ignore-same, no-wrap, priority:100
msgid "--rename-section"
msgstr "--rename-section"
#. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:157
#, priority:100
msgid "Rename the given section to a new name."
msgstr "�筠�筠龜劇筠戟棘勻逵�� �克逵鈞逵戟戟�� �筠克�龜�."
#. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:158
#, ignore-same, no-wrap, priority:100
msgid "--unset"
msgstr "--unset"
#. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:160
#, priority:100
msgid "Remove the line matching the key from config file."
msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 ���棘克�, �棘棘�勻筠���勻����� 鈞逵畇逵戟戟棘劇� 克剋���."
#. type: Labeled list
-#: en/git-config.txt:164
+#: en/git-config.txt:161
#, ignore-same, no-wrap, priority:100
msgid "--unset-all"
msgstr "--unset-all"
#. type: Plain text
-#: en/git-config.txt:166
+#: en/git-config.txt:163
#, priority:100
msgid "Remove all lines matching the key from config file."
msgstr "叫畇逵剋龜�� 龜鈞 克棘戟�龜均��逵�龜棘戟戟棘均棘 �逵橘剋逵 勻�筠 ���棘克龜, �棘棘�勻筠���勻���龜筠 克剋���."
#. type: Plain text
-#: en/git-config.txt:170
+#: en/git-config.txt:167
#, priority:100
msgid "List all variables set in config file, along with their values."
msgstr "�筠�筠�龜�剋龜�� 勻�筠 極筠�筠劇筠戟戟�筠 龜 龜� 鈞戟逵�筠戟龜�, ���逵戟棘勻剋筠戟戟�筠 勻 克棘戟�龜均��逵�龜棘戟戟棘劇 �逵橘剋筠."
#. type: Labeled list
-#: en/git-config.txt:171
-#, ignore-same, no-wrap, priority:100
-msgid "--fixed-value"
-msgstr "--fixed-value"
-
-#. type: Plain text
-#: en/git-config.txt:176
-#, priority:100
-msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
-msgstr ""
-
-#. type: Labeled list
-#: en/git-config.txt:177
+#: en/git-config.txt:168
#, no-wrap, priority:100
msgid "--type <type>"
msgstr "--type <�龜極>"
#. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:172
#, priority:100
msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:183
+#: en/git-config.txt:174
#, priority:100
msgid "Valid `<type>`'s include:"
msgstr "�棘極���龜劇�劇龜 `<�龜極>`逵劇龜 �勻剋�����:"
#. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:176
#, priority:100
msgid "'bool': canonicalize values as either \"true\" or \"false\"."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:188
+#: en/git-config.txt:179
#, priority:100
msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:190
+#: en/git-config.txt:181
#, priority:100
msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:194
+#: en/git-config.txt:185
#, priority:100
msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:196
+#: en/git-config.txt:187
#, priority:100
msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:191
#, priority:100
msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:202
+#: en/git-config.txt:193
#, ignore-same, no-wrap, priority:100
msgid "--bool"
msgstr "--bool"
#. type: Labeled list
-#: en/git-config.txt:203
+#: en/git-config.txt:194
#, ignore-same, no-wrap, priority:100
msgid "--int"
msgstr "--int"
#. type: Labeled list
-#: en/git-config.txt:204
+#: en/git-config.txt:195
#, ignore-same, no-wrap, priority:100
msgid "--bool-or-int"
msgstr "--bool-or-int"
#. type: Labeled list
-#: en/git-config.txt:205 en/git-hash-object.txt:39
+#: en/git-config.txt:196 en/git-hash-object.txt:39
#, ignore-same, no-wrap, priority:100
msgid "--path"
msgstr "--path"
#. type: Labeled list
-#: en/git-config.txt:206
+#: en/git-config.txt:197
#, ignore-same, no-wrap, priority:100
msgid "--expiry-date"
msgstr "--expiry-date"
#. type: Plain text
-#: en/git-config.txt:209
+#: en/git-config.txt:200
#, priority:100
msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:210
+#: en/git-config.txt:201
#, ignore-same, no-wrap, priority:100
msgid "--no-type"
msgstr "--no-type"
#. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:205
#, priority:100
msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable. `--no-type` has no effect without `--type=<type>` or `--<type>`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:223
+#: en/git-config.txt:214
#, priority:100
msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:227
+#: en/git-config.txt:218
#, priority:100
msgid "Output only the names of config variables for `--list` or `--get-regexp`."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:228
+#: en/git-config.txt:219
#, ignore-same, no-wrap, priority:100
msgid "--show-origin"
msgstr "--show-origin"
#. type: Plain text
-#: en/git-config.txt:233
+#: en/git-config.txt:224
#, priority:100
msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:234
+#: en/git-config.txt:225
#, ignore-same, no-wrap, priority:100
msgid "--show-scope"
msgstr "--show-scope"
#. type: Plain text
-#: en/git-config.txt:238
+#: en/git-config.txt:229
#, priority:100
msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:239
+#: en/git-config.txt:230
#, no-wrap, priority:100
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:249
+#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:250
+#: en/git-config.txt:241
#, no-wrap, priority:100
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:247
#, priority:100
msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:260
+#: en/git-config.txt:251
#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:265
+#: en/git-config.txt:256
#, priority:100
msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
msgstr "��克��勻逵筠� �筠畇逵克�棘� 畇剋� 龜鈞劇筠戟筠戟龜� �克逵鈞逵戟戟棘均棘 �逵橘剋逵 克棘戟�龜均��逵�龜龜; `--system`, `--global` 龜剋龜 �筠極棘鈞龜�棘�龜� (極棘 �劇棘剋�逵戟龜�)."
#. type: Labeled list
-#: en/git-config.txt:266
+#: en/git-config.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--[no-]includes"
msgstr "--[no-]includes"
#. type: Plain text
-#: en/git-config.txt:271
+#: en/git-config.txt:262
#, priority:100
msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:272
+#: en/git-config.txt:263
#, no-wrap, priority:100
msgid "--default <value>"
msgstr "--default <鈞戟逵�筠戟龜筠>"
#. type: Plain text
-#: en/git-config.txt:275
+#: en/git-config.txt:266
#, priority:100
msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:281
+#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:288
+#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr "��剋龜 �逵橘剋 戟筠 �克逵鈞逵戟 �勻戟棘 � 極棘劇棘��� `--file`, 'git config' 龜�筠� 極逵�逵劇筠��� 克棘戟�龜均��逵�龜龜 勻 �剋筠畇���龜� �筠����� �逵橘剋逵�:"
#. type: Labeled list
-#: en/git-config.txt:289
+#: en/git-config.txt:280
#, no-wrap, priority:100
msgid "$(prefix)/etc/gitconfig"
msgstr "$(prefix)/etc/gitconfig"
#. type: Plain text
-#: en/git-config.txt:291
+#: en/git-config.txt:282
#, priority:100
msgid "System-wide configuration file."
msgstr "鬼龜��筠劇戟�橘 �逵橘剋 克棘戟�龜均��逵�龜龜."
#. type: Labeled list
-#: en/git-config.txt:292
+#: en/git-config.txt:283
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
msgstr "$XDG_CONFIG_HOME/git/config"
#. type: Plain text
-#: en/git-config.txt:299
+#: en/git-config.txt:290
#, priority:100
msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr "��棘�棘橘 極棘剋�鈞棘勻逵�筠剋��克龜橘 �逵橘剋 克棘戟�龜均��逵�龜龜. ��剋龜 極筠�筠劇筠戟戟逵� $XDG_CONFIG_HOME 戟筠 鈞逵畇逵戟逵 龜剋龜 極���逵, 龜�極棘剋�鈞�筠��� `$HOME/.config/git/config`. ��閨逵� 極筠�筠劇筠戟戟逵� �棘 �克逵剋��戟�劇 鈞戟逵�筠戟龜筠劇 (戟筠 �極龜�棘克) 閨�畇筠� 極筠�筠鈞逵極龜�逵戟逵 逵戟逵剋棘均龜�戟棘橘 極筠�筠劇筠戟戟棘橘, 鈞逵畇逵戟戟棘橘 勻 �逵橘剋筠 `~/.gitconfig`. �筠 �筠克棘劇筠戟畇�筠��� �棘鈞畇逵勻逵�� ��棘� �逵橘剋, 筠�剋龜 勻� 勻�筠劇� 棘� 勻�筠劇筠戟龜 龜�極棘剋�鈞�筠�筠 閨棘剋筠筠 ��逵��筠 勻筠��龜龜 Git, �逵克 克逵克 極棘畇畇筠�菌克逵 ��棘均棘 �逵橘剋逵 閨�剋逵 畇棘閨逵勻剋筠戟逵 戟筠 �逵克 畇逵勻戟棘."
#. type: Labeled list
-#: en/git-config.txt:300
+#: en/git-config.txt:291
#, no-wrap, priority:100
msgid "~/.gitconfig"
msgstr "~/.gitconfig"
#. type: Plain text
-#: en/git-config.txt:303
+#: en/git-config.txt:294
#, priority:100
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:304
+#: en/git-config.txt:295
#, no-wrap, priority:100
msgid "$GIT_DIR/config"
msgstr "$GIT_DIR/config"
#. type: Plain text
-#: en/git-config.txt:306
+#: en/git-config.txt:297
#, priority:100
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:307
+#: en/git-config.txt:298
#, no-wrap, priority:100
msgid "$GIT_DIR/config.worktree"
msgstr "$GIT_DIR/config.worktree"
#. type: Plain text
-#: en/git-config.txt:310
+#: en/git-config.txt:301
#, priority:100
msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:316
+#: en/git-config.txt:307
#, priority:100
msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:320
+#: en/git-config.txt:311
#, priority:100
msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:323
+#: en/git-config.txt:314
#, priority:100
msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:327
+#: en/git-config.txt:318
#, priority:100
msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:333
+#: en/git-config.txt:324
#, priority:100
msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
msgstr ""
#. type: Title -
-#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
#, no-wrap, priority:100
msgid "ENVIRONMENT"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:338
+#: en/git-config.txt:329
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
#. type: Plain text
-#: en/git-config.txt:342
+#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:343
+#: en/git-config.txt:334
#, ignore-same, no-wrap, priority:100
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
-#: en/git-config.txt:346
+#: en/git-config.txt:337
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:355
+#: en/git-config.txt:346
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:362
+#: en/git-config.txt:353
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -15944,7 +15956,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:367 en/git.txt:331
+#: en/git-config.txt:358 en/git.txt:331
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15954,7 +15966,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:372
+#: en/git-config.txt:363
#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
@@ -15964,7 +15976,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:377
+#: en/git-config.txt:368
#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
@@ -15974,7 +15986,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:384
+#: en/git-config.txt:375
#, no-wrap, priority:100
msgid ""
"; HTTP\n"
@@ -15986,157 +15998,157 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:387
+#: en/git-config.txt:378
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:390
+#: en/git-config.txt:381
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:395
+#: en/git-config.txt:386
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:398
+#: en/git-config.txt:389
#, no-wrap, priority:100
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:401
+#: en/git-config.txt:392
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:403
+#: en/git-config.txt:394
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:406
+#: en/git-config.txt:397
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:410
+#: en/git-config.txt:401
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:412
+#: en/git-config.txt:403
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:415
+#: en/git-config.txt:406
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:418 en/git-merge-index.txt:66
+#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:421
+#: en/git-config.txt:412
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:424
+#: en/git-config.txt:415
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:427
+#: en/git-config.txt:418
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:430
+#: en/git-config.txt:421
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:433
+#: en/git-config.txt:424
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:437
+#: en/git-config.txt:428
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:440
+#: en/git-config.txt:431
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:444
+#: en/git-config.txt:435
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:447
+#: en/git-config.txt:438
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:450
+#: en/git-config.txt:441
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:453
+#: en/git-config.txt:444
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:456
+#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:459
+#: en/git-config.txt:450
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:463
+#: en/git-config.txt:454
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:469
+#: en/git-config.txt:460
#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
@@ -16146,13 +16158,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:473
+#: en/git-config.txt:464
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:482
+#: en/git-config.txt:473
#, no-wrap, priority:100
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
@@ -16165,19 +16177,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:487 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1261 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:414
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1261 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:413
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:492
+#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:496
+#: en/git-config.txt:487
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -16185,13 +16197,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:499
+#: en/git-config.txt:490
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:504
+#: en/git-config.txt:495
#, no-wrap, priority:100
msgid ""
" [section.subsection]\n"
@@ -17111,17 +17123,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, fuzzy, priority:100
-#| msgid "Clone a repository into a new directory."
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr "�剋棘戟龜��筠� �筠極棘鈞龜�棘�龜橘 勻 戟棘勻�� 畇龜�筠克�棘�龜�."
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -18864,7 +18869,7 @@ msgid "Only output exact matches (a tag directly references the supplied commit)
msgstr ""
#. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:160
+#: en/git-describe.txt:82 en/git-ls-files.txt:159
#, ignore-same, no-wrap, priority:260
msgid "--debug"
msgstr "--debug"
@@ -18906,7 +18911,7 @@ msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the
msgstr ""
#. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
+#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
#, ignore-same, no-wrap, priority:260
msgid "--always"
msgstr "--always"
@@ -19070,19 +19075,19 @@ msgid "Compares the files in the working tree and the index. When paths are spe
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:120
+#: en/git-diff-files.txt:25 en/git-diff.txt:112
#, no-wrap, priority:280
msgid "-1 --base"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:121
+#: en/git-diff-files.txt:26 en/git-diff.txt:113
#, no-wrap, priority:280
msgid "-2 --ours"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:122
+#: en/git-diff-files.txt:27 en/git-diff.txt:114
#, no-wrap, priority:280
msgid "-3 --theirs"
msgstr ""
@@ -19100,7 +19105,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:103 en/git-log.txt:124
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/git-log.txt:137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19131,9 +19136,9 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
-msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]\n"
-msgstr "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<極���>...]\n"
+#, ignore-ellipsis, no-wrap, priority:100
+msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
+msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:21
@@ -19150,53 +19155,41 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:31
#, priority:100
-msgid "Do not consider the on-disk file at all."
-msgstr ""
-
-#. type: Labeled list
-#: en/git-diff-index.txt:32 en/git-diff-tree.txt:46 en/git-show-branch.txt:83
-#, ignore-same, no-wrap, priority:100
-msgid "--merge-base"
-msgstr "--merge-base"
-
-#. type: Plain text
-#: en/git-diff-index.txt:36
-#, priority:100
-msgid "Instead of comparing <tree-ish> directly, use the merge base between <tree-ish> and HEAD instead. <tree-ish> must be a commit."
+msgid "do not consider the on-disk file at all"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:42
+#: en/git-diff-index.txt:37
#, priority:100
msgid "By default, files recorded in the index but not checked out are reported as deleted. This flag makes 'git diff-index' say that all non-checked-out files are up to date."
msgstr ""
#. type: Title -
-#: en/git-diff-index.txt:46
+#: en/git-diff-index.txt:41
#, no-wrap, priority:100
msgid "OPERATING MODES"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:51
+#: en/git-diff-index.txt:46
#, priority:100
msgid "You can choose whether you want to trust the index file entirely (using the `--cached` flag) or ask the diff logic to show any files that don't match the stat state as being \"tentatively changed\". Both of these operations are very useful indeed."
msgstr ""
#. type: Title -
-#: en/git-diff-index.txt:53
+#: en/git-diff-index.txt:48
#, no-wrap, priority:100
msgid "CACHED MODE"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:55
+#: en/git-diff-index.txt:50
#, priority:100
msgid "If `--cached` is specified, it allows you to ask:"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:58
+#: en/git-diff-index.txt:53
#, no-wrap, priority:100
msgid ""
"\tshow me the differences between HEAD and the current index\n"
@@ -19204,25 +19197,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:63
+#: en/git-diff-index.txt:58
#, priority:100
msgid "For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly *what* you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:65
+#: en/git-diff-index.txt:60
#, no-wrap, priority:100
msgid "\tgit diff-index --cached HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:70
+#: en/git-diff-index.txt:65
#, priority:100
msgid "Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had done an `update-index` to make that effective in the index file. `git diff-files` wouldn't show anything at all, since the index file matches my working directory. But doing a 'git diff-index' does:"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:74
+#: en/git-diff-index.txt:69
#, no-wrap, priority:100
msgid ""
" torvalds@ppc970:~/git> git diff-index --cached HEAD\n"
@@ -19231,37 +19224,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:76
+#: en/git-diff-index.txt:71
#, priority:100
msgid "You can see easily that the above is a rename."
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:80
+#: en/git-diff-index.txt:75
#, priority:100
msgid "In fact, `git diff-index --cached` *should* always be entirely equivalent to actually doing a 'git write-tree' and comparing that. Except this one is much nicer for the case where you just want to check where you are."
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:84
+#: en/git-diff-index.txt:79
#, priority:100
msgid "So doing a `git diff-index --cached` is basically very useful when you are asking yourself \"what have I already marked for being committed, and what's the difference to a previous tree\"."
msgstr ""
#. type: Title -
-#: en/git-diff-index.txt:86
+#: en/git-diff-index.txt:81
#, no-wrap, priority:100
msgid "NON-CACHED MODE"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:91
+#: en/git-diff-index.txt:86
#, priority:100
msgid "The \"non-cached\" mode takes a different approach, and is potentially the more useful of the two in that what it does can't be emulated with a 'git write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached version asks the question:"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:94
+#: en/git-diff-index.txt:89
#, no-wrap, priority:100
msgid ""
" show me the differences between HEAD and the currently checked out\n"
@@ -19269,19 +19262,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:98
+#: en/git-diff-index.txt:93
#, priority:100
msgid "which is obviously a very useful question too, since that tells you what you *could* commit. Again, the output matches the 'git diff-tree -r' output to a tee, but with a twist."
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:104
+#: en/git-diff-index.txt:99
#, priority:100
msgid "The twist is that if some file doesn't match the index, we don't have a backing store thing for it, and we use the magic \"all-zero\" sha1 to show that. So let's say that you have edited `kernel/sched.c`, but have not actually done a 'git update-index' on it yet - there is no \"object\" associated with the new state, and you get:"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:107
+#: en/git-diff-index.txt:102
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n"
@@ -19289,19 +19282,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:112
+#: en/git-diff-index.txt:107
#, priority:100
msgid "i.e., it shows that the tree has changed, and that `kernel/sched.c` is not up to date and may contain new stuff. The all-zero sha1 means that to get the real diff, you need to look at the object in the working directory directly rather than do an object-to-object diff."
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:118
+#: en/git-diff-index.txt:113
#, priority:100
msgid "As with other commands of this type, 'git diff-index' does not actually look at the contents of the file at all. So maybe `kernel/sched.c` hasn't actually changed, and it's just that you touched it. In either case, it's a note that you need to 'git update-index' it to make the index be in sync."
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:124
+#: en/git-diff-index.txt:119
#, priority:100
msgid "You can have a mixture of files show up as \"has been updated\" and \"is still dirty in the working directory\" together. You can always tell which file is in which state, since the \"has been updated\" ones show a valid sha1, and the \"not in sync with the index\" ones will always have the special all-zero sha1."
msgstr ""
@@ -19635,7 +19628,7 @@ msgstr "鬼�逵勻戟筠戟龜筠 �棘畇筠�菌龜劇棘均棘 龜 �筠菌龜劇逵 畇勻棘龜�戟�
#, ignore-ellipsis, no-wrap, priority:100
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"
+"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]\n"
"\t [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
msgstr ""
@@ -19664,7 +19657,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:126 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19694,91 +19687,85 @@ msgid "When `--root` is specified the initial commit will be shown as a big crea
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:50
-#, priority:100
-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
+#: en/git-diff-tree.txt:52
#, priority:100
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
+#: en/git-diff-tree.txt:57
#, priority:100
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
+#: en/git-diff-tree.txt:62
#, priority:100
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
+#: en/git-diff-tree.txt:65
#, priority:100
msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:76
+#: en/git-diff-tree.txt:71
#, priority:100
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
+#: en/git-diff-tree.txt:77
#, priority:100
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
+#: en/git-diff-tree.txt:81
#, priority:100
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
+#: en/git-diff-tree.txt:84
#, ignore-same, no-wrap, priority:100
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
-#: en/git-diff-tree.txt:92
+#: en/git-diff-tree.txt:87
#, priority:100
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
+#: en/git-diff-tree.txt:97
#, priority:100
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
+#: en/git-diff-tree.txt:107
#, priority:100
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: Labeled list
-#: en/git-diff-tree.txt:113 en/git-log.txt:130
+#: en/git-diff-tree.txt:108 en/git-log.txt:143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:119 en/git-log.txt:136
+#: en/git-diff-tree.txt:114 en/git-log.txt:149
#, priority:260
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
+#: en/git-diff-tree.txt:118
#, priority:100
msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
@@ -19800,8 +19787,8 @@ msgstr "git-diff - ��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
"'git diff' [<options>] <blob> <blob>\n"
"'git diff' [<options>] --no-index [--] <path> <path>\n"
@@ -19839,9 +19826,8 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:43
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
-msgid "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]"
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
msgstr "'git diff' [<棘極�龜龜>] --cached [<克棘劇劇龜�>] [--] [<極���>��]"
#. type: Plain text
@@ -19850,130 +19836,117 @@ msgstr "'git diff' [<棘極�龜龜>] --cached [<克棘劇劇龜�>] [--] [<極���>��]
msgid "This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached."
msgstr ""
-#. type: Plain text
-#: en/git-diff.txt:56
-#, priority:280
-msgid "If --merge-base is given, instead of using <commit>, use the merge base of <commit> and HEAD. `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-diff.txt:57
+#: en/git-diff.txt:53
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:64
+#: en/git-diff.txt:60
#, priority:280
msgid "This form is to view the changes you have in your working tree relative to the named <commit>. You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:65
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
-msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
+#: en/git-diff.txt:61
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
msgstr "'git diff' [<棘極�龜龜>] <克棘劇劇龜�> <克棘劇劇龜�> [--] [<極���>��]"
#. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:65
#, priority:280
msgid "This is to view the changes between two arbitrary <commit>."
msgstr ""
-#. type: Plain text
-#: en/git-diff.txt:73
-#, priority:280
-msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side. `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`."
-msgstr ""
-
#. type: Labeled list
-#: en/git-diff.txt:74
+#: en/git-diff.txt:66
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
msgstr "'git diff [<棘極�龜龜>] <克棘劇劇龜�>\\... <克棘劇劇龜�> [--] [<極���>��]"
#. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:74
#, priority:280
-msgid "This form is to view the results of a merge commit. The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents. A convenient way to produce the desired set of revisions is to use the `^@` suffix. For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgid "This form is to view the results of a merge commit. The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents. A convenient way to produce the desired set of revisions is to use the {caret}@ suffix. For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:83
+#: en/git-diff.txt:75
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr "'git diff' [<棘極�龜龜>] <克棘劇劇龜�>..<克棘劇劇龜�> [--] [<極���>��]"
#. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:81
#, priority:280
-msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>. If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
+msgid "This is synonymous to the earlier form (without the \"..\") for viewing the changes between two arbitrary <commit>. If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:82
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr "'git diff [<棘極�龜龜>] <克棘劇劇龜�>\\... <克棘劇劇龜�> [--] [<極���>��]"
#. type: Plain text
-#: en/git-diff.txt:97
+#: en/git-diff.txt:89
#, ignore-ellipsis, priority:280
-msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. `git diff A...B` is equivalent to `git diff $(git merge-base A B) B`. You can omit any one of <commit>, which has the same effect as using HEAD instead."
+msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:102
+#: en/git-diff.txt:94
#, priority:280
-msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
+msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:109
+#: en/git-diff.txt:101
#, ignore-ellipsis, priority:280
-msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (`<commit>..<commit>` and `<commit>...<commit>`) do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
+msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:110
+#: en/git-diff.txt:102
#, no-wrap, priority:280
msgid "'git diff' [<options>] <blob> <blob>"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:114
+#: en/git-diff.txt:106
#, priority:280
msgid "This form is to view the differences between the raw contents of two blob objects."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:128
+#: en/git-diff.txt:120
#, priority:280
msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3). The index contains these stages only for unmerged entries i.e. while resolving conflicts. See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:133
+#: en/git-diff.txt:125
#, priority:280
msgid "Omit diff output for unmerged entries and just show \"Unmerged\". Can be used only when comparing the working tree with the index."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:130
#, priority:280
msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:145
+#: en/git-diff.txt:137
#, no-wrap, priority:280
msgid "Various ways to check your working tree"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:151
+#: en/git-diff.txt:143
#, no-wrap, priority:280
msgid ""
"$ git diff <1>\n"
@@ -19982,31 +19955,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:154
+#: en/git-diff.txt:146
#, priority:280
msgid "Changes in the working tree not yet staged for the next commit."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:156
+#: en/git-diff.txt:148
#, priority:280
-msgid "Changes between the index and your last commit; what you would be committing if you run `git commit` without `-a` option."
+msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:158
+#: en/git-diff.txt:150
#, priority:280
-msgid "Changes in the working tree since your last commit; what you would be committing if you run `git commit -a`"
+msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:159
+#: en/git-diff.txt:151
#, no-wrap, priority:280
msgid "Comparing with arbitrary commits"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:165
+#: en/git-diff.txt:157
#, no-wrap, priority:280
msgid ""
"$ git diff test <1>\n"
@@ -20015,31 +19988,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:169
+#: en/git-diff.txt:161
#, priority:280
msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:172
+#: en/git-diff.txt:164
#, priority:280
msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:173
+#: en/git-diff.txt:165
#, priority:280
msgid "Compare the version before the last commit and the last commit."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:174
+#: en/git-diff.txt:166
#, no-wrap, priority:280
msgid "Comparing branches"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:180
+#: en/git-diff.txt:172
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
@@ -20048,31 +20021,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:183
+#: en/git-diff.txt:175
#, priority:280
msgid "Changes between the tips of the topic and the master branches."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:176 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
#, priority:280
msgid "Same as above."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:186
+#: en/git-diff.txt:178
#, priority:280
msgid "Changes that occurred on the master branch since when the topic branch was started off it."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:187
+#: en/git-diff.txt:179
#, no-wrap, priority:280
msgid "Limiting the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:193
+#: en/git-diff.txt:185
#, no-wrap, priority:280
msgid ""
"$ git diff --diff-filter=MRC <1>\n"
@@ -20081,31 +20054,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:197
+#: en/git-diff.txt:189
#, priority:280
msgid "Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:199
+#: en/git-diff.txt:191
#, priority:280
msgid "Show only names and the nature of change, but not actual diff output."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:192
#, priority:280
msgid "Limit diff output to named subtrees."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:201
+#: en/git-diff.txt:193
#, no-wrap, priority:280
msgid "Munging the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:206
+#: en/git-diff.txt:198
#, no-wrap, priority:280
msgid ""
"$ git diff --find-copies-harder -B -C <1>\n"
@@ -20113,19 +20086,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:210
+#: en/git-diff.txt:202
#, priority:280
msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:211
+#: en/git-diff.txt:203
#, priority:280
msgid "Output diff in reverse."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:221
+#: en/git-diff.txt:213
#, fuzzy, priority:280
#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
@@ -20300,7 +20273,7 @@ msgid "Skip output of blob objects and instead refer to blobs via their original
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:111 en/git-ls-tree.txt:73
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
#, ignore-same, no-wrap, priority:100
msgid "--full-tree"
msgstr "--full-tree"
@@ -20718,16 +20691,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "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."
+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
@@ -22551,17 +22518,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22577,18 +22539,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -23058,7 +23014,7 @@ msgid "Output \"connectivity-ok\" if the received pack is self-contained and con
msgstr ""
#. type: Plain text
-#: en/git-fetch-pack.txt:113 en/git-push.txt:394 en/git-send-pack.txt:63
+#: en/git-fetch-pack.txt:113 en/git-push.txt:370 en/git-send-pack.txt:63
#, priority:220
msgid "Run verbosely."
msgstr ""
@@ -23345,19 +23301,19 @@ msgid "In compact output mode, specified with configuration variable fetch.outpu
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:215 en/git-push.txt:455
+#: en/git-fetch.txt:215 en/git-push.txt:431
#, no-wrap, priority:220
msgid "flag"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:217 en/git-push.txt:457
+#: en/git-fetch.txt:217 en/git-push.txt:433
#, priority:220
msgid "A single character indicating the status of the ref:"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:217 en/git-push.txt:457
+#: en/git-fetch.txt:217 en/git-push.txt:433
#, no-wrap, priority:220
msgid "(space)"
msgstr ""
@@ -23369,19 +23325,19 @@ msgid "for a successfully fetched fast-forward;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:218 en/git-push.txt:458
+#: en/git-fetch.txt:218 en/git-push.txt:434
#, no-wrap, priority:220
msgid "`+`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:219 en/git-push.txt:459
+#: en/git-fetch.txt:219 en/git-push.txt:435
#, priority:220
msgid "for a successful forced update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:219 en/git-push.txt:459
+#: en/git-fetch.txt:219 en/git-push.txt:435
#, ignore-same, no-wrap, priority:220
msgid "`-`"
msgstr "`-`"
@@ -23405,7 +23361,7 @@ msgid "for a successful tag update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:221 en/git-push.txt:460
+#: en/git-fetch.txt:221 en/git-push.txt:436
#, no-wrap, priority:220
msgid "`*`"
msgstr "`*`"
@@ -23417,7 +23373,7 @@ msgid "for a successfully fetched new ref;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:222 en/git-push.txt:461
+#: en/git-fetch.txt:222 en/git-push.txt:437
#, no-wrap, priority:220
msgid "`!`"
msgstr "`!`"
@@ -23429,7 +23385,7 @@ msgid "for a ref that was rejected or failed to update; and"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:223 en/git-push.txt:462
+#: en/git-fetch.txt:223 en/git-push.txt:438
#, no-wrap, priority:220
msgid "`=`"
msgstr "`=`"
@@ -23441,7 +23397,7 @@ msgid "for a ref that was up to date and did not need fetching."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:225 en/git-push.txt:464
+#: en/git-fetch.txt:225 en/git-push.txt:440
#, no-wrap, priority:220
msgid "summary"
msgstr "summary"
@@ -23453,7 +23409,7 @@ msgid "For a successfully fetched ref, the summary shows the old and new values
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:231 en/git-push.txt:492
+#: en/git-fetch.txt:231 en/git-push.txt:468
#, no-wrap, priority:220
msgid "from"
msgstr ""
@@ -23465,7 +23421,7 @@ msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` p
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:236 en/git-push.txt:497 en/git-rebase.txt:1273
+#: en/git-fetch.txt:236 en/git-push.txt:473 en/git-rebase.txt:1273
#, no-wrap, priority:220
msgid "to"
msgstr ""
@@ -23477,7 +23433,7 @@ msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix.
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:240 en/git-push.txt:501
+#: en/git-fetch.txt:240 en/git-push.txt:477
#, no-wrap, priority:220
msgid "reason"
msgstr "極�龜�龜戟逵"
@@ -24286,7 +24242,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:541
#, priority:100
-msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git filter-repo' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameliorates the performance issues a little."
+msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats). While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameliorates the performance issues a little."
msgstr ""
#. type: Title -
@@ -25213,7 +25169,7 @@ msgid "git-format-patch - Prepare patches for e-mail submission"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:35
+#: en/git-format-patch.txt:34
#, no-wrap, priority:100
msgid ""
"'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n"
@@ -25235,629 +25191,622 @@ msgid ""
"\t\t [--no-notes | --notes[=<ref>]]\n"
"\t\t [--interdiff=<previous>]\n"
"\t\t [--range-diff=<previous> [--creation-factor=<percent>]]\n"
-"\t\t [--filename-max-length=<n>]\n"
"\t\t [--progress]\n"
"\t\t [<common diff options>]\n"
"\t\t [ <since> | <revision range> ]\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:43
+#: en/git-format-patch.txt:42
#, priority:100
msgid "Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or for use with 'git am'."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:45
+#: en/git-format-patch.txt:44
#, priority:100
msgid "There are two ways to specify which commits to operate on."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:49
+#: en/git-format-patch.txt:48
#, priority:100
msgid "A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:53
+#: en/git-format-patch.txt:52
#, priority:100
msgid "Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:59
+#: en/git-format-patch.txt:58
#, priority:100
msgid "The first rule takes precedence in the case of a single <commit>. To apply the second rule, i.e., format everything since the beginning of history up until <commit>, use the `--root` option: `git format-patch --root <commit>`. If you want to format only <commit> itself, you can do this with `git format-patch -1 <commit>`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:66
+#: en/git-format-patch.txt:65
#, priority:100
msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:74
+#: en/git-format-patch.txt:73
#, priority:100
msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:78
+#: en/git-format-patch.txt:77
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:82
+#: en/git-format-patch.txt:81
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:87
+#: en/git-format-patch.txt:86
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:93
+#: en/git-format-patch.txt:92
#, no-wrap, priority:100
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:95
+#: en/git-format-patch.txt:94
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:95
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:97
+#: en/git-format-patch.txt:96
#, no-wrap, priority:100
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:100
+#: en/git-format-patch.txt:99
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:102 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:101 en/git-shortlog.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--numbered"
msgstr "--numbered"
#. type: Plain text
-#: en/git-format-patch.txt:104
+#: en/git-format-patch.txt:103
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:106
+#: en/git-format-patch.txt:105
#, ignore-same, no-wrap, priority:100
msgid "--no-numbered"
msgstr "--no-numbered"
#. type: Plain text
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:107
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:109
+#: en/git-format-patch.txt:108
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:110
#, fuzzy, priority:100
msgid "Start numbering the patches at <n> instead of 1."
msgstr "戟逵�逵�� 戟�劇筠�逵�龜� 極逵��筠橘 � <n>, 逵 戟筠 � 1"
#. type: Labeled list
-#: en/git-format-patch.txt:112
+#: en/git-format-patch.txt:111
#, ignore-same, no-wrap, priority:100
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
-#: en/git-format-patch.txt:115
+#: en/git-format-patch.txt:114
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:117
+#: en/git-format-patch.txt:116
#, ignore-same, no-wrap, priority:100
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
-#: en/git-format-patch.txt:120
+#: en/git-format-patch.txt:119
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
+#. type: Plain text
+#: en/git-format-patch.txt:125
+#, priority:100
+msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
+msgstr ""
+
#. type: Labeled list
-#: en/git-format-patch.txt:127 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:126 en/git-pack-objects.txt:59
#, ignore-same, no-wrap, priority:100
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
-#: en/git-format-patch.txt:130
+#: en/git-format-patch.txt:129
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:131
+#: en/git-format-patch.txt:130
#, no-wrap, priority:100
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:134
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:136
+#: en/git-format-patch.txt:135
#, ignore-same, no-wrap, priority:100
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
-#: en/git-format-patch.txt:139
+#: en/git-format-patch.txt:138
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:140
+#: en/git-format-patch.txt:139
#, no-wrap, priority:100
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:144
+#: en/git-format-patch.txt:143
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:145
+#: en/git-format-patch.txt:144
#, no-wrap, priority:100
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:146
+#: en/git-format-patch.txt:145
#, ignore-same, no-wrap, priority:100
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
-#: en/git-format-patch.txt:151
+#: en/git-format-patch.txt:150
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:157
+#: en/git-format-patch.txt:156
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:161
+#: en/git-format-patch.txt:160
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:165
+#: en/git-format-patch.txt:164
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:166
+#: en/git-format-patch.txt:165
#, fuzzy, no-wrap, priority:100
#| msgid "--no-message-id"
msgid "--in-reply-to=<message id>"
msgstr "--no-message-id"
#. type: Plain text
-#: en/git-format-patch.txt:170
+#: en/git-format-patch.txt:169
#, priority:100
msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:171
+#: en/git-format-patch.txt:170
#, ignore-same, no-wrap, priority:100
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
-#: en/git-format-patch.txt:177
+#: en/git-format-patch.txt:176
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:178
+#: en/git-format-patch.txt:177
#, fuzzy, no-wrap, priority:100
#| msgid "--edit-description"
msgid "--cover-from-description=<mode>"
msgstr "--edit-description"
#. type: Plain text
-#: en/git-format-patch.txt:181
+#: en/git-format-patch.txt:180
#, priority:100
msgid "Controls which parts of the cover letter will be automatically populated using the branch's description."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:186
+#: en/git-format-patch.txt:185
#, priority:100
msgid "If `<mode>` is `message` or `default`, the cover letter subject will be populated with placeholder text. The body of the cover letter will be populated with the branch's description. This is the default mode when no configuration nor command line option is specified."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:190
+#: en/git-format-patch.txt:189
#, priority:100
msgid "If `<mode>` is `subject`, the first paragraph of the branch description will populate the cover letter subject. The remainder of the description will populate the body of the cover letter."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:194
+#: en/git-format-patch.txt:193
#, priority:100
msgid "If `<mode>` is `auto`, if the first paragraph of the branch description is greater than 100 bytes, then the mode will be `message`, otherwise `subject` will be used."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:197
+#: en/git-format-patch.txt:196
#, priority:100
msgid "If `<mode>` is `none`, both the cover letter subject and body will be populated with placeholder text."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:198
+#: en/git-format-patch.txt:197
#, no-wrap, priority:100
msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:203
+#: en/git-format-patch.txt:202
#, priority:100
msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:204
-#, no-wrap, priority:100
-msgid "--filename-max-length=<n>"
-msgstr ""
-
-#. type: Plain text
-#: en/git-format-patch.txt:210
-#, priority:100
-msgid "Instead of the standard 64 bytes, chomp the generated output filenames at around '<n>' bytes (too short a value will be silently raised to a reasonable length). Defaults to the value of the `format.filenameMaxLength` configuration variable, or 64 if unconfigured."
-msgstr ""
-
-#. type: Labeled list
-#: en/git-format-patch.txt:211
+#: en/git-format-patch.txt:203
#, ignore-same, no-wrap, priority:100
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
-#: en/git-format-patch.txt:215
+#: en/git-format-patch.txt:207
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:216
+#: en/git-format-patch.txt:208
#, no-wrap, priority:100
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:217
+#: en/git-format-patch.txt:209
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:224
+#: en/git-format-patch.txt:216
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:225
+#: en/git-format-patch.txt:217
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:230
+#: en/git-format-patch.txt:222
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:231
+#: en/git-format-patch.txt:223
#, no-wrap, priority:100
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:236
+#: en/git-format-patch.txt:228
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:237
+#: en/git-format-patch.txt:229
#, ignore-same, no-wrap, priority:100
msgid "--from"
msgstr "--from"
#. type: Labeled list
-#: en/git-format-patch.txt:238
+#: en/git-format-patch.txt:230
#, no-wrap, priority:100
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:244
+#: en/git-format-patch.txt:236
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:251
+#: en/git-format-patch.txt:243
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:252
+#: en/git-format-patch.txt:244
#, no-wrap, priority:100
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:259
+#: en/git-format-patch.txt:251
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:260
+#: en/git-format-patch.txt:252
#, ignore-same, no-wrap, priority:100
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
-#: en/git-format-patch.txt:264
+#: en/git-format-patch.txt:256
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:265
+#: en/git-format-patch.txt:257
#, ignore-same, no-wrap, priority:100
msgid "--encode-email-headers"
msgstr "--encode-email-headers"
#. type: Labeled list
-#: en/git-format-patch.txt:266
+#: en/git-format-patch.txt:258
#, ignore-same, no-wrap, priority:100
msgid "--no-encode-email-headers"
msgstr "--no-encode-email-headers"
#. type: Plain text
-#: en/git-format-patch.txt:271
+#: en/git-format-patch.txt:263
#, priority:100
msgid "Encode email headers that have non-ASCII characters with \"Q-encoding\" (described in RFC 2047), instead of outputting the headers verbatim. Defaults to the value of the `format.encodeEmailHeaders` configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:272
+#: en/git-format-patch.txt:264
#, no-wrap, priority:100
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:280
+#: en/git-format-patch.txt:272
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:281
+#: en/git-format-patch.txt:273
#, no-wrap, priority:100
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:292
+#: en/git-format-patch.txt:284
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:297
+#: en/git-format-patch.txt:289
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:298
+#: en/git-format-patch.txt:290
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:303
+#: en/git-format-patch.txt:295
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:304 en/pretty-options.txt:60
+#: en/git-format-patch.txt:296 en/pretty-options.txt:60
#, no-wrap, priority:260
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:305 en/pretty-options.txt:81
+#: en/git-format-patch.txt:297 en/pretty-options.txt:81
#, ignore-same, no-wrap, priority:260
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
-#: en/git-format-patch.txt:308
+#: en/git-format-patch.txt:300
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:316
+#: en/git-format-patch.txt:308
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:319
+#: en/git-format-patch.txt:311
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:320
+#: en/git-format-patch.txt:312
#, no-wrap, priority:100
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:325
+#: en/git-format-patch.txt:317
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:326
+#: en/git-format-patch.txt:318
#, no-wrap, priority:100
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:328
+#: en/git-format-patch.txt:320
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:329
+#: en/git-format-patch.txt:321
#, no-wrap, priority:100
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:334
+#: en/git-format-patch.txt:326
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:337
+#: en/git-format-patch.txt:329
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:341
+#: en/git-format-patch.txt:333
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:342
+#: en/git-format-patch.txt:334
#, ignore-same, no-wrap, priority:100
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
-#: en/git-format-patch.txt:347
+#: en/git-format-patch.txt:339
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:348
+#: en/git-format-patch.txt:340
#, ignore-same, no-wrap, priority:100
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
-#: en/git-format-patch.txt:351
+#: en/git-format-patch.txt:343
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:352
+#: en/git-format-patch.txt:344
#, fuzzy, no-wrap, priority:100
#| msgid "--no-commit"
msgid "--[no-]base[=<commit>]"
msgstr "--no-commit"
#. type: Plain text
-#: en/git-format-patch.txt:358
+#: en/git-format-patch.txt:350
#, priority:100
msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen. The `--no-base` option overrides a `format.useAutoBase` configuration."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:365
+#: en/git-format-patch.txt:357
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:368
+#: en/git-format-patch.txt:360
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:376
+#: en/git-format-patch.txt:368
#, priority:100
msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:390
+#: en/git-format-patch.txt:382
#, no-wrap, priority:100
msgid ""
"[format]\n"
@@ -25875,13 +25824,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:399
+#: en/git-format-patch.txt:391
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:409
+#: en/git-format-patch.txt:401
#, no-wrap, priority:100
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -25895,7 +25844,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:412
+#: en/git-format-patch.txt:404
#, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25903,7 +25852,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:415
+#: en/git-format-patch.txt:407
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -25911,19 +25860,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:423
+#: en/git-format-patch.txt:415
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:429
+#: en/git-format-patch.txt:421
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:433
+#: en/git-format-patch.txt:425
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
@@ -25931,21 +25880,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:435
+#: en/git-format-patch.txt:427
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:438
+#: en/git-format-patch.txt:430
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:441
+#: en/git-format-patch.txt:433
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -25953,61 +25902,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:449
+#: en/git-format-patch.txt:441
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:451
+#: en/git-format-patch.txt:443
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:454
+#: en/git-format-patch.txt:446
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:456
+#: en/git-format-patch.txt:448
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:459
+#: en/git-format-patch.txt:451
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:461
+#: en/git-format-patch.txt:453
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:465
+#: en/git-format-patch.txt:457
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:468
+#: en/git-format-patch.txt:460
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:470
+#: en/git-format-patch.txt:462
#, priority:100
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:475
+#: en/git-format-patch.txt:467
#, no-wrap, priority:100
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -26017,175 +25966,175 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:477
+#: en/git-format-patch.txt:469
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:482
+#: en/git-format-patch.txt:474
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:487
+#: en/git-format-patch.txt:479
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:495
+#: en/git-format-patch.txt:487
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:497
+#: en/git-format-patch.txt:489
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:500
+#: en/git-format-patch.txt:492
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:502
+#: en/git-format-patch.txt:494
#, no-wrap, priority:100
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:508
+#: en/git-format-patch.txt:500
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:511
+#: en/git-format-patch.txt:503
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:514
+#: en/git-format-patch.txt:506
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:516
+#: en/git-format-patch.txt:508
#, no-wrap, priority:100
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:520
+#: en/git-format-patch.txt:512
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:524
+#: en/git-format-patch.txt:516
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:518
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:534
+#: en/git-format-patch.txt:526
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:536
+#: en/git-format-patch.txt:528
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:538
+#: en/git-format-patch.txt:530
#, priority:100
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:542
+#: en/git-format-patch.txt:534
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:544
+#: en/git-format-patch.txt:536
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:547
+#: en/git-format-patch.txt:539
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:553
+#: en/git-format-patch.txt:545
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:558
+#: en/git-format-patch.txt:550
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:562
+#: en/git-format-patch.txt:554
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:564
+#: en/git-format-patch.txt:556
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:569
+#: en/git-format-patch.txt:561
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:571
+#: en/git-format-patch.txt:563
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:576
+#: en/git-format-patch.txt:568
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:580
+#: en/git-format-patch.txt:572
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:584
+#: en/git-format-patch.txt:576
#, no-wrap, priority:100
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -26193,25 +26142,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:587
+#: en/git-format-patch.txt:579
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:590
+#: en/git-format-patch.txt:582
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:593
+#: en/git-format-patch.txt:585
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:598
+#: en/git-format-patch.txt:590
#, no-wrap, priority:100
msgid ""
"\tmail.html_compose => false\n"
@@ -26220,91 +26169,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:603
+#: en/git-format-patch.txt:595
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:605
+#: en/git-format-patch.txt:597
#, no-wrap, priority:100
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:607
+#: en/git-format-patch.txt:599
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:609
+#: en/git-format-patch.txt:601
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:611
+#: en/git-format-patch.txt:603
#, priority:100
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:614
+#: en/git-format-patch.txt:606
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:616
+#: en/git-format-patch.txt:608
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:619
+#: en/git-format-patch.txt:611
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:621
+#: en/git-format-patch.txt:613
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:630
+#: en/git-format-patch.txt:622
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:636
+#: en/git-format-patch.txt:628
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:640
+#: en/git-format-patch.txt:632
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:643
+#: en/git-format-patch.txt:635
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:650
+#: en/git-format-patch.txt:642
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:656
+#: en/git-format-patch.txt:648
#, no-wrap, priority:100
msgid ""
"base-commit: P\n"
@@ -26314,13 +26263,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:659
+#: en/git-format-patch.txt:651
#, priority:100
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:664
+#: en/git-format-patch.txt:656
#, no-wrap, priority:100
msgid ""
"---P---X---A---M---C\n"
@@ -26329,91 +26278,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:669
+#: en/git-format-patch.txt:661
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:675
+#: en/git-format-patch.txt:667
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:681
+#: en/git-format-patch.txt:673
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:684
+#: en/git-format-patch.txt:676
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:688
+#: en/git-format-patch.txt:680
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:691
+#: en/git-format-patch.txt:683
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:694
+#: en/git-format-patch.txt:686
#, priority:100
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:697
+#: en/git-format-patch.txt:689
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:700
+#: en/git-format-patch.txt:692
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:703
+#: en/git-format-patch.txt:695
#, priority:100
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:706
+#: en/git-format-patch.txt:698
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:713
+#: en/git-format-patch.txt:705
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:716
+#: en/git-format-patch.txt:708
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:719
+#: en/git-format-patch.txt:711
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:724
+#: en/git-format-patch.txt:716
#, ignore-same, priority:100
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
@@ -27265,7 +27214,7 @@ msgid "By default, the command shows the filename for each match. `-h` option i
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:69
+#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
#, ignore-same, no-wrap, priority:100
msgid "--full-name"
msgstr "--full-name"
@@ -27483,7 +27432,7 @@ msgstr "--show-function"
#. type: Plain text
#: en/git-grep.txt:247
#, priority:100
-msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
+msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
@@ -27547,199 +27496,199 @@ msgid "Show <num> leading lines, and place a line containing `--` between contig
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:272
+#: en/git-grep.txt:270
#, priority:100
-msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
+msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:273
+#: en/git-grep.txt:271
#, no-wrap, priority:100
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:276
+#: en/git-grep.txt:274
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:277
+#: en/git-grep.txt:275
#, no-wrap, priority:100
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:279
+#: en/git-grep.txt:277
#, priority:100
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:282
+#: en/git-grep.txt:280
#, priority:100
msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:287
+#: en/git-grep.txt:285
#, priority:100
msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:292
+#: en/git-grep.txt:290
#, priority:100
msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:296
+#: en/git-grep.txt:294
#, priority:100
msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:302
+#: en/git-grep.txt:300
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:303
+#: en/git-grep.txt:301
#, ignore-same, no-wrap, priority:100
msgid "--and"
msgstr "--and"
#. type: Labeled list
-#: en/git-grep.txt:304
+#: en/git-grep.txt:302
#, ignore-same, no-wrap, priority:100
msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:305 en/git-rev-parse.txt:139 en/rev-list-options.txt:133
+#: en/git-grep.txt:303 en/git-rev-parse.txt:135 en/rev-list-options.txt:133
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
#. type: Labeled list
-#: en/git-grep.txt:306
+#: en/git-grep.txt:304
#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:311
+#: en/git-grep.txt:309
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:312 en/rev-list-options.txt:65
+#: en/git-grep.txt:310 en/rev-list-options.txt:65
#, ignore-same, no-wrap, priority:260
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
-#: en/git-grep.txt:316
+#: en/git-grep.txt:314
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:321
+#: en/git-grep.txt:319
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:322
+#: en/git-grep.txt:320
#, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:325
+#: en/git-grep.txt:323
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:329
+#: en/git-grep.txt:327
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:333
+#: en/git-grep.txt:331
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:340
+#: en/git-grep.txt:338
#, no-wrap, priority:100
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:343
+#: en/git-grep.txt:341
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:344
+#: en/git-grep.txt:342
#, no-wrap, priority:100
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:347
+#: en/git-grep.txt:345
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:348
+#: en/git-grep.txt:346
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:351
+#: en/git-grep.txt:349
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:352
+#: en/git-grep.txt:350
#, no-wrap, priority:100
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:354
+#: en/git-grep.txt:352
#, priority:100
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
#. type: Title -
-#: en/git-grep.txt:356
+#: en/git-grep.txt:354
#, no-wrap, priority:100
msgid "NOTES ON THREADS"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:360
+#: en/git-grep.txt:358
#, priority:100
msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:365
+#: en/git-grep.txt:363
#, priority:100
msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
msgstr ""
@@ -30767,327 +30716,345 @@ msgid "Include a line ``log size <number>'' in the output for each commit, where
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:82 en/git-shortlog.txt:92
+#: en/git-log.txt:80
+#, no-wrap, priority:260
+msgid "-L <start>,<end>:<file>"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-log.txt:81
+#, no-wrap, priority:260
+msgid "-L :<funcname>:<file>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:92
+#, priority:260
+msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and <start> and <end> (or <funcname>) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-log.txt:95 en/git-shortlog.txt:92
#, no-wrap, priority:260
msgid "<revision range>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:90
+#: en/git-log.txt:103
#, priority:260
msgid "Show only commits in the specified revision range. When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:91 en/git-shortlog.txt:101
+#: en/git-log.txt:104 en/git-shortlog.txt:101
#, ignore-ellipsis, no-wrap, priority:260
msgid "[--] <path>..."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:96
+#: en/git-log.txt:109
#, priority:260
msgid "Show only commits that are enough to explain how the files that match the specified paths came to be. See 'History Simplification' below for details and other simplification modes."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:99 en/git-shortlog.txt:107
+#: en/git-log.txt:112 en/git-shortlog.txt:107
#, priority:260
msgid "Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises."
msgstr ""
#. type: Title -
-#: en/git-log.txt:105
+#: en/git-log.txt:118
#, fuzzy, no-wrap, priority:260
#| msgid "CONFIGURATION"
msgid "DIFF FORMATTING"
msgstr "���圭��叫��揆�赳"
#. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:122
#, priority:260
msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:116
+#: en/git-log.txt:129
#, priority:260
msgid "Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits will never show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which merges are treated like normal single-parent commits (this can be overridden by providing a combined-diff option or with `--no-diff-merges`)."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:123
+#: en/git-log.txt:136
#, priority:260
msgid "With this option, diff output for a merge commit 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. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:129
+#: en/git-log.txt:142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:144
+#: en/git-log.txt:157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:145
+#: en/git-log.txt:158
#, fuzzy, no-wrap, priority:260
#| msgid "diffmerge"
msgid "--diff-merges=off"
msgstr "diffmerge"
#. type: Labeled list
-#: en/git-log.txt:146
+#: en/git-log.txt:159
#, ignore-same, no-wrap, priority:260
msgid "--no-diff-merges"
msgstr "--no-diff-merges"
#. type: Plain text
-#: en/git-log.txt:149
+#: en/git-log.txt:162
#, priority:260
msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:157
+#: en/git-log.txt:170
#, no-wrap, priority:260
msgid "`git log --no-merges`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:160
+#: en/git-log.txt:173
#, priority:260
msgid "Show the whole commit history, but skip any merges"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:161
+#: en/git-log.txt:174
#, no-wrap, priority:260
msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:165
+#: en/git-log.txt:178
#, priority:260
msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:166
+#: en/git-log.txt:179
#, no-wrap, priority:260
msgid "`git log --since=\"2 weeks ago\" -- gitk`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:171
+#: en/git-log.txt:184
#, priority:260
msgid "Show the changes during the last two weeks to the file 'gitk'. The `--` is necessary to avoid confusion with the *branch* named 'gitk'"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:172
+#: en/git-log.txt:185
#, no-wrap, priority:260
msgid "`git log --name-status release..test`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:177
+#: en/git-log.txt:190
#, priority:260
msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:178
+#: en/git-log.txt:191
#, no-wrap, priority:260
msgid "`git log --follow builtin/rev-list.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:183
+#: en/git-log.txt:196
#, priority:260
msgid "Shows the commits that changed `builtin/rev-list.c`, including those commits that occurred before the file was given its present name."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:184
+#: en/git-log.txt:197
#, no-wrap, priority:260
msgid "`git log --branches --not --remotes=origin`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:189
+#: en/git-log.txt:202
#, priority:260
msgid "Shows all commits that are in any of local branches but not in any of remote-tracking branches for 'origin' (what you have that origin doesn't)."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:190
+#: en/git-log.txt:203
#, no-wrap, priority:260
msgid "`git log master --not --remotes=*/master`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:194
+#: en/git-log.txt:207
#, priority:260
msgid "Shows all commits that are in local master but not in any remote repository master branches."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:195
+#: en/git-log.txt:208
#, no-wrap, priority:260
msgid "`git log -p -m --first-parent`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:202
+#: en/git-log.txt:215
#, priority:260
msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges. This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:203
+#: en/git-log.txt:216
#, no-wrap, priority:260
msgid "`git log -L '/int main/',/^}/:main.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:207
+#: en/git-log.txt:220
#, priority:260
msgid "Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:208
+#: en/git-log.txt:221
#, no-wrap, priority:260
msgid "`git log -3`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:211
+#: en/git-log.txt:224
#, priority:260
msgid "Limits the number of commits to show to 3."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:222
+#: en/git-log.txt:235
#, priority:260
msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:223
+#: en/git-log.txt:236
#, ignore-same, no-wrap, priority:260
msgid "format.pretty"
msgstr "format.pretty"
#. type: Plain text
-#: en/git-log.txt:226
+#: en/git-log.txt:239
#, priority:260
msgid "Default for the `--format` option. (See 'Pretty Formats' above.) Defaults to `medium`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:227
+#: en/git-log.txt:240
#, ignore-same, no-wrap, priority:260
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
#. type: Plain text
-#: en/git-log.txt:231
+#: en/git-log.txt:244
#, priority:260
msgid "Encoding to use when displaying logs. (See 'Discussion' above.) Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:232
+#: en/git-log.txt:245
#, ignore-same, no-wrap, priority:260
msgid "log.date"
msgstr "log.date"
#. type: Plain text
-#: en/git-log.txt:236
+#: en/git-log.txt:249
#, priority:260
msgid "Default format for human-readable dates. (Compare the `--date` option.) Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:240
+#: en/git-log.txt:253
#, priority:260
msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:241
+#: en/git-log.txt:254
#, ignore-same, no-wrap, priority:260
msgid "log.follow"
msgstr "log.follow"
#. type: Plain text
-#: en/git-log.txt:246
+#: en/git-log.txt:259
#, priority:260
msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:247
+#: en/git-log.txt:260
#, ignore-same, no-wrap, priority:260
msgid "log.showRoot"
msgstr "log.showRoot"
#. type: Plain text
-#: en/git-log.txt:252
+#: en/git-log.txt:265
#, priority:260
msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event. Any root commits in `git log -p` output would be shown without a diff attached. The default is `true`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:253
+#: en/git-log.txt:266
#, ignore-same, no-wrap, priority:260
msgid "log.showSignature"
msgstr "log.showSignature"
#. type: Plain text
-#: en/git-log.txt:256
+#: en/git-log.txt:269
#, priority:260
msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:257
+#: en/git-log.txt:270
#, no-wrap, priority:260
msgid "mailmap.*"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:259
+#: en/git-log.txt:272
#, priority:260
msgid "See linkgit:git-shortlog[1]."
msgstr "鬼劇棘��龜 linkgit:git-shortlog[1]."
#. type: Labeled list
-#: en/git-log.txt:260 en/git-notes.txt:333
+#: en/git-log.txt:273 en/git-notes.txt:333
#, no-wrap, priority:260
msgid "notes.displayRef"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:265
+#: en/git-log.txt:278
#, priority:260
msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands. See linkgit:git-notes[1]."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:269
+#: en/git-log.txt:282
#, priority:260
msgid "May be an unabbreviated ref name or a glob and may be specified multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:273
+#: en/git-log.txt:286
#, priority:260
msgid "This setting can be disabled by the `--no-notes` option, overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option."
msgstr ""
@@ -31118,7 +31085,7 @@ msgid ""
"\t\t[--exclude-standard]\n"
"\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n"
"\t\t[--full-name] [--recurse-submodules]\n"
-"\t\t[--abbrev[=<n>]] [--] [<file>...]\n"
+"\t\t[--abbrev] [--] [<file>...]\n"
msgstr ""
#. type: Plain text
@@ -31440,73 +31407,73 @@ msgid "Recursively calls ls-files on each active submodule in the repository. C
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:159 en/git-ls-tree.txt:68
+#: en/git-ls-files.txt:158 en/git-ls-tree.txt:67
#, priority:100
-msgid "Instead of showing the full 40-byte hexadecimal object lines, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. Non default number of digits can be specified with --abbrev=<n>."
+msgid "Instead of showing the full 40-byte hexadecimal object lines, show only a partial prefix. Non default number of digits can be specified with --abbrev=<n>."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:165
+#: en/git-ls-files.txt:164
#, priority:100
msgid "After each line that describes a file, add more data about its cache entry. This is intended to show as much information as possible for manual inspection; the exact format may change at any time."
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:166
+#: en/git-ls-files.txt:165
#, ignore-same, no-wrap, priority:100
msgid "--eol"
msgstr "--eol"
#. type: Plain text
-#: en/git-ls-files.txt:171
+#: en/git-ls-files.txt:170
#, priority:100
msgid "Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content identification used by Git when the \"text\" attribute is \"auto\" (or not set and core.autocrlf is not false). <eolinfo> is either \"-text\", \"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:174
+#: en/git-ls-files.txt:173
#, priority:100
msgid "\"\" means the file is not a regular file, it is not in the index or not accessible in the working tree."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:178
+#: en/git-ls-files.txt:177
#, priority:100
msgid "<eolattr> is the attribute that is used when checking out or committing, it is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text eol=crlf\". Since Git 2.10 \"text=auto eol=lf\" and \"text=auto eol=crlf\" are supported."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:182
+#: en/git-ls-files.txt:181
#, priority:100
msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree (\"w/<eolinfo>\") are shown for regular files, followed by the (\"attr/<eolattr>\")."
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:186 en/git.txt:374 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:374 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:189
+#: en/git-ls-files.txt:188
#, priority:100
msgid "Files to show. If no files are given all files which match the other specified criteria are shown."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:194
+#: en/git-ls-files.txt:193
#, priority:100
msgid "'git ls-files' just outputs the filenames unless `--stage` is specified in which case it outputs:"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:196
+#: en/git-ls-files.txt:195
#, no-wrap, priority:100
msgid " [<tag> ]<mode> <object> <stage> <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:199
+#: en/git-ls-files.txt:198
#, no-wrap, priority:100
msgid ""
"'git ls-files --eol' will show\n"
@@ -31514,61 +31481,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:202
+#: en/git-ls-files.txt:201
#, priority:100
msgid "'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:208
+#: en/git-ls-files.txt:207
#, priority:100
msgid "For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see linkgit:git-read-tree[1] for more information on state)"
msgstr ""
#. type: Title -
-#: en/git-ls-files.txt:216
+#: en/git-ls-files.txt:215
#, no-wrap, priority:100
msgid "EXCLUDE PATTERNS"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:222
+#: en/git-ls-files.txt:221
#, priority:100
msgid "'git ls-files' can use a list of \"exclude patterns\" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified. linkgit:gitignore[5] specifies the format of exclude patterns."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:224
+#: en/git-ls-files.txt:223
#, priority:100
msgid "These exclude patterns come from these places, in order:"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:228
+#: en/git-ls-files.txt:227
#, priority:100
msgid "The command-line flag --exclude=<pattern> specifies a single pattern. Patterns are ordered in the same order they appear in the command line."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:232
+#: en/git-ls-files.txt:231
#, priority:100
msgid "The command-line flag --exclude-from=<file> specifies a file containing a list of patterns. Patterns are ordered in the same order they appear in the file."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:238
+#: en/git-ls-files.txt:237
#, priority:100
msgid "The command-line flag --exclude-per-directory=<name> specifies a name of the file in each directory 'git ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:244
+#: en/git-ls-files.txt:243
#, priority:100
msgid "A pattern specified on the command line with --exclude or read from the file specified with --exclude-from is relative to the top of the directory tree. A pattern read from a file specified by --exclude-per-directory is relative to the directory that the pattern file appears in."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:248
+#: en/git-ls-files.txt:247
#, ignore-same, priority:100
msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
@@ -31808,61 +31775,61 @@ msgid "List only filenames (instead of the \"long\" output), one per line."
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:72
+#: en/git-ls-tree.txt:71
#, priority:100
msgid "Instead of showing the path names relative to the current working directory, show the full path names."
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:76
+#: en/git-ls-tree.txt:75
#, priority:100
msgid "Do not limit the listing to the current working directory. Implies --full-name."
msgstr ""
#. type: Labeled list
-#: en/git-ls-tree.txt:77
+#: en/git-ls-tree.txt:76
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:81
+#: en/git-ls-tree.txt:80
#, priority:100
msgid "When paths are given, show them (note that this isn't really raw pathnames, but rather a list of patterns to match). Otherwise implicitly uses the root level of the tree as the sole path argument."
msgstr ""
#. type: Title -
-#: en/git-ls-tree.txt:84
+#: en/git-ls-tree.txt:83
#, no-wrap, priority:100
msgid "Output Format"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:86
+#: en/git-ls-tree.txt:85
#, no-wrap, priority:100
msgid " <mode> SP <type> SP <object> TAB <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:89
+#: en/git-ls-tree.txt:88
#, priority:100
msgid "This output format is compatible with what `--index-info --stdin` of 'git update-index' expects."
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:91
+#: en/git-ls-tree.txt:90
#, priority:100
msgid "When the `-l` option is used, format changes to"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:93
+#: en/git-ls-tree.txt:92
#, no-wrap, priority:100
msgid " <mode> SP <type> SP <object> SP <object size> TAB <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:97
+#: en/git-ls-tree.txt:96
#, priority:100
msgid "Object size identified by <object> is given in bytes, and right-justified with minimum width of 7 characters. Object size is given only for blobs (file) entries; for other entries `-` character is used in place of size."
msgstr ""
@@ -33975,7 +33942,7 @@ msgid "If conflicts arise and a strategy for automatically resolving conflicting
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:112 en/git-worktree.txt:123
+#: en/git-notes.txt:112 en/git-worktree.txt:122
#, ignore-same, no-wrap, priority:240
msgid "remove"
msgstr "remove"
@@ -33987,7 +33954,7 @@ msgid "Remove the notes for given objects (defaults to HEAD). When giving zero o
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:118 en/git-worktree.txt:119
+#: en/git-notes.txt:118 en/git-worktree.txt:118
#, ignore-same, no-wrap, priority:240
msgid "prune"
msgstr "prune"
@@ -34101,7 +34068,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
+#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:119
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -35199,7 +35166,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:423
#, priority:100
-msgid "The `p4-post-changelist` hook is invoked after the submit has successfully occurred in P4. It takes no parameters and is meant primarily for notification and cannot affect the outcome of the git p4 submit action."
+msgid "The `p4-post-changelist` hook is invoked after the submit has successfully occured in P4. It takes no parameters and is meant primarily for notification and cannot affect the outcome of the git p4 submit action."
msgstr ""
#. type: Title ~
@@ -36796,7 +36763,7 @@ msgid "Show progress."
msgstr "極棘克逵鈞逵�� 極�棘均�筠�� 勻�極棘剋戟筠戟龜�"
#. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:230
+#: en/git-prune.txt:48 en/git-worktree.txt:229
#, no-wrap, priority:240
msgid "--expire <time>"
msgstr "--expire <勻�筠劇�>"
@@ -37205,7 +37172,7 @@ msgid ""
"\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
"\t [-u | --set-upstream] [-o <string> | --push-option=<string>]\n"
"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
-"\t [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n"
+"\t [--force-with-lease[=<refname>[:<expect>]]]\n"
"\t [--no-verify] [<repository> [<refspec>...]]\n"
msgstr ""
@@ -37602,275 +37569,239 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:331
#, priority:220
-msgid "Alternatively, specifying `--force-if-includes` as an ancillary option along with `--force-with-lease[=<refname>]` (i.e., without saying what exact commit the ref on the remote side must be pointing at, or which refs on the remote side are being protected) at the time of \"push\" will verify if updates from the remote-tracking refs that may have been implicitly updated in the background are integrated locally before allowing a forced update."
-msgstr ""
-
-#. type: Plain text
-#: en/git-push.txt:339
-#, priority:220
msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when `--force-with-lease` option is used, the command refuses to update a remote ref whose current value does not match what is expected."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:342
+#: en/git-push.txt:334
#, priority:220
msgid "This flag disables these checks, and can cause the remote repository to lose commits; use it with care."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:351
+#: en/git-push.txt:343
#, ignore-ellipsis, priority:220
msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:352
-#, ignore-same, no-wrap, priority:220
-msgid "--[no-]force-if-includes"
-msgstr "--[no-]force-if-includes"
-
-#. type: Plain text
-#: en/git-push.txt:355
-#, priority:220
-msgid "Force an update only if the tip of the remote-tracking ref has been integrated locally."
-msgstr ""
-
-#. type: Plain text
-#: en/git-push.txt:361
-#, priority:220
-msgid "This option enables a check that verifies if the tip of the remote-tracking ref is reachable from one of the \"reflog\" entries of the local branch based in it for a rewrite. The check ensures that any updates from the remote have been incorporated locally by rejecting the forced update if that is not the case."
-msgstr ""
-
-#. type: Plain text
-#: en/git-push.txt:365
-#, priority:220
-msgid "If the option is passed without specifying `--force-with-lease`, or specified along with `--force-with-lease=<refname>:<expect>`, it is a \"no-op\"."
-msgstr ""
-
-#. type: Plain text
-#: en/git-push.txt:367
-#, priority:220
-msgid "Specifying `--no-force-if-includes` disables this behavior."
-msgstr ""
-
-#. type: Labeled list
-#: en/git-push.txt:368
+#: en/git-push.txt:344
#, no-wrap, priority:220
msgid "--repo=<repository>"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:371
+#: en/git-push.txt:347
#, priority:220
msgid "This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:378
+#: en/git-push.txt:354
#, priority:220
msgid "For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:379
+#: en/git-push.txt:355
#, ignore-same, no-wrap, priority:220
msgid "--[no-]thin"
msgstr "--[no-]thin"
#. type: Plain text
-#: en/git-push.txt:384
+#: en/git-push.txt:360
#, priority:220
msgid "These options are passed to linkgit:git-send-pack[1]. A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is `--thin`."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:390
+#: en/git-push.txt:366
#, priority:220
msgid "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:402
+#: en/git-push.txt:378
#, no-wrap, priority:220
msgid "--recurse-submodules=check|on-demand|only|no"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:416
+#: en/git-push.txt:392
#, priority:220
msgid "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If 'check' is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If 'on-demand' is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all submodules will be recursively pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:417
+#: en/git-push.txt:393
#, ignore-same, no-wrap, priority:220
msgid "--[no-]verify"
msgstr "--[no-]verify"
#. type: Plain text
-#: en/git-push.txt:421
+#: en/git-push.txt:397
#, priority:220
msgid "Toggle the pre-push hook (see linkgit:githooks[5]). The default is --verify, giving the hook a chance to prevent the push. With --no-verify, the hook is bypassed completely."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:438
+#: en/git-push.txt:414
#, priority:220
msgid "The output of \"git push\" depends on the transport method used; this section describes the output when pushing over the Git protocol (either locally or via ssh)."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:441
+#: en/git-push.txt:417
#, priority:220
msgid "The status of the push is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:444
+#: en/git-push.txt:420
#, no-wrap, priority:220
msgid " <flag> <summary> <from> -> <to> (<reason>)\n"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:447
+#: en/git-push.txt:423
#, priority:220
msgid "If --porcelain is used, then each line of the output is of the form:"
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:450
+#: en/git-push.txt:426
#, no-wrap, priority:220
msgid " <flag> \\t <from>:<to> \\t <summary> (<reason>)\n"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:454
+#: en/git-push.txt:430
#, priority:220
msgid "The status of up-to-date refs is shown only if --porcelain or --verbose option is used."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:458
+#: en/git-push.txt:434
#, priority:220
msgid "for a successfully pushed fast-forward;"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:460
+#: en/git-push.txt:436
#, priority:220
msgid "for a successfully deleted ref;"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:461
+#: en/git-push.txt:437
#, priority:220
msgid "for a successfully pushed new ref;"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:462
+#: en/git-push.txt:438
#, priority:220
msgid "for a ref that was rejected or failed to push; and"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:463
+#: en/git-push.txt:439
#, priority:220
msgid "for a ref that was up to date and did not need pushing."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:469
+#: en/git-push.txt:445
#, ignore-ellipsis, priority:220
msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:471
+#: en/git-push.txt:447
#, priority:220
msgid "For a failed update, more details are given:"
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:473
+#: en/git-push.txt:449
#, fuzzy, no-wrap, priority:220
msgid "rejected"
msgstr "rejected"
#. type: Plain text
-#: en/git-push.txt:476
+#: en/git-push.txt:452
#, priority:220
msgid "Git did not try to send the ref at all, typically because it is not a fast-forward and you did not force the update."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:477
+#: en/git-push.txt:453
#, fuzzy, no-wrap, priority:220
msgid "remote rejected"
msgstr "remote rejected"
#. type: Plain text
-#: en/git-push.txt:485
+#: en/git-push.txt:461
#, priority:220
msgid "The remote end refused the update. Usually caused by a hook on the remote side, or because the remote repository has one of the following safety options in effect: `receive.denyCurrentBranch` (for pushes to the checked out branch), `receive.denyNonFastForwards` (for forced non-fast-forward updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:486
+#: en/git-push.txt:462
#, fuzzy, no-wrap, priority:220
msgid "remote failure"
msgstr "remote failure"
#. type: Plain text
-#: en/git-push.txt:490
+#: en/git-push.txt:466
#, priority:220
msgid "The remote end did not report the successful update of the ref, perhaps because of a temporary error on the remote side, a break in the network connection, or other transient error."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:496
+#: en/git-push.txt:472
#, priority:220
msgid "The name of the local ref being pushed, minus its `refs/<type>/` prefix. In the case of deletion, the name of the local ref is omitted."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:500
+#: en/git-push.txt:476
#, priority:220
msgid "The name of the remote ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:505
+#: en/git-push.txt:481
#, priority:220
msgid "A human-readable explanation. In the case of successfully pushed refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Title -
-#: en/git-push.txt:507
+#: en/git-push.txt:483
#, no-wrap, priority:220
msgid "NOTE ABOUT FAST-FORWARDS"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:512
+#: en/git-push.txt:488
#, priority:220
msgid "When an update changes a branch (or more in general, a ref) that used to point at commit A to point at another commit B, it is called a fast-forward update if and only if B is a descendant of A."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:516
+#: en/git-push.txt:492
#, priority:220
msgid "In a fast-forward update from A to B, the set of commits that the original commit A built on top of is a subset of the commits the new commit B builds on top of. Hence, it does not lose any history."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:521
+#: en/git-push.txt:497
#, priority:220
msgid "In contrast, a non-fast-forward update will lose history. For example, suppose you and somebody else started at the same commit X, and you built a history leading to commit B while the other person built a history leading to commit A. The history looks like this:"
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:527
+#: en/git-push.txt:503
#, no-wrap, priority:220
msgid ""
" B\n"
@@ -37879,43 +37810,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:533
+#: en/git-push.txt:509
#, priority:220
msgid "Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:536
+#: en/git-push.txt:512
#, priority:220
msgid "The push done by the other person updated the branch that used to point at commit X to point at commit A. It is a fast-forward."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:541
+#: en/git-push.txt:517
#, priority:220
msgid "But if you try to push, you will attempt to update the branch (that now points at A) with commit B. This does _not_ fast-forward. If you did so, the changes introduced by commit A will be lost, because everybody will now start building on top of B."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:544
+#: en/git-push.txt:520
#, priority:220
msgid "The command by default does not allow an update that is not a fast-forward to prevent such loss of history."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:549
+#: en/git-push.txt:525
#, priority:220
msgid "If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:553
+#: en/git-push.txt:529
#, priority:220
msgid "You can perform \"git pull\", resolve potential conflicts, and \"git push\" the result. A \"git pull\" will create a merge commit C between commits A and B."
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:559
+#: en/git-push.txt:535
#, no-wrap, priority:220
msgid ""
" B---C\n"
@@ -37924,19 +37855,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:564
+#: en/git-push.txt:540
#, priority:220
msgid "Updating A with the resulting merge commit will fast-forward and your push will be accepted."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:569
+#: en/git-push.txt:545
#, priority:220
msgid "Alternatively, you can rebase your change between X and B on top of A, with \"git pull --rebase\", and push the result back. The rebase will create a new commit D that builds the change between X and B on top of A."
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:575
+#: en/git-push.txt:551
#, no-wrap, priority:220
msgid ""
" B D\n"
@@ -37945,169 +37876,169 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:580
+#: en/git-push.txt:556
#, priority:220
msgid "Again, updating A with this commit will fast-forward and your push will be accepted."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:591
+#: en/git-push.txt:567
#, priority:220
msgid "There is another common situation where you may encounter non-fast-forward rejection when you try to push, and it is possible even when you are pushing into a repository nobody else pushes into. After you push commit A yourself (in the first picture in this section), replace it with \"git commit --amend\" to produce commit B, and you try to push it out, because forgot that you have pushed A out already. In such a case, and only if you are certain that nobody in the meantime fetched your earlier commit A (and started building on top of it), you can run \"git push --force\" to overwrite it. In other words, \"git push --force\" is a method reserved for a case where you do mean to lose history."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:596
+#: en/git-push.txt:572
#, no-wrap, priority:220
msgid "`git push`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:600
+#: en/git-push.txt:576
#, priority:220
msgid "Works like `git push <remote>`, where <remote> is the current branch's remote (or `origin`, if no remote is configured for the current branch)."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:601
+#: en/git-push.txt:577
#, no-wrap, priority:220
msgid "`git push origin`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:606
+#: en/git-push.txt:582
#, priority:220
msgid "Without additional configuration, pushes the current branch to the configured upstream (`remote.origin.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:610
+#: en/git-push.txt:586
#, priority:220
msgid "The default behavior of this command when no <refspec> is given can be configured by setting the `push` option of the remote, or the `push.default` configuration variable."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:615
+#: en/git-push.txt:591
#, priority:220
msgid "For example, to default to pushing only the current branch to `origin` use `git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in the examples below) can be configured as the default for `git push origin`."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:616
+#: en/git-push.txt:592
#, no-wrap, priority:220
msgid "`git push origin :`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:620
+#: en/git-push.txt:596
#, priority:220
msgid "Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,OPTIONS>> section above for a description of \"matching\" branches."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:621
+#: en/git-push.txt:597
#, no-wrap, priority:220
msgid "`git push origin master`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:627
+#: en/git-push.txt:603
#, priority:220
msgid "Find a ref that matches `master` in the source repository (most likely, it would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/master`) in `origin` repository with it. If `master` did not exist remotely, it would be created."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:628
+#: en/git-push.txt:604
#, no-wrap, priority:220
msgid "`git push origin HEAD`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:631
+#: en/git-push.txt:607
#, priority:220
msgid "A handy way to push the current branch to the same name on the remote."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:632
+#: en/git-push.txt:608
#, no-wrap, priority:220
msgid "`git push mothership master:satellite/master dev:satellite/dev`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:637
+#: en/git-push.txt:613
#, priority:220
msgid "Use the source ref that matches `master` (e.g. `refs/heads/master`) to update the ref that matches `satellite/master` (most probably `refs/remotes/satellite/master`) in the `mothership` repository; do the same for `dev` and `satellite/dev`."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:640
+#: en/git-push.txt:616
#, ignore-ellipsis, priority:220
msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:647
+#: en/git-push.txt:623
#, priority:220
msgid "This is to emulate `git fetch` run on the `mothership` using `git push` that is run in the opposite direction in order to integrate the work done on `satellite`, and is often necessary when you can only make connection in one way (i.e. satellite can ssh into mothership but mothership cannot initiate connection to satellite because the latter is behind a firewall or does not run sshd)."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:652
+#: en/git-push.txt:628
#, priority:220
msgid "After running this `git push` on the `satellite` machine, you would ssh into the `mothership` and run `git merge` there to complete the emulation of `git pull` that were run on `mothership` to pull changes made on `satellite`."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:653
+#: en/git-push.txt:629
#, no-wrap, priority:220
msgid "`git push origin HEAD:master`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:657
+#: en/git-push.txt:633
#, priority:220
msgid "Push the current branch to the remote ref matching `master` in the `origin` repository. This form is convenient to push the current branch without thinking about its local name."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:658
+#: en/git-push.txt:634
#, no-wrap, priority:220
msgid "`git push origin master:refs/heads/experimental`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:664
+#: en/git-push.txt:640
#, priority:220
msgid "Create the branch `experimental` in the `origin` repository by copying the current `master` branch. This form is only needed to create a new branch or tag in the remote repository when the local name and the remote name are different; otherwise, the ref name on its own will work."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:665
+#: en/git-push.txt:641
#, no-wrap, priority:220
msgid "`git push origin :experimental`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:668
+#: en/git-push.txt:644
#, priority:220
msgid "Find a ref that matches `experimental` in the `origin` repository (e.g. `refs/heads/experimental`), and delete it."
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:669
+#: en/git-push.txt:645
#, no-wrap, priority:220
msgid "`git push origin +dev:master`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:674
+#: en/git-push.txt:650
#, priority:220
msgid "Update the origin repository's master branch with the dev branch, allowing non-fast-forward updates. *This can leave unreferenced commits dangling in the origin repository.* Consider the following situation, where a fast-forward is not possible:"
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:679
+#: en/git-push.txt:655
#, no-wrap, priority:220
msgid ""
"\t o---o---o---A---B origin/master\n"
@@ -38116,13 +38047,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:682
+#: en/git-push.txt:658
#, priority:220
msgid "The above command would change the origin repository to"
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:687
+#: en/git-push.txt:663
#, no-wrap, priority:220
msgid ""
"\t\t A---B (unnamed branch)\n"
@@ -38131,7 +38062,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:692
+#: en/git-push.txt:668
#, priority:220
msgid "Commits A and B would no longer belong to a branch with a symbolic name, and so would be unreachable. As such, these commits would be removed by a `git gc` command on the origin repository."
msgstr ""
@@ -39544,7 +39475,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:502
#, priority:100
-msgid "Add a `Signed-off-by` trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
+msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
@@ -39698,13 +39629,13 @@ msgid "If the `--autosquash` option is enabled by default using the configuratio
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:613 en/merge-options.txt:154
+#: en/git-rebase.txt:613 en/merge-options.txt:163
#, ignore-same, no-wrap, priority:240
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-rebase.txt:614 en/merge-options.txt:155
+#: en/git-rebase.txt:614 en/merge-options.txt:164
#, ignore-same, no-wrap, priority:240
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -39871,284 +39802,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap, priority:100
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -40224,7 +40032,7 @@ msgid "finish something worthy of a commit"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:840 en/git-update-ref.txt:136
+#: en/git-rebase.txt:840 en/git-update-ref.txt:135
#, fuzzy, no-wrap, priority:100
msgid "commit"
msgstr "`commit`"
@@ -42176,29 +41984,11 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:210
#, priority:220
-msgid "On success, the exit status is `0`."
-msgstr ""
-
-#. type: Plain text
-#: en/git-remote.txt:214
-#, priority:220
-msgid "When subcommands such as 'add', 'rename', and 'remove' can't find the remote in question, the exit status is `2`. When the remote already exists, the exit status is `3`."
-msgstr ""
-
-#. type: Plain text
-#: en/git-remote.txt:216
-#, priority:220
-msgid "On any other error, the exit status may be any other non-zero value."
-msgstr ""
-
-#. type: Plain text
-#: en/git-remote.txt:221
-#, priority:220
msgid "Add a new remote, fetch, and check out a branch from it"
msgstr ""
#. type: delimited block -
-#: en/git-remote.txt:246
+#: en/git-remote.txt:235
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"$ git remote\n"
@@ -42227,13 +42017,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-remote.txt:249
+#: en/git-remote.txt:238
#, priority:220
msgid "Imitate 'git clone' but track only selected branches"
msgstr ""
#. type: delimited block -
-#: en/git-remote.txt:256
+#: en/git-remote.txt:245
#, no-wrap, priority:220
msgid ""
"$ mkdir project.git\n"
@@ -42244,7 +42034,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-remote.txt:264
+#: en/git-remote.txt:253
#, ignore-same, priority:220
msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
@@ -43926,97 +43716,97 @@ msgid "If not specified, the contents are restored from `HEAD` if `--staged` is
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:54
+#: en/git-restore.txt:50
#, priority:100
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:57
+#: en/git-restore.txt:53
#, priority:100
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
-#: en/git-restore.txt:60
+#: en/git-restore.txt:56
#, no-wrap, priority:100
msgid "-S"
msgstr ""
#. type: Labeled list
-#: en/git-restore.txt:61
+#: en/git-restore.txt:57
#, ignore-same, no-wrap, priority:100
msgid "--staged"
msgstr "--staged"
#. type: Plain text
-#: en/git-restore.txt:65
+#: en/git-restore.txt:61
#, priority:100
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:69
+#: en/git-restore.txt:65
#, priority:100
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:81
+#: en/git-restore.txt:77
#, priority:100
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:85
+#: en/git-restore.txt:81
#, priority:100
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:90
+#: en/git-restore.txt:86
#, priority:100
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
-#: en/git-restore.txt:98
+#: en/git-restore.txt:94
#, ignore-same, no-wrap, priority:100
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
-#: en/git-restore.txt:103
+#: en/git-restore.txt:99
#, priority:100
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:110
+#: en/git-restore.txt:106
#, priority:100
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:121
+#: en/git-restore.txt:117
#, priority:100
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:128
+#: en/git-restore.txt:124
#, priority:100
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:156
+#: en/git-restore.txt:152
#, priority:100
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:162
+#: en/git-restore.txt:158
#, no-wrap, priority:100
msgid ""
"$ git switch master\n"
@@ -44026,91 +43816,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:166
+#: en/git-restore.txt:162
#, priority:100
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:169
+#: en/git-restore.txt:165
#, priority:100
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:172
+#: en/git-restore.txt:168
#, no-wrap, priority:100
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:178
+#: en/git-restore.txt:174
#, priority:100
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:180
+#: en/git-restore.txt:176
#, priority:100
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:183
+#: en/git-restore.txt:179
#, no-wrap, priority:100
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:187
+#: en/git-restore.txt:183
#, priority:100
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:190
+#: en/git-restore.txt:186
#, no-wrap, priority:100
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:194
+#: en/git-restore.txt:190
#, priority:100
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:197
+#: en/git-restore.txt:193
#, no-wrap, priority:100
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:201
+#: en/git-restore.txt:197
#, priority:100
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:204
+#: en/git-restore.txt:200
#, no-wrap, priority:100
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:207
+#: en/git-restore.txt:203
#, priority:100
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:210
+#: en/git-restore.txt:206
#, no-wrap, priority:100
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:216
+#: en/git-restore.txt:212
#, ignore-same, priority:100
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -44458,547 +44248,541 @@ msgid "If you want to make sure that the output actually names an object in your
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:116
-#, priority:100
-msgid "Note that if you are verifying a name from an untrusted source, it is wise to use `--end-of-options` so that the name argument is not mistaken for another option."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-parse.txt:123
+#: en/git-rev-parse.txt:119
#, priority:100
msgid "Only meaningful in `--verify` mode. Do not output an error message if the first argument is not a valid object name; instead exit with non-zero status silently. SHA-1s for valid object names are printed to stdout on success."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:124
+#: en/git-rev-parse.txt:120
#, ignore-same, no-wrap, priority:100
msgid "--sq"
msgstr "--sq"
#. type: Plain text
-#: en/git-rev-parse.txt:132
+#: en/git-rev-parse.txt:128
#, priority:100
msgid "Usually the output is made one line per flag and parameter. This option makes output a single line, properly quoted for consumption by shell. Useful when you expect your parameter to contain whitespaces and newlines (e.g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to the `--sq-quote` option, the command input is still interpreted as usual."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:133
+#: en/git-rev-parse.txt:129
#, no-wrap, priority:100
msgid "--short[=length]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:138
+#: en/git-rev-parse.txt:134
#, priority:100
msgid "Same as `--verify` but shortens the object name to a unique prefix with at least `length` characters. The minimum length is 4, the default is the effective value of the `core.abbrev` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:143
+#: en/git-rev-parse.txt:139
#, priority:100
msgid "When showing object names, prefix them with '{caret}' and strip '{caret}' prefix from the object names that already have one."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:144
+#: en/git-rev-parse.txt:140
#, no-wrap, priority:100
msgid "--abbrev-ref[=(strict|loose)]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:148
+#: en/git-rev-parse.txt:144
#, priority:100
msgid "A non-ambiguous short name of the objects name. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:149
+#: en/git-rev-parse.txt:145
#, ignore-same, no-wrap, priority:100
msgid "--symbolic"
msgstr "--symbolic"
#. type: Plain text
-#: en/git-rev-parse.txt:153
+#: en/git-rev-parse.txt:149
#, priority:100
msgid "Usually the object names are output in SHA-1 form (with possible '{caret}' prefix); this option makes them output in a form as close to the original input as possible."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:154
+#: en/git-rev-parse.txt:150
#, ignore-same, no-wrap, priority:100
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
#. type: Plain text
-#: en/git-rev-parse.txt:161
+#: en/git-rev-parse.txt:157
#, priority:100
msgid "This is similar to --symbolic, but it omits input that are not refs (i.e. branch or tag names; or more explicitly disambiguating \"heads/master\" form, when you want to name the \"master\" branch when there is an unfortunately named tag \"master\"), and show them as full refnames (e.g. \"refs/heads/master\")."
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:163
+#: en/git-rev-parse.txt:159
#, no-wrap, priority:100
msgid "Options for Objects"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:167
+#: en/git-rev-parse.txt:163
#, priority:100
msgid "Show all refs found in `refs/`."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:168
+#: en/git-rev-parse.txt:164
#, no-wrap, priority:100
msgid "--branches[=pattern]"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:169
+#: en/git-rev-parse.txt:165
#, no-wrap, priority:100
msgid "--tags[=pattern]"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:170
+#: en/git-rev-parse.txt:166
#, no-wrap, priority:100
msgid "--remotes[=pattern]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:174
+#: en/git-rev-parse.txt:170
#, priority:100
msgid "Show all branches, tags, or remote-tracking branches, respectively (i.e., refs found in `refs/heads`, `refs/tags`, or `refs/remotes`, respectively)."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:178
+#: en/git-rev-parse.txt:174
#, priority:100
msgid "If a `pattern` is given, only refs matching the given shell glob are shown. If the pattern does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:179
+#: en/git-rev-parse.txt:175
#, no-wrap, priority:100
msgid "--glob=pattern"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:185
+#: en/git-rev-parse.txt:181
#, priority:100
msgid "Show all refs matching the shell glob pattern `pattern`. If the pattern does not start with `refs/`, this is automatically prepended. If the pattern does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:186 en/rev-list-options.txt:165
+#: en/git-rev-parse.txt:182 en/rev-list-options.txt:165
#, no-wrap, priority:260
msgid "--exclude=<glob-pattern>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:193 en/rev-list-options.txt:173
+#: en/git-rev-parse.txt:189 en/rev-list-options.txt:173
#, priority:260
msgid "Do not include refs matching '<glob-pattern>' that the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. Repetitions of this option accumulate exclusion patterns up to the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options or arguments do not clear accumulated patterns)."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:199 en/rev-list-options.txt:179
+#: en/git-rev-parse.txt:195 en/rev-list-options.txt:179
#, priority:260
msgid "The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:200
+#: en/git-rev-parse.txt:196
#, no-wrap, priority:100
msgid "--disambiguate=<prefix>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:205
+#: en/git-rev-parse.txt:201
#, priority:100
msgid "Show every object whose name begins with the given prefix. The <prefix> must be at least 4 hexadecimal digits long to avoid listing each and every object in the repository by mistake."
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:207
+#: en/git-rev-parse.txt:203
#, no-wrap, priority:100
msgid "Options for Files"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:209
+#: en/git-rev-parse.txt:205
#, ignore-same, no-wrap, priority:100
msgid "--local-env-vars"
msgstr "--local-env-vars"
#. type: Plain text
-#: en/git-rev-parse.txt:214
+#: en/git-rev-parse.txt:210
#, priority:100
msgid "List the GIT_* environment variables that are local to the repository (e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR). Only the names of the variables are listed, not their value, even if they are set."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:215
+#: en/git-rev-parse.txt:211
#, ignore-same, no-wrap, priority:100
msgid "--git-dir"
msgstr "--git-dir"
#. type: Plain text
-#: en/git-rev-parse.txt:219
+#: en/git-rev-parse.txt:215
#, priority:100
msgid "Show `$GIT_DIR` if defined. Otherwise show the path to the .git directory. The path shown, when relative, is relative to the current working directory."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:223
+#: en/git-rev-parse.txt:219
#, priority:100
msgid "If `$GIT_DIR` is not defined and the current directory is not detected to lie in a Git repository or work tree print a message to stderr and exit with nonzero status."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:224
+#: en/git-rev-parse.txt:220
#, ignore-same, no-wrap, priority:100
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
#. type: Plain text
-#: en/git-rev-parse.txt:227
+#: en/git-rev-parse.txt:223
#, priority:100
msgid "Like `--git-dir`, but its output is always the canonicalized absolute path."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:228
+#: en/git-rev-parse.txt:224
#, ignore-same, no-wrap, priority:100
msgid "--git-common-dir"
msgstr "--git-common-dir"
#. type: Plain text
-#: en/git-rev-parse.txt:230
+#: en/git-rev-parse.txt:226
#, priority:100
msgid "Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:231
+#: en/git-rev-parse.txt:227
#, ignore-same, no-wrap, priority:100
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
#. type: Plain text
-#: en/git-rev-parse.txt:234
+#: en/git-rev-parse.txt:230
#, priority:100
msgid "When the current working directory is below the repository directory print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:235
+#: en/git-rev-parse.txt:231
#, ignore-same, no-wrap, priority:100
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
#. type: Plain text
-#: en/git-rev-parse.txt:238
+#: en/git-rev-parse.txt:234
#, priority:100
msgid "When the current working directory is inside the work tree of the repository print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:239
+#: en/git-rev-parse.txt:235
#, ignore-same, no-wrap, priority:100
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
#. type: Plain text
-#: en/git-rev-parse.txt:241
+#: en/git-rev-parse.txt:237
#, priority:100
msgid "When the repository is bare print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:242
+#: en/git-rev-parse.txt:238
#, ignore-same, no-wrap, priority:100
msgid "--is-shallow-repository"
msgstr "--is-shallow-repository"
#. type: Plain text
-#: en/git-rev-parse.txt:244
+#: en/git-rev-parse.txt:240
#, priority:100
msgid "When the repository is shallow print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:245
+#: en/git-rev-parse.txt:241
#, no-wrap, priority:100
msgid "--resolve-git-dir <path>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:250
+#: en/git-rev-parse.txt:246
#, priority:100
msgid "Check if <path> is a valid repository or a gitfile that points at a valid repository, and print the location of the repository. If <path> is a gitfile then the resolved path to the real repository is printed."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:251
+#: en/git-rev-parse.txt:247
#, no-wrap, priority:100
msgid "--git-path <path>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:257
+#: en/git-rev-parse.txt:253
#, ignore-ellipsis, priority:100
msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:258
+#: en/git-rev-parse.txt:254
#, ignore-same, no-wrap, priority:100
msgid "--show-cdup"
msgstr "--show-cdup"
#. type: Plain text
-#: en/git-rev-parse.txt:262
+#: en/git-rev-parse.txt:258
#, priority:100
msgid "When the command is invoked from a subdirectory, show the path of the top-level directory relative to the current directory (typically a sequence of \"../\", or an empty string)."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:263
+#: en/git-rev-parse.txt:259
#, ignore-same, no-wrap, priority:100
msgid "--show-prefix"
msgstr "--show-prefix"
#. type: Plain text
-#: en/git-rev-parse.txt:267
+#: en/git-rev-parse.txt:263
#, priority:100
msgid "When the command is invoked from a subdirectory, show the path of the current directory relative to the top-level directory."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:268
+#: en/git-rev-parse.txt:264
#, ignore-same, no-wrap, priority:100
msgid "--show-toplevel"
msgstr "--show-toplevel"
#. type: Plain text
-#: en/git-rev-parse.txt:271
+#: en/git-rev-parse.txt:267
#, priority:100
msgid "Show the absolute path of the top-level directory of the working tree. If there is no working tree, report an error."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:272
+#: en/git-rev-parse.txt:268
#, ignore-same, no-wrap, priority:100
msgid "--show-superproject-working-tree"
msgstr "--show-superproject-working-tree"
#. type: Plain text
-#: en/git-rev-parse.txt:277
+#: en/git-rev-parse.txt:273
#, priority:100
msgid "Show the absolute path of the root of the superproject's working tree (if exists) that uses the current repository as its submodule. Outputs nothing if the current repository is not used as a submodule by any project."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:278
+#: en/git-rev-parse.txt:274
#, ignore-same, no-wrap, priority:100
msgid "--shared-index-path"
msgstr "--shared-index-path"
#. type: Plain text
-#: en/git-rev-parse.txt:281
+#: en/git-rev-parse.txt:277
#, priority:100
msgid "Show the path to the shared index file in split index mode, or empty if not in split-index mode."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:282
+#: en/git-rev-parse.txt:278
#, no-wrap, priority:100
msgid "--show-object-format[=(storage|input|output)]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:287
+#: en/git-rev-parse.txt:283
#, priority:100
msgid "Show the object format (hash algorithm) used for the repository for storage inside the `.git` directory, input, or output. For input, multiple algorithms may be printed, space-separated. If not specified, the default is \"storage\"."
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:290
+#: en/git-rev-parse.txt:286
#, no-wrap, priority:100
msgid "Other Options"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:292
+#: en/git-rev-parse.txt:288
#, no-wrap, priority:100
msgid "--since=datestring"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:293
+#: en/git-rev-parse.txt:289
#, no-wrap, priority:100
msgid "--after=datestring"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:296
+#: en/git-rev-parse.txt:292
#, priority:100
msgid "Parse the date string, and output the corresponding --max-age= parameter for 'git rev-list'."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:297
+#: en/git-rev-parse.txt:293
#, no-wrap, priority:100
msgid "--until=datestring"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:298
+#: en/git-rev-parse.txt:294
#, no-wrap, priority:100
msgid "--before=datestring"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:301
+#: en/git-rev-parse.txt:297
#, priority:100
msgid "Parse the date string, and output the corresponding --min-age= parameter for 'git rev-list'."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:302
+#: en/git-rev-parse.txt:298
#, ignore-ellipsis, no-wrap, priority:100
msgid "<args>..."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:304
+#: en/git-rev-parse.txt:300
#, priority:100
msgid "Flags and parameters to be parsed."
msgstr ""
#. type: Title -
-#: en/git-rev-parse.txt:309
+#: en/git-rev-parse.txt:305
#, no-wrap, priority:100
msgid "PARSEOPT"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:314
+#: en/git-rev-parse.txt:310
#, priority:100
msgid "In `--parseopt` mode, 'git rev-parse' helps massaging options to bring to shell scripts the same facilities C builtins have. It works as an option normalizer (e.g. splits single switches aggregate values), a bit like `getopt(1)` does."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:319
+#: en/git-rev-parse.txt:315
#, priority:100
msgid "It takes on the standard input the specification of the options to parse and understand, and echoes on the standard output a string suitable for `sh(1)` `eval` to replace the arguments with normalized ones. In case of error, it outputs usage on the standard error stream, and exits with code 129."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:322
+#: en/git-rev-parse.txt:318
#, priority:100
msgid "Note: Make sure you quote the result when passing it to `eval`. See below for an example."
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:324
+#: en/git-rev-parse.txt:320
#, no-wrap, priority:100
msgid "Input Format"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:330
+#: en/git-rev-parse.txt:326
#, priority:100
msgid "'git rev-parse --parseopt' input format is fully text based. It has two parts, separated by a line that contains only `--`. The lines before the separator (should be one or more) are used for the usage. The lines after the separator describe the options."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:332
+#: en/git-rev-parse.txt:328
#, priority:100
msgid "Each line of options has this format:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:335
+#: en/git-rev-parse.txt:331
#, no-wrap, priority:100
msgid "<opt-spec><flags>*<arg-hint>? SP+ help LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:337
+#: en/git-rev-parse.txt:333
#, no-wrap, priority:100
msgid "`<opt-spec>`"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:342
+#: en/git-rev-parse.txt:338
#, priority:100
msgid "its format is the short option character, then the long option name separated by a comma. Both parts are not required, though at least one is necessary. May not contain any of the `<flags>` characters. `h,help`, `dry-run` and `f` are examples of correct `<opt-spec>`."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:343
+#: en/git-rev-parse.txt:339
#, no-wrap, priority:100
msgid "`<flags>`"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:345
+#: en/git-rev-parse.txt:341
#, priority:100
msgid "`<flags>` are of `*`, `=`, `?` or `!`."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:346
+#: en/git-rev-parse.txt:342
#, priority:100
msgid "Use `=` if the option takes an argument."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:350
+#: en/git-rev-parse.txt:346
#, priority:100
msgid "Use `?` to mean that the option takes an optional argument. You probably want to use the `--stuck-long` mode to be able to unambiguously parse the optional argument."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:354
+#: en/git-rev-parse.txt:350
#, priority:100
msgid "Use `*` to mean that this option should not be listed in the usage generated for the `-h` argument. It's shown for `--help-all` as documented in linkgit:gitcli[7]."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:356
+#: en/git-rev-parse.txt:352
#, priority:100
msgid "Use `!` to not make the corresponding negated long option available."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:357
+#: en/git-rev-parse.txt:353
#, no-wrap, priority:100
msgid "`<arg-hint>`"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:362
+#: en/git-rev-parse.txt:358
#, priority:100
msgid "`<arg-hint>`, if specified, is used as a name of the argument in the help output, for options that take arguments. `<arg-hint>` is terminated by the first whitespace. It is customary to use a dash to separate words in a multi-word argument hint."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:365
+#: en/git-rev-parse.txt:361
#, priority:100
msgid "The remainder of the line, after stripping the spaces, is used as the help associated to the option."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:369
+#: en/git-rev-parse.txt:365
#, priority:100
msgid "Blank lines are ignored, and lines that don't match this specification are used as option group headers (start the line with a space to create such lines on purpose)."
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:376
+#: en/git-rev-parse.txt:372
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"OPTS_SPEC=\"\\\n"
@@ -45006,7 +44790,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:378
+#: en/git-rev-parse.txt:374
#, no-wrap, priority:100
msgid ""
"some-command does foo and bar!\n"
@@ -45014,13 +44798,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:380
+#: en/git-rev-parse.txt:376
#, no-wrap, priority:100
msgid "h,help show the help\n"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:385
+#: en/git-rev-parse.txt:381
#, no-wrap, priority:100
msgid ""
"foo some nifty option --foo\n"
@@ -45030,7 +44814,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:388
+#: en/git-rev-parse.txt:384
#, no-wrap, priority:100
msgid ""
" An option group Header\n"
@@ -45038,37 +44822,37 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:390
+#: en/git-rev-parse.txt:386
#, no-wrap, priority:100
msgid "eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\n"
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:394
+#: en/git-rev-parse.txt:390
#, no-wrap, priority:100
msgid "Usage text"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:398
+#: en/git-rev-parse.txt:394
#, priority:100
msgid "When `\"$@\"` is `-h` or `--help` in the above example, the following usage text would be shown:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:401
+#: en/git-rev-parse.txt:397
#, ignore-ellipsis, no-wrap, priority:100
msgid "usage: some-command [<options>] <args>...\n"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:403
+#: en/git-rev-parse.txt:399
#, no-wrap, priority:100
msgid " some-command does foo and bar!\n"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:409
+#: en/git-rev-parse.txt:405
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" -h, --help show the help\n"
@@ -45079,7 +44863,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:412
+#: en/git-rev-parse.txt:408
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"An option group Header\n"
@@ -45087,25 +44871,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rev-parse.txt:415
+#: en/git-rev-parse.txt:411
#, no-wrap, priority:100
msgid "SQ-QUOTE"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:421
+#: en/git-rev-parse.txt:417
#, priority:100
msgid "In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single line suitable for `sh(1)` `eval`. This line is made by normalizing the arguments following `--sq-quote`. Nothing other than quoting the arguments is done."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:425
+#: en/git-rev-parse.txt:421
#, priority:100
msgid "If you want command input to still be interpreted as usual by 'git rev-parse' before the output is shell quoted, see the `--sq` option."
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:437
+#: en/git-rev-parse.txt:433
#, no-wrap, priority:100
msgid ""
"$ cat >your-git-script.sh <<\\EOF\n"
@@ -45118,55 +44902,55 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:439
+#: en/git-rev-parse.txt:435
#, no-wrap, priority:100
msgid "$ sh your-git-script.sh \"a b'c\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:445
+#: en/git-rev-parse.txt:441
#, priority:100
msgid "Print the object name of the current commit:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:448
+#: en/git-rev-parse.txt:444
#, no-wrap, priority:100
msgid "$ git rev-parse --verify HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:451
+#: en/git-rev-parse.txt:447
#, priority:100
msgid "Print the commit object name from the revision in the $REV shell variable:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:454
+#: en/git-rev-parse.txt:450
#, no-wrap, priority:100
-msgid "$ git rev-parse --verify --end-of-options $REV^{commit}\n"
+msgid "$ git rev-parse --verify $REV^{commit}\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:457
+#: en/git-rev-parse.txt:453
#, priority:100
msgid "This will error out if $REV is empty or not a valid revision."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:459
+#: en/git-rev-parse.txt:455
#, priority:100
msgid "Similar to above:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:462
+#: en/git-rev-parse.txt:458
#, no-wrap, priority:100
-msgid "$ git rev-parse --default master --verify --end-of-options $REV\n"
+msgid "$ git rev-parse --default master --verify $REV\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:465
+#: en/git-rev-parse.txt:461
#, priority:100
msgid "but if $REV is empty, the commit object name from master will be printed."
msgstr ""
@@ -45990,7 +45774,7 @@ msgstr "--[no-]signed-off-by-cc"
#. type: Plain text
#: en/git-send-email.txt:319
#, priority:100
-msgid "If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines to the cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc."
+msgid "If this is set, add emails found in Signed-off-by: or Cc: lines to the cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc."
msgstr ""
#. type: Labeled list
@@ -46056,7 +45840,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:345
#, priority:100
-msgid "'sob' will avoid including anyone mentioned in the Signed-off-by trailers except for self (use 'self' for that)."
+msgid "'sob' will avoid including anyone mentioned in Signed-off-by lines except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
@@ -47123,6 +46907,12 @@ msgstr ""
msgid "Synonym to `--more=-1`"
msgstr "�龜戟棘戟龜劇 畇剋� more=-1"
+#. type: Labeled list
+#: en/git-show-branch.txt:83
+#, ignore-same, no-wrap, priority:100
+msgid "--merge-base"
+msgstr "--merge-base"
+
#. type: Plain text
#: en/git-show-branch.txt:89
#, priority:100
@@ -49440,16 +49230,10 @@ msgstr ""
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49464,28 +49248,16 @@ msgstr ""
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49500,20 +49272,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -51224,7 +50986,7 @@ msgstr "--use-log-author"
#. type: Plain text
#: en/git-svn.txt:706
#, priority:100
-msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
+msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string."
msgstr ""
#. type: Plain text
@@ -51242,7 +51004,7 @@ msgstr "--add-author-from"
#. type: Plain text
#: en/git-svn.txt:716
#, priority:100
-msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
+msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
msgstr ""
#. type: Plain text
@@ -51984,91 +51746,97 @@ msgid "$ git switch -c <branch> --track <remote>/<branch>\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:113
+#: en/git-switch.txt:106
+#, priority:100
+msgid "`--guess` is the default behavior. Use `--no-guess` to disable it."
+msgstr ""
+
+#. type: Plain text
+#: en/git-switch.txt:110
#, priority:100
msgid "An alias for `--discard-changes`."
msgstr ""
#. type: Labeled list
-#: en/git-switch.txt:114
+#: en/git-switch.txt:111
#, ignore-same, no-wrap, priority:100
msgid "--discard-changes"
msgstr "--discard-changes"
#. type: Plain text
-#: en/git-switch.txt:120
+#: en/git-switch.txt:117
#, priority:100
msgid "Proceed even if the index or the working tree differs from `HEAD`. Both the index and working tree are restored to match the switching target. If `--recurse-submodules` is specified, submodule content is also restored to match the switching target. This is used to throw away local changes."
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:130
+#: en/git-switch.txt:127
#, priority:100
msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:159
+#: en/git-switch.txt:156
#, priority:100
msgid "When creating a new branch, set up \"upstream\" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:169
+#: en/git-switch.txt:166
#, priority:100
msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-c` in such a case."
msgstr ""
#. type: Labeled list
-#: en/git-switch.txt:174
+#: en/git-switch.txt:171
#, fuzzy, no-wrap, priority:100
msgid "--orphan <new-branch>"
msgstr "[戟棘勻逵� 勻筠�克逵]"
#. type: Plain text
-#: en/git-switch.txt:177
+#: en/git-switch.txt:174
#, priority:100
msgid "Create a new 'orphan' branch, named `<new-branch>`. All tracked files are removed."
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:183
+#: en/git-switch.txt:180
#, priority:100
msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:192
+#: en/git-switch.txt:189
#, priority:100
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:197
+#: en/git-switch.txt:194
#, priority:100
msgid "The following command switches to the \"master\" branch:"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:200
+#: en/git-switch.txt:197
#, no-wrap, priority:100
msgid "$ git switch master\n"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:207
+#: en/git-switch.txt:204
#, no-wrap, priority:100
msgid "$ git switch mytopic\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:212
+#: en/git-switch.txt:209
#, priority:100
msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above switch would fail like this:"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:216
+#: en/git-switch.txt:213
#, no-wrap, priority:100
msgid ""
"$ git switch mytopic\n"
@@ -52076,7 +51844,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:224
+#: en/git-switch.txt:221
#, no-wrap, priority:100
msgid ""
"$ git switch -m mytopic\n"
@@ -52084,25 +51852,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:232
+#: en/git-switch.txt:229
#, priority:100
msgid "To switch back to the previous branch before we switched to mytopic (i.e. \"master\" branch):"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:235
+#: en/git-switch.txt:232
#, no-wrap, priority:100
msgid "$ git switch -\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:239
+#: en/git-switch.txt:236
#, priority:100
msgid "You can grow a new branch from any commit. For example, switch to \"HEAD~3\" and create branch \"fixup\":"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:243
+#: en/git-switch.txt:240
#, no-wrap, priority:100
msgid ""
"$ git switch -c fixup HEAD~3\n"
@@ -52110,13 +51878,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:247
+#: en/git-switch.txt:244
#, priority:100
msgid "If you want to start a new branch from a remote branch of the same name:"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:252
+#: en/git-switch.txt:249
#, no-wrap, priority:100
msgid ""
"$ git switch new-topic\n"
@@ -52125,13 +51893,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:256
+#: en/git-switch.txt:253
#, priority:100
msgid "To check out commit `HEAD~3` for temporary inspection or experiment without creating a new branch:"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:260
+#: en/git-switch.txt:257
#, no-wrap, priority:100
msgid ""
"$ git switch --detach HEAD~3\n"
@@ -52139,19 +51907,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:264
+#: en/git-switch.txt:261
#, priority:100
msgid "If it turns out whatever you have done is worth keeping, you can always create a new name for it (without switching away):"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:267
+#: en/git-switch.txt:264
#, no-wrap, priority:100
msgid "$ git switch -c good-surprises\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:273
+#: en/git-switch.txt:270
#, ignore-same, priority:100
msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
@@ -53752,16 +53520,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54593,18 +54355,11 @@ msgid "See linkgit:git-repack[1] for options to generate new packs and replace e
msgstr ""
#. type: Plain text
-#: en/git-unpack-objects.txt:32
+#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:33
-#, fuzzy, priority:100
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
-
#. type: Plain text
#: en/git-unpack-objects.txt:37
#, priority:100
@@ -54701,16 +54456,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54725,22 +54474,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -55715,92 +55452,92 @@ msgid "Modify behavior of the next command naming a <ref>. The only valid optio
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:130
+#: en/git-update-ref.txt:129
#, priority:100
-msgid "Start a transaction. In contrast to a non-transactional session, a transaction will automatically abort if the session ends without an explicit commit. This command may create a new empty transaction when the current one has been committed or aborted already."
+msgid "Start a transaction. In contrast to a non-transactional session, a transaction will automatically abort if the session ends without an explicit commit."
msgstr ""
#. type: Labeled list
-#: en/git-update-ref.txt:131
+#: en/git-update-ref.txt:130
#, no-wrap, priority:100
msgid "prepare"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:135
+#: en/git-update-ref.txt:134
#, priority:100
msgid "Prepare to commit the transaction. This will create lock files for all queued reference updates. If one reference could not be locked, the transaction will be aborted."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:139
+#: en/git-update-ref.txt:138
#, priority:100
msgid "Commit all reference updates queued for the transaction, ending the transaction."
msgstr ""
#. type: Labeled list
-#: en/git-update-ref.txt:140
+#: en/git-update-ref.txt:139
#, fuzzy, no-wrap, priority:100
#| msgid "--abort"
msgid "abort"
msgstr "--abort"
#. type: Plain text
-#: en/git-update-ref.txt:143
+#: en/git-update-ref.txt:142
#, priority:100
msgid "Abort the transaction, releasing all locks if the transaction is in prepared state."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:149
+#: en/git-update-ref.txt:148
#, priority:100
msgid "If all <ref>s can be locked with matching <oldvalue>s simultaneously, all modifications are performed. Otherwise, no modifications are performed. Note that while each individual <ref> is updated or deleted atomically, a concurrent reader may still see a subset of the modifications."
msgstr ""
#. type: Title -
-#: en/git-update-ref.txt:151
+#: en/git-update-ref.txt:150
#, no-wrap, priority:100
msgid "LOGGING UPDATES"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:159
+#: en/git-update-ref.txt:158
#, priority:100
msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or a pseudoref like HEAD or ORIG_HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:161
+#: en/git-update-ref.txt:160
#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:166
+#: en/git-update-ref.txt:165
#, priority:100
msgid "Where \"oldsha1\" is the 40 character hexadecimal value previously stored in <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and \"committer\" is the committer's name, email address and date in the standard Git committer ident format."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:168
+#: en/git-update-ref.txt:167
#, priority:100
msgid "Optionally with -m:"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:170
+#: en/git-update-ref.txt:169
#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer TAB message LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:173
+#: en/git-update-ref.txt:172
#, priority:100
msgid "Where all fields are as described above and \"message\" is the value supplied to the -m option."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:177
+#: en/git-update-ref.txt:176
#, priority:100
msgid "An update will fail (without changing <ref>) if the current user is unable to create a new log file, append to the existing log file or does not have committer information available."
msgstr ""
@@ -56723,379 +56460,379 @@ msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` use
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:102
+#: en/git-worktree.txt:101
#, priority:240
-msgid "List details of each working tree. The main working tree is listed first, followed by each of the linked working trees. The output details include whether the working tree is bare, the revision currently checked out, the branch currently checked out (or \"detached HEAD\" if none), and \"locked\" if the worktree is locked."
+msgid "List details of each working tree. The main working tree is listed first, followed by each of the linked working trees. The output details include whether the working tree is bare, the revision currently checked out, and the branch currently checked out (or \"detached HEAD\" if none)."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:103
+#: en/git-worktree.txt:102
#, ignore-same, no-wrap, priority:240
msgid "lock"
msgstr "lock"
#. type: Plain text
-#: en/git-worktree.txt:110
+#: en/git-worktree.txt:109
#, priority:240
msgid "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted. Optionally, specify a reason for the lock with `--reason`."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:111
+#: en/git-worktree.txt:110
#, ignore-same, no-wrap, priority:240
msgid "move"
msgstr "move"
#. type: Plain text
-#: en/git-worktree.txt:118
+#: en/git-worktree.txt:117
#, priority:240
msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved with this command. (The `git worktree repair` command, however, can reestablish the connection with linked working trees if you move the main working tree manually.)"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:122
+#: en/git-worktree.txt:121
#, priority:240
msgid "Prune working tree information in `$GIT_DIR/worktrees`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:129
+#: en/git-worktree.txt:128
#, priority:240
msgid "Remove a working tree. Only clean working trees (no untracked files and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:129
#, ignore-ellipsis, no-wrap, priority:240
msgid "repair [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:133
#, priority:240
msgid "Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:139
+#: en/git-worktree.txt:138
#, priority:240
msgid "For instance, if the main working tree (or bare repository) is moved, linked working trees will be unable to locate it. Running `repair` in the main working tree will reestablish the connection from linked working trees back to the main working tree."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:145
#, priority:240
msgid "Similarly, if a linked working tree is moved without using `git worktree move`, the main working tree (or bare repository) will be unable to locate it. Running `repair` within the recently-moved working tree will reestablish the connection. If multiple linked working trees are moved, running `repair` from any working tree with each tree's new `<path>` as an argument, will reestablish the connection to all the specified paths."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:146
#, ignore-same, no-wrap, priority:240
msgid "unlock"
msgstr "unlock"
#. type: Plain text
-#: en/git-worktree.txt:150
+#: en/git-worktree.txt:149
#, priority:240
msgid "Unlock a working tree, allowing it to be pruned, moved or deleted."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:161
#, priority:240
msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:167
+#: en/git-worktree.txt:166
#, priority:240
msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use `--force` twice if the destination is locked."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:170
+#: en/git-worktree.txt:169
#, priority:240
msgid "`remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:171
+#: en/git-worktree.txt:170
#, no-wrap, priority:240
msgid "-b <new-branch>"
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:172
+#: en/git-worktree.txt:171
#, no-wrap, priority:240
msgid "-B <new-branch>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:179
+#: en/git-worktree.txt:178
#, priority:240
msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:184
+#: en/git-worktree.txt:183
#, priority:240
msgid "With `add`, detach `HEAD` in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:185
+#: en/git-worktree.txt:184
#, ignore-same, no-wrap, priority:240
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
#. type: Plain text
-#: en/git-worktree.txt:190
+#: en/git-worktree.txt:189
#, priority:240
msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:190
#, ignore-same, no-wrap, priority:240
msgid "--[no-]guess-remote"
msgstr "--[no-]guess-remote"
#. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:196
#, priority:240
msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:200
+#: en/git-worktree.txt:199
#, priority:240
msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:200
#, ignore-same, no-wrap, priority:240
msgid "--[no-]track"
msgstr "--[no-]track"
#. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:205
#, priority:240
msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See `--track` in linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:207
+#: en/git-worktree.txt:206
#, ignore-same, no-wrap, priority:240
msgid "--lock"
msgstr "--lock"
#. type: Plain text
-#: en/git-worktree.txt:211
+#: en/git-worktree.txt:210
#, priority:240
msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without a race condition."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:216
+#: en/git-worktree.txt:215
#, priority:240
msgid "With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:221
+#: en/git-worktree.txt:220
#, priority:240
msgid "With `list`, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:225
+#: en/git-worktree.txt:224
#, priority:240
msgid "With `add`, suppress feedback messages."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:229
+#: en/git-worktree.txt:228
#, priority:240
msgid "With `prune`, report all removals."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:232
+#: en/git-worktree.txt:231
#, priority:240
msgid "With `prune`, only expire unused working trees older than `<time>`."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:233
+#: en/git-worktree.txt:232
#, no-wrap, priority:240
msgid "--reason <string>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:234
#, priority:240
msgid "With `lock`, an explanation why the working tree is locked."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:236
+#: en/git-worktree.txt:235
#, no-wrap, priority:240
msgid "<worktree>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:239
+#: en/git-worktree.txt:238
#, priority:240
msgid "Working trees can be identified by path, either relative or absolute."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:244
+#: en/git-worktree.txt:243
#, priority:240
msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify a working tree. For example if you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`, then `ghi` or `def/ghi` is enough to point to the former working tree."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:246
+#: en/git-worktree.txt:245
#, no-wrap, priority:240
msgid "REFS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:251
+#: en/git-worktree.txt:250
#, priority:240
msgid "In multiple working trees, some refs may be shared between all working trees and some refs are local. One example is `HEAD` which is different for each working tree. This section is about the sharing rules and how to access refs of one working tree from another."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:257
+#: en/git-worktree.txt:256
#, priority:240
msgid "In general, all pseudo refs are per working tree and all refs starting with `refs/` are shared. Pseudo refs are ones like `HEAD` which are directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:261
#, priority:240
msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, `main-worktree` and `worktrees`. The former gives access to per-working tree refs of the main working tree, while the latter to all linked working trees."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:269
+#: en/git-worktree.txt:268
#, priority:240
msgid "For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good` resolve to the same value as the main working tree's `HEAD` and `refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or `worktrees/bar/refs/bisect/bad` are the same as `$GIT_COMMON_DIR/worktrees/foo/HEAD` and `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:273
+#: en/git-worktree.txt:272
#, priority:240
msgid "To access refs, it's best not to look inside `$GIT_DIR` directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:280
+#: en/git-worktree.txt:279
#, priority:240
msgid "By default, the repository `config` file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:283
+#: en/git-worktree.txt:282
#, priority:240
msgid "In order to have configuration specific to working trees, you can turn on the `worktreeConfig` extension, e.g.:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:286
+#: en/git-worktree.txt:285
#, no-wrap, priority:240
msgid "$ git config extensions.worktreeConfig true\n"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:291
#, priority:240
msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:298
+#: en/git-worktree.txt:297
#, priority:240
msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If they exist in `$GIT_DIR/config`, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:300
+#: en/git-worktree.txt:299
#, priority:240
msgid "`core.worktree` and `core.bare` should never be shared"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:303
+#: en/git-worktree.txt:302
#, priority:240
msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:305
+#: en/git-worktree.txt:304
#, no-wrap, priority:240
msgid "DETAILS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:314
+#: en/git-worktree.txt:313
#, priority:240
msgid "Each linked working tree has a private sub-directory in the repository's `$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:319
#, priority:240
msgid "Within a linked working tree, `$GIT_DIR` is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and `$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR` (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:330
+#: en/git-worktree.txt:329
#, priority:240
msgid "Path resolution via `git rev-parse --git-path` uses either `$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses `$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except `refs/bisect` and `refs/worktree`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:335
+#: en/git-worktree.txt:334
#, priority:240
msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to `$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:342
#, priority:240
msgid "If you manually move a linked working tree, you need to update the `gitdir` file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead. Better yet, run `git worktree repair` to reestablish the connection automatically."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:354
+#: en/git-worktree.txt:353
#, priority:240
msgid "To prevent a `$GIT_DIR/worktrees` entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named `locked` to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:357
+#: en/git-worktree.txt:356
#, priority:240
msgid "When `extensions.worktreeConfig` is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:359
+#: en/git-worktree.txt:358
#, no-wrap, priority:240
msgid "LIST OUTPUT FORMAT"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:362
+#: en/git-worktree.txt:361
#, priority:240
msgid "The `worktree list` command has two output formats. The default format shows the details on a single line with columns. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:368
+#: en/git-worktree.txt:367
#, no-wrap, priority:240
msgid ""
"$ git worktree list\n"
@@ -57105,19 +56842,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-worktree.txt:371
+#: en/git-worktree.txt:370
#, no-wrap, priority:240
msgid "Porcelain Format"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:377
+#: en/git-worktree.txt:376
#, priority:240
msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like `bare` and `detached`) are listed as a label only, and are present only if the value is true. The first attribute of a working tree is always `worktree`, an empty line indicates the end of the record. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:382
+#: en/git-worktree.txt:381
#, no-wrap, priority:240
msgid ""
"$ git worktree list --porcelain\n"
@@ -57126,7 +56863,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:386
+#: en/git-worktree.txt:385
#, no-wrap, priority:240
msgid ""
"worktree /path/to/linked-worktree\n"
@@ -57135,7 +56872,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:390
+#: en/git-worktree.txt:389
#, no-wrap, priority:240
msgid ""
"worktree /path/to/other-linked-worktree\n"
@@ -57144,13 +56881,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:403
+#: en/git-worktree.txt:402
#, priority:240
msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:411
+#: en/git-worktree.txt:410
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
@@ -57162,7 +56899,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:418
+#: en/git-worktree.txt:417
#, priority:240
msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
msgstr ""
@@ -57290,7 +57027,7 @@ msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
#, priority:100
-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."
+msgid "A \"branch\" is an active 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
@@ -58558,7 +58295,7 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:2
#, priority:260
-msgid "'<start>' and '<end>' can take one of these forms:"
+msgid "<start> and <end> can take one of these forms:"
msgstr ""
#. type: Plain text
@@ -58570,19 +58307,19 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:7
#, priority:260
-msgid "If '<start>' or '<end>' is a number, it specifies an absolute line number (lines count from 1)."
+msgid "If <start> or <end> is a number, it specifies an absolute line number (lines count from 1)."
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:10
#, priority:260
-msgid "`/regex/`"
+msgid "/regex/"
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:17
#, priority:260
-msgid "This form will use the first line matching the given POSIX regex. If '<start>' is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. If '<start>' is `^/regex/`, it will search from the start of file. If '<end>' is a regex, it will search starting at the line given by '<start>'."
+msgid "This form will use the first line matching the given POSIX regex. If <start> is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. If <start> is ``^/regex/'', it will search from the start of file. If <end> is a regex, it will search starting at the line given by <start>."
msgstr ""
#. type: Plain text
@@ -58594,13 +58331,13 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:23
#, priority:260
-msgid "This is only valid for '<end>' and will specify a number of lines before or after the line given by '<start>'."
+msgid "This is only valid for <end> and will specify a number of lines before or after the line given by <start>."
msgstr ""
#. type: Plain text
-#: en/line-range-format.txt:32
+#: en/line-range-format.txt:30
#, priority:260
-msgid "If `:<funcname>` is given in place of '<start>' and '<end>', it is a regular expression that denotes the range from the first funcname line that matches '<funcname>', up to the next funcname line. `:<funcname>` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:<funcname>` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
+msgid "If ``:<funcname>'' is given in place of <start> and <end>, it is a regular expression that denotes the range from the first funcname line that matches <funcname>, up to the next funcname line. ``:<funcname>'' searches from the end of the previous `-L` range, if any, otherwise from the start of file. ``^:<funcname>'' searches from the start of file."
msgstr ""
#. type: Plain text
@@ -58831,128 +58568,140 @@ msgstr ""
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
+#. type: Labeled list
+#: en/merge-options.txt:81
+#, ignore-same, no-wrap, priority:240
+msgid "--no-signoff"
+msgstr "--no-signoff"
+
+#. type: Plain text
+#: en/merge-options.txt:90
+#, priority:240
+msgid "With --no-signoff do not add a Signed-off-by line."
+msgstr ""
+
#. type: Plain text
-#: en/merge-options.txt:87
+#: en/merge-options.txt:96
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:90
+#: en/merge-options.txt:99
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:91
+#: en/merge-options.txt:100
#, ignore-same, no-wrap, priority:240
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
-#: en/merge-options.txt:92
+#: en/merge-options.txt:101
#, ignore-same, no-wrap, priority:240
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
-#: en/merge-options.txt:100
+#: en/merge-options.txt:109
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:103
+#: en/merge-options.txt:112
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:105
+#: en/merge-options.txt:114
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:109
+#: en/merge-options.txt:118
#, priority:240
msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:117
+#: en/merge-options.txt:126
#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:118
+#: en/merge-options.txt:127
#, no-wrap, priority:240
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:122
+#: en/merge-options.txt:131
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:123
+#: en/merge-options.txt:132
#, ignore-same, no-wrap, priority:240
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
-#: en/merge-options.txt:124
+#: en/merge-options.txt:133
#, ignore-same, no-wrap, priority:240
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
#. type: Plain text
-#: en/merge-options.txt:130
+#: en/merge-options.txt:139
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:132
+#: en/merge-options.txt:141
#, ignore-same, no-wrap, priority:240
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
-#: en/merge-options.txt:135
+#: en/merge-options.txt:144
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:140
+#: en/merge-options.txt:149
#, priority:240
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:151
+#: en/merge-options.txt:160
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:161
+#: en/merge-options.txt:170
#, priority:240
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:162
+#: en/merge-options.txt:171
#, ignore-same, no-wrap, priority:240
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
-#: en/merge-options.txt:168
+#: en/merge-options.txt:177
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
@@ -59672,16 +59421,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59703,33 +59446,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59738,16 +59469,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59756,16 +59481,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59774,16 +59493,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59792,16 +59505,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59901,18 +59608,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "龜剋龜 linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, ignore-same, no-wrap, priority:260
@@ -59932,10 +59633,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -59957,19 +59658,12 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
+#: en/pretty-formats.txt:186
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author local-part (see '%al') respecting .mailmap, see"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, fuzzy, priority:260
-#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:186
#, ignore-same, no-wrap, priority:260
@@ -60073,10 +59767,10 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -60098,10 +59792,10 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -60123,10 +59817,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -60237,16 +59931,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60333,16 +60021,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60387,16 +60069,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60417,16 +60093,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60435,16 +60105,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60466,10 +60130,10 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -60491,10 +60155,10 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, fuzzy, priority:260
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -60515,16 +60179,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -60660,7 +60318,7 @@ msgstr "--abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:22
#, priority:260
-msgid "Instead of showing the full 40-byte hexadecimal commit object name, show a prefix that names the object uniquely. \"--abbrev=<n>\" (which also modifies diff output, if it is displayed) option can be used to specify the minimum length of the prefix."
+msgid "Instead of showing the full 40-byte hexadecimal commit object name, show only a partial prefix. Non default number of digits can be specified with \"--abbrev=<n>\" (which also modifies diff output, if it is displayed)."
msgstr ""
#. type: Plain text
@@ -65819,8 +65477,11 @@ msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
#, ignore-same
-#~ msgid "--no-signoff"
-#~ msgstr "--no-signoff"
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "龜剋龜 linkgit:git-blame[1]"
#, fuzzy
#~ msgid "'git show-index'\n"