diff --git "a/external/book/content/book/az/v2/GitHub-Bir-Layih\311\231nin-Saxlan\304\261lmas\304\261.html" "b/external/book/content/book/az/v2/GitHub-Bir-Layih\311\231nin-Saxlan\304\261lmas\304\261.html" index ec8334e3d2..4694fb5d5a 100644 --- "a/external/book/content/book/az/v2/GitHub-Bir-Layih\311\231nin-Saxlan\304\261lmas\304\261.html" +++ "b/external/book/content/book/az/v2/GitHub-Bir-Layih\311\231nin-Saxlan\304\261lmas\304\261.html" @@ -26,7 +26,7 @@

Bir Layihənin Saxlanılması

Yeni bir Depo Yaratmaq

Layihə kodumuzu bölüşmək üçün yeni bir depo yaradaq. -Vasitə panelinin sağ tərəfindəki “New repository” düyməsinə və ya }}">“Yeni Depo” açılışı-da göründüyü kimi istifadəçi adınızın yanındakı yuxarı alətlər panelindəki + düyməsindən basaraq başlaya bilərsiniz.

+Vasitə panelinin sağ tərəfindəki “New repository” düyməsinə və ya }}">“Yeni Depo” açılışı-da göründüyü kimi istifadəçi adınızın yanındakı yuxarı alətlər panelindəki {plus} düyməsindən basaraq başlaya bilərsiniz.

diff --git "a/external/book/content/book/az/v2/Git\342\200\231in-Daxili-\304\260\305\237l\311\231ri-Refspec.html" "b/external/book/content/book/az/v2/Git\342\200\231in-Daxili-\304\260\305\237l\311\231ri-Refspec.html" index 1ba0844119..ab4cb40e32 100644 --- "a/external/book/content/book/az/v2/Git\342\200\231in-Daxili-\304\260\305\237l\311\231ri-Refspec.html" +++ "b/external/book/content/book/az/v2/Git\342\200\231in-Daxili-\304\260\305\237l\311\231ri-Refspec.html" @@ -39,8 +39,8 @@

Refspec

-

Refspecin formatı, əvvəlcə istəyə bağlı bir + ardından <src>:<dst>, burada <src> remote tərəfdəki referanslar üçün nümunədir və <dst> olduğu yerdir və bu referanslar yerli olaraq izləniləcəkdir. -+ Git-ə sürətli irəliləməsə də referansı yeniləməsini söyləyir.

+

Refspecin formatı, əvvəlcə istəyə bağlı bir {plus} ardından <src>:<dst>, burada <src> remote tərəfdəki referanslar üçün nümunədir və <dst> olduğu yerdir və bu referanslar yerli olaraq izləniləcəkdir. +{plus} Git-ə sürətli irəliləməsə də referansı yeniləməsini söyləyir.

Avtomatik olaraq bir git remote add origin əmri ilə yazılan varsayılan vəziyyətdə, Git serverdəki refs/heads/ altındakı bütün referansları götürür və yerli olaraq refs/remotes/origin/ yazır. @@ -89,7 +89,7 @@

Refspec

Bu vəziyyətdə, sürətli master istinad kimi göstərilmədiyi üçün master branch pull etməsi rədd edildi. -Refspecin qarşısındakı + işarəsini göstərərək bunu ləğv edə bilərsiniz.

+Refspecin qarşısındakı {plus} işarəsini göstərərək bunu ləğv edə bilərsiniz.

Konfiqurasiya faylınızda əldə etmək üçün birdən çox refspecs də göstərə bilərsiniz. diff --git a/external/book/content/book/be/v2/Git-Internals-The-Refspec.html b/external/book/content/book/be/v2/Git-Internals-The-Refspec.html index 8e6399a430..95c268226b 100644 --- a/external/book/content/book/be/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/be/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is, first, an optional `, followed by `<src>:<dst>`, where `<src>` is the pattern for references on the remote side and `<dst>` is where those references will be tracked locally. -The ` tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is, first, an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. +The + tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add origin command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. diff --git "a/external/book/content/book/bg/v2/Git-\320\275\320\260-\320\275\320\270\321\201\320\272\320\276-\320\275\320\270\320\262\320\276-Refspec-\321\201\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270.html" "b/external/book/content/book/bg/v2/Git-\320\275\320\260-\320\275\320\270\321\201\320\272\320\276-\320\275\320\270\320\262\320\276-Refspec-\321\201\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270.html" index 59413e6b32..e59129ad47 100644 --- "a/external/book/content/book/bg/v2/Git-\320\275\320\260-\320\275\320\270\321\201\320\272\320\276-\320\275\320\270\320\262\320\276-Refspec-\321\201\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270.html" +++ "b/external/book/content/book/bg/v2/Git-\320\275\320\260-\320\275\320\270\321\201\320\272\320\276-\320\275\320\270\320\262\320\276-Refspec-\321\201\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270.html" @@ -39,8 +39,8 @@

Refspec спецификации

-

Форматът е символът ` (който е опция), последван от `<src>:<dst>`, където `<src>` е израз за референциите от отдалечената страна на връзката и `<dst>` указва къде тези референции ще се проследяват локално. -Символът ` казва на Git да обновява референцията дори, когато тя не е fast-forward.

+

Форматът е символът + (който е опция), последван от <src>:<dst>, където <src> е израз за референциите от отдалечената страна на връзката и <dst> указва къде тези референции ще се проследяват локално. +Символът + казва на Git да обновява референцията дори, когато тя не е fast-forward.

В случаите по подразбиране, това се записва автоматично от командата git remote add origin, Git издърпва всички референции от refs/heads/ на сървъра и ги записва в refs/remotes/origin/ локално. diff --git a/external/book/content/book/cs/v2/Git-Internals-The-Refspec.html b/external/book/content/book/cs/v2/Git-Internals-The-Refspec.html index e8e59b09e2..29c5612ee0 100644 --- a/external/book/content/book/cs/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/cs/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

Refspec má následující formát: fakultativní znak +, za nímž následuje <src>:<dst>, kde <src> je vzor pro referenci na straně vzdáleného serveru a <dst> je lokální umístění, kam mají být tyto reference zapsány. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

Refspec má následující formát: fakultativní znak {plus}, za nímž následuje <src>:<dst>, kde <src> je vzor pro referenci na straně vzdáleného serveru a <dst> je lokální umístění, kam mají být tyto reference zapsány. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

Ve výchozím případě, který se automaticky zapisuje příkazem git remote add, Git vyzvedne všechny reference z adresáře refs/heads/ na serveru a zapíše je do lokálního adresáře refs/remotes/origin/. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t a fast-forward reference. -Odmítnutí serveru můžete potlačit zadáním znaku + před vzorec refspec.

+Odmítnutí serveru můžete potlačit zadáním znaku {plus} před vzorec refspec.

V konfiguračním souboru můžete také použít více vzorců refspec pro vyzvedávání dat. diff --git a/external/book/content/book/cs/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/cs/v2/GitHub-Maintaining-a-Project.html index 15d7eb0a8d..e6013c5e48 100644 --- a/external/book/content/book/cs/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/cs/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Vytvoření nového repozitáře

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git a/external/book/content/book/de/v2/Git-Interna-Die-Referenzspezifikation-engl-Refspec.html b/external/book/content/book/de/v2/Git-Interna-Die-Referenzspezifikation-engl-Refspec.html index d2161d5ae9..ecb90a1af8 100644 --- a/external/book/content/book/de/v2/Git-Interna-Die-Referenzspezifikation-engl-Refspec.html +++ b/external/book/content/book/de/v2/Git-Interna-Die-Referenzspezifikation-engl-Refspec.html @@ -38,8 +38,8 @@

Die Referenzspezifikation (engl. Refspec)

-

Das Format der Refspec ist zunächst ein optionales `, gefolgt von `<src>:<dst>`, wobei `<src>` das Muster für Referenzen auf der Remote-Seite ist. `<dst>` gibt an wo diese Referenzen lokal nachverfolgt werden. -Das ` weist Git an, die Referenz zu aktualisieren, auch wenn es sich nicht um einen fast-forward handelt.

+

Das Format der Refspec ist zunächst ein optionales +, gefolgt von <src>:<dst>, wobei <src> das Muster für Referenzen auf der Remote-Seite ist. <dst> gibt an wo diese Referenzen lokal nachverfolgt werden. +Das + weist Git an, die Referenz zu aktualisieren, auch wenn es sich nicht um einen fast-forward handelt.

In der Standardeinstellung, die automatisch von einem Befehl git remote add origin geschrieben wird, ruft Git alle Referenzen unter refs/heads/ auf dem Server ab und schreibt sie lokal in refs/remotes/origin/. diff --git a/external/book/content/book/en/v2/Git-Internals-The-Refspec.html b/external/book/content/book/en/v2/Git-Internals-The-Refspec.html index 27a0535904..7adf8a1996 100644 --- a/external/book/content/book/en/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/en/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is, first, an optional `, followed by `<src>:<dst>`, where `<src>` is the pattern for references on the remote side and `<dst>` is where those references will be tracked locally. -The ` tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is, first, an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. +The + tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add origin command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. diff --git a/external/book/content/book/es/v2/GitHub-Mantenimiento-de-un-proyecto.html b/external/book/content/book/es/v2/GitHub-Mantenimiento-de-un-proyecto.html index be24aad820..8ea2cc2ff5 100644 --- a/external/book/content/book/es/v2/GitHub-Mantenimiento-de-un-proyecto.html +++ b/external/book/content/book/es/v2/GitHub-Mantenimiento-de-un-proyecto.html @@ -27,7 +27,7 @@

Creación de un repositorio

Vamos a crear un nuevo repositorio para compartir nuestro código en él. Comienza pulsando el botón “New repository” en el lado derecho de tu -página principal, o bien desde el botón + en la barra de botones cercano +página principal, o bien desde el botón {plus} en la barra de botones cercano a tu nombre de usuario, tal como se ve en }}">Desplegable “New repository”..

diff --git "a/external/book/content/book/es/v2/Los-entresijos-internos-de-Git-Las-especificaciones-para-hacer-referencia-a\342\200\246\342\200\213-refspec.html" "b/external/book/content/book/es/v2/Los-entresijos-internos-de-Git-Las-especificaciones-para-hacer-referencia-a\342\200\246\342\200\213-refspec.html" index 0ace5ca54a..97f9dc7e46 100644 --- "a/external/book/content/book/es/v2/Los-entresijos-internos-de-Git-Las-especificaciones-para-hacer-referencia-a\342\200\246\342\200\213-refspec.html" +++ "b/external/book/content/book/es/v2/Los-entresijos-internos-de-Git-Las-especificaciones-para-hacer-referencia-a\342\200\246\342\200\213-refspec.html" @@ -39,8 +39,8 @@

Las especificaciones para hacer referencia a…​ (refspec)

-

El formato para esta referencia es un signo + opcional, seguido de una sentencia <orig>:<dest>; donde <orig> es la plantilla para referencias en el lado remoto y <dest> el lugar donde esas referencias se escribirán en el lado local. -El +, si está presente, indica a Git que debe actualizar la referencia incluso en los casos en que no se dé un avance rápido (fast-forward).

+

El formato para esta referencia es un signo {plus} opcional, seguido de una sentencia <orig>:<dest>; donde <orig> es la plantilla para referencias en el lado remoto y <dest> el lugar donde esas referencias se escribirán en el lado local. +El {plus}, si está presente, indica a Git que debe actualizar la referencia incluso en los casos en que no se dé un avance rápido (fast-forward).

En el caso por defecto en que es escrito por un comando git remote add, Git recupera del servidor todas las referencias bajo refs/heads/, y las escribe localmente en refs/remotes/origin/. @@ -89,7 +89,7 @@

Las especificaciones para hacer referencia a…​ (refspec)

En este ejemplo, se ha rechazado la recuperación de la rama master porque no era una referencia de avance rápido (fast-forward). -Puedes forzarlo indicando el signo + delante de la referencia.

+Puedes forzarlo indicando el signo {plus} delante de la referencia.

Es posible asimismo indicar referencias múltiples en el archivo de configuración. diff --git a/external/book/content/book/fa/v2/Git-Internals-The-Refspec.html b/external/book/content/book/fa/v2/Git-Internals-The-Refspec.html index d8513dd762..c74de5edd3 100644 --- a/external/book/content/book/fa/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/fa/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is, first, an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is, first, an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add origin command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t listed as a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git a/external/book/content/book/fa/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/fa/v2/GitHub-Maintaining-a-Project.html index 9021713372..d11ca3cc5d 100644 --- a/external/book/content/book/fa/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/fa/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git a/external/book/content/book/fr/v2/Les-tripes-de-Git-La-refspec.html b/external/book/content/book/fr/v2/Les-tripes-de-Git-La-refspec.html index ecc2bae46d..ce343a9df5 100644 --- a/external/book/content/book/fr/v2/Les-tripes-de-Git-La-refspec.html +++ b/external/book/content/book/fr/v2/Les-tripes-de-Git-La-refspec.html @@ -40,8 +40,8 @@

La refspec

-

Le format de la refspec est un ` facultatif, suivi de `<src>:<dst>`, où `<src>` est le motif des références du côté distant et `<dst>` est l'emplacement local où les références seront enregistrées. -Le ` précise à Git de mettre à jour la référence même si ce n’est pas une avance rapide.

+

Le format de la refspec est un + facultatif, suivi de <src>:<dst>, où <src> est le motif des références du côté distant et <dst> est l’emplacement local où les références seront enregistrées. +Le + précise à Git de mettre à jour la référence même si ce n’est pas une avance rapide.

Dans le cas par défaut, qui est celui d’un enregistrement automatique par la commande git remote add origin, Git récupère toutes les références de refs/heads/ sur le serveur et les enregistre localement dans refs/remotes/origin/. diff --git "a/external/book/content/book/gr/v2/\316\244\316\261-\316\270\316\265\316\274\316\265\316\273\316\271\317\216\316\264\316\267-\317\203\317\204\316\277\316\271\317\207\316\265\316\257\316\261-\317\204\316\277\317\205-Git-\316\232\316\261\317\204\316\261\316\263\317\201\316\261\317\206\316\256-\316\261\316\273\316\273\316\261\316\263\317\216\316\275-\317\203\317\204\316\277-\316\261\317\200\316\277\316\270\316\265\317\204\316\256\317\201\316\271\316\277.html" "b/external/book/content/book/gr/v2/\316\244\316\261-\316\270\316\265\316\274\316\265\316\273\316\271\317\216\316\264\316\267-\317\203\317\204\316\277\316\271\317\207\316\265\316\257\316\261-\317\204\316\277\317\205-Git-\316\232\316\261\317\204\316\261\316\263\317\201\316\261\317\206\316\256-\316\261\316\273\316\273\316\261\316\263\317\216\316\275-\317\203\317\204\316\277-\316\261\317\200\316\277\316\270\316\265\317\204\316\256\317\201\316\271\316\277.html" index 894633c74a..6b55de5f48 100644 --- "a/external/book/content/book/gr/v2/\316\244\316\261-\316\270\316\265\316\274\316\265\316\273\316\271\317\216\316\264\316\267-\317\203\317\204\316\277\316\271\317\207\316\265\316\257\316\261-\317\204\316\277\317\205-Git-\316\232\316\261\317\204\316\261\316\263\317\201\316\261\317\206\316\256-\316\261\316\273\316\273\316\261\316\263\317\216\316\275-\317\203\317\204\316\277-\316\261\317\200\316\277\316\270\316\265\317\204\316\256\317\201\316\271\316\277.html" +++ "b/external/book/content/book/gr/v2/\316\244\316\261-\316\270\316\265\316\274\316\265\316\273\316\271\317\216\316\264\316\267-\317\203\317\204\316\277\316\271\317\207\316\265\316\257\316\261-\317\204\316\277\317\205-Git-\316\232\316\261\317\204\316\261\316\263\317\201\316\261\317\206\316\256-\316\261\316\273\316\273\316\261\316\263\317\216\316\275-\317\203\317\204\316\277-\316\261\317\200\316\277\316\270\316\265\317\204\316\256\317\201\316\271\316\277.html" @@ -4557,7 +4557,7 @@

Μετακίνηση αρχείων

==== Βασική χρήση Το πρώτο πράγμα που θα θελήσετε να κάνετε με το GitLab είναι να δημιουργήσετε ένα νέο έργο. -Αυτό επιτυγχάνεται με κλικ στο εικονίδιο "`+`" στη γραμμή εργαλείων. +Αυτό επιτυγχάνεται με κλικ στο εικονίδιο "`{plus}`" στη γραμμή εργαλείων. Θα σας ζητηθεί το όνομα του έργου, ο ονοματοχώρος στον οποίο θέλετε να ανήκει και το επίπεδο ορατότητάς του. Τα περισσότερα στοιχεία από αυτά δεν είναι μόνιμα και μπορούν να επαναρυθμιστούν αργότερα στις ρυθμίσεις. Κάνετε κλικ στο κουμπί "`Create Project`" και τελειώσατε. diff --git a/external/book/content/book/id/v2/Git-Internals-The-Refspec.html b/external/book/content/book/id/v2/Git-Internals-The-Refspec.html index 22b5bd018f..27ac3f613a 100644 --- a/external/book/content/book/id/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/id/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git a/external/book/content/book/id/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/id/v2/GitHub-Maintaining-a-Project.html index 9aac111f51..4fa59333c7 100644 --- a/external/book/content/book/id/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/id/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git a/external/book/content/book/it/v2/Git-Internals-The-Refspec.html b/external/book/content/book/it/v2/Git-Internals-The-Refspec.html index c9af94acf5..7bb0674642 100644 --- a/external/book/content/book/it/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/it/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git a/external/book/content/book/it/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/it/v2/GitHub-Maintaining-a-Project.html index 331a17a435..e8370bf2ea 100644 --- a/external/book/content/book/it/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/it/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git "a/external/book/content/book/ja/v2/GitHub-\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210\343\201\256\343\203\241\343\203\263\343\203\206\343\203\212\343\203\263\343\202\271.html" "b/external/book/content/book/ja/v2/GitHub-\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210\343\201\256\343\203\241\343\203\263\343\203\206\343\203\212\343\203\263\343\202\271.html" index 25902cbf8c..362e9c50db 100644 --- "a/external/book/content/book/ja/v2/GitHub-\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210\343\201\256\343\203\241\343\203\263\343\203\206\343\203\212\343\203\263\343\202\271.html" +++ "b/external/book/content/book/ja/v2/GitHub-\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210\343\201\256\343\203\241\343\203\263\343\203\206\343\203\212\343\203\263\343\202\271.html" @@ -27,7 +27,7 @@

新しいリポジトリの作成

新しいプロジェクトを作って、自分たちのプロジェクトのコードを共有しましょう。 まずはダッシュボードの右側にある “New repository” ボタンをクリックするか、 -上のツールバーでユーザー名の隣にある + ボタン (}}">“New repository” ドロップダウン を参照) をクリックしましょう。

+上のツールバーでユーザー名の隣にある {plus} ボタン (}}">“New repository” ドロップダウン を参照) をクリックしましょう。

diff --git "a/external/book/content/book/ja/v2/Git\343\201\256\345\206\205\345\201\264-Refspec.html" "b/external/book/content/book/ja/v2/Git\343\201\256\345\206\205\345\201\264-Refspec.html" index 28cbc3fe6f..e3bcfff690 100644 --- "a/external/book/content/book/ja/v2/Git\343\201\256\345\206\205\345\201\264-Refspec.html" +++ "b/external/book/content/book/ja/v2/Git\343\201\256\345\206\205\345\201\264-Refspec.html" @@ -38,8 +38,8 @@

Refspec

-

refspecの書式は <src>:<dst> で、その前にオプションとして + を指定できます。ここで <src> はリモート側の参照に対するパターンで、 <dst> はそれらの参照がローカルで書きこまれる場所を示します。 -+ は、fast-forwardでない場合でも参照を更新するようGitに指示しています。

+

refspecの書式は <src>:<dst> で、その前にオプションとして {plus} を指定できます。ここで <src> はリモート側の参照に対するパターンで、 <dst> はそれらの参照がローカルで書きこまれる場所を示します。 +{plus} は、fast-forwardでない場合でも参照を更新するようGitに指示しています。

デフォルトでは、 git remote add コマンドを実行すると、自動的にこの設定が書き込まれ、Gitはサーバー上の refs/heads/ 以下にあるすべての参照をフェッチして、ローカルの refs/remotes/origin/ に書き込みます。 @@ -88,7 +88,7 @@

Refspec

このケースでは、 master ブランチのプルはfast-forwardの参照ではなかったため拒否されました。 -refspecの先頭に + を指定すると、この動作を上書きできます。

+refspecの先頭に {plus} を指定すると、この動作を上書きできます。

さらに、設定ファイルに、フェッチ用のrefspecを複数指定することもできます。 diff --git "a/external/book/content/book/ko/v2/Git\354\235\230-\353\202\264\353\266\200-Refspec.html" "b/external/book/content/book/ko/v2/Git\354\235\230-\353\202\264\353\266\200-Refspec.html" index 2b433e257a..e767280e44 100644 --- "a/external/book/content/book/ko/v2/Git\354\235\230-\353\202\264\353\266\200-Refspec.html" +++ "b/external/book/content/book/ko/v2/Git\354\235\230-\353\202\264\353\266\200-Refspec.html" @@ -39,7 +39,7 @@

Refspec

-

Refspec 형식은 ` 와 `<src>:<dest>` 로 돼 있다. ` 는 생략 가능하고, <src> 는 리모트 저장소의 Refs 패턴이고 <dst> 는 매핑되는 로컬 저장소의 Refs 패턴이다. +

Refspec 형식은 +<src>:<dest> 로 돼 있다. + 는 생략 가능하고, <src> 는 리모트 저장소의 Refs 패턴이고 <dst> 는 매핑되는 로컬 저장소의 Refs 패턴이다. + 는 Fast-forward가 아닌 업데이트를 허용하는 것이다.

diff --git "a/external/book/content/book/mk/v2/GitHub-\320\236\320\264\321\200\320\266\321\203\320\262\320\260\321\232\320\265-\320\275\320\260-\320\277\321\200\320\276\320\265\320\272\321\202.html" "b/external/book/content/book/mk/v2/GitHub-\320\236\320\264\321\200\320\266\321\203\320\262\320\260\321\232\320\265-\320\275\320\260-\320\277\321\200\320\276\320\265\320\272\321\202.html" index 1e5c5eaf0e..6489cf15c1 100644 --- "a/external/book/content/book/mk/v2/GitHub-\320\236\320\264\321\200\320\266\321\203\320\262\320\260\321\232\320\265-\320\275\320\260-\320\277\321\200\320\276\320\265\320\272\321\202.html" +++ "b/external/book/content/book/mk/v2/GitHub-\320\236\320\264\321\200\320\266\321\203\320\262\320\260\321\232\320\265-\320\275\320\260-\320\277\321\200\320\276\320\265\320\272\321\202.html" @@ -26,7 +26,7 @@

Одржување на проект

Креирање на нов складиште

Ајде да создадеме ново складиште со кое ќе го споделиме нашиот проект код. -Започнете со кликнување на копчето ‘` Нов репозиторија '’ на десната страна на контролната табла или од копчето + во горната лента со алатки веднаш до вашето корисничко име како што се гледа во << _ new_repo_dropdown >>.

+Започнете со кликнување на копчето ‘` Нов репозиторија '’ на десната страна на контролната табла или од копчето {plus} во горната лента со алатки веднаш до вашето корисничко име како што се гледа во << _ new_repo_dropdown >>.

diff --git "a/external/book/content/book/mk/v2/\320\222\320\275\320\260\321\202\321\200\320\265\321\210\320\275\320\276\321\201\321\202\320\260-\320\275\320\260-Git-The-Refspec.html" "b/external/book/content/book/mk/v2/\320\222\320\275\320\260\321\202\321\200\320\265\321\210\320\275\320\276\321\201\321\202\320\260-\320\275\320\260-Git-The-Refspec.html" index 4a61b67c4a..db2f108b63 100644 --- "a/external/book/content/book/mk/v2/\320\222\320\275\320\260\321\202\321\200\320\265\321\210\320\275\320\276\321\201\321\202\320\260-\320\275\320\260-Git-The-Refspec.html" +++ "b/external/book/content/book/mk/v2/\320\222\320\275\320\260\321\202\321\200\320\265\321\210\320\275\320\276\321\201\321\202\320\260-\320\275\320\260-Git-The-Refspec.html" @@ -39,8 +39,8 @@

The Refspec

-

The format of the refspec is, first, an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is, first, an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -89,7 +89,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t listed as a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git a/external/book/content/book/ms/v2/Git-Internals-The-Refspec.html b/external/book/content/book/ms/v2/Git-Internals-The-Refspec.html index 02f04de6d7..1f25389cb1 100644 --- a/external/book/content/book/ms/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/ms/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is, first, an optional `, followed by `<src>:<dst>`, where `<src>` is the pattern for references on the remote side and `<dst>` is where those references will be tracked locally. -The ` tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is, first, an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. +The + tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add origin command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. diff --git a/external/book/content/book/nl/v2/Git-Binnenwerk-De-Refspec.html b/external/book/content/book/nl/v2/Git-Binnenwerk-De-Refspec.html index 00905359b0..b9c18f27e7 100644 --- a/external/book/content/book/nl/v2/Git-Binnenwerk-De-Refspec.html +++ b/external/book/content/book/nl/v2/Git-Binnenwerk-De-Refspec.html @@ -38,8 +38,8 @@

De Refspec

-

Het formaat van de refspec is, eerst, een optionele +, gevolgd door <src>:<dst>, waar `<src> het patroon is voor referenties aan de remote kant, en <dst> de plaats is waar deze referenties lokaal zullen worden getrackt. -De + draagt Git op om de referenties bij te werken zelfs als het geen fast-forward is.

+

Het formaat van de refspec is, eerst, een optionele {plus}, gevolgd door <src>:<dst>, waar `<src> het patroon is voor referenties aan de remote kant, en <dst> de plaats is waar deze referenties lokaal zullen worden getrackt. +De {plus} draagt Git op om de referenties bij te werken zelfs als het geen fast-forward is.

In het standaard geval dat automatisch wordt geschreven door een git remote add origin commando, zal Git alle referenties onder refs/heads op de server fetchen en ze lokaal naar refs/remotes/origin schrijven. @@ -89,7 +89,7 @@

De Refspec

In dit geval wordt de pull van de master-branch geweigerd omdat het niet als een fast-forward referentie was opgegeven. -Je kunt dat overschrijven door een + voor de refspec op te geven.

+Je kunt dat overschrijven door een {plus} voor de refspec op te geven.

Je kunt ook meerdere respecs voor fetchen aangeven in je configuratie bestand. diff --git a/external/book/content/book/nl/v2/GitHub-Een-project-onderhouden.html b/external/book/content/book/nl/v2/GitHub-Een-project-onderhouden.html index 452d138246..34f7bdc76d 100644 --- a/external/book/content/book/nl/v2/GitHub-Een-project-onderhouden.html +++ b/external/book/content/book/nl/v2/GitHub-Een-project-onderhouden.html @@ -25,7 +25,7 @@

Een project onderhouden

Een nieuwe repository aanmaken

Laten we eens een nieuwe repository aanmaken waarmee we de code van ons project delen. -Begin met het klikken op de “New repository” knop aan de rechterkant van het dashboard, of vanaf de + knop in de bovenste toolbar naast je gebruikersnaam zoals te zien is in }}">De “New repository” dropdown..

+Begin met het klikken op de “New repository” knop aan de rechterkant van het dashboard, of vanaf de {plus} knop in de bovenste toolbar naast je gebruikersnaam zoals te zien is in }}">De “New repository” dropdown..

diff --git a/external/book/content/book/pl/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/pl/v2/GitHub-Maintaining-a-Project.html index a7cb085b69..e90b98d332 100644 --- a/external/book/content/book/pl/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/pl/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git "a/external/book/content/book/pl/v2/Mechanizmy-wewn\304\231trzne-w-Git-Refspec.html" "b/external/book/content/book/pl/v2/Mechanizmy-wewn\304\231trzne-w-Git-Refspec.html" index 6e2857a787..f6ea44b448 100644 --- "a/external/book/content/book/pl/v2/Mechanizmy-wewn\304\231trzne-w-Git-Refspec.html" +++ "b/external/book/content/book/pl/v2/Mechanizmy-wewn\304\231trzne-w-Git-Refspec.html" @@ -39,8 +39,8 @@

Refspec

-

Refspec składa się z opcjonalnego znaku +, oraz wskazania ścieżki źródłowej i docelowej <src>:<dst>, gdzie <src> wskazuje referencję na zewnętrznym serwerze, a <dst> jest miejscem, w którym te referencje będą zapisywane lokalnie. -Znak + wskazuje Gitowi, aby wykonywał aktualizację nawet wtedy, gdy ta referencja nie jest zwykłym przesunięciem (ang. fast-forward).

+

Refspec składa się z opcjonalnego znaku {plus}, oraz wskazania ścieżki źródłowej i docelowej <src>:<dst>, gdzie <src> wskazuje referencję na zewnętrznym serwerze, a <dst> jest miejscem, w którym te referencje będą zapisywane lokalnie. +Znak {plus} wskazuje Gitowi, aby wykonywał aktualizację nawet wtedy, gdy ta referencja nie jest zwykłym przesunięciem (ang. fast-forward).

W zwyczajnym przypadku, jest to zapisywane automatycznie przez komendę git remote add, Git pobiera wszystkie referencje z refs/heads/ na serwerze i zapisuje je do refs/remotes/origin/ lokalnie. @@ -89,7 +89,7 @@

Refspec

W tym wypadku, pobieranie gałęzi master zostało odrzucone, ponieważ nie była to gałąź fast-forward (tzn. nie było możliwe wykonanie prostego przesunięcia w celu włączenia zmian). -Możesz to zmienić, poprzez ustawienie znaku + na początku definicji refspec.

+Możesz to zmienić, poprzez ustawienie znaku {plus} na początku definicji refspec.

Możesz również ustawić wiele definicji refspec w pliku konfiguracyjnym. diff --git a/external/book/content/book/pt-br/v2/Funcionamento-Interno-do-Git-The-Refspec.html b/external/book/content/book/pt-br/v2/Funcionamento-Interno-do-Git-The-Refspec.html index da354f2864..cb9ba2e34c 100644 --- a/external/book/content/book/pt-br/v2/Funcionamento-Interno-do-Git-The-Refspec.html +++ b/external/book/content/book/pt-br/v2/Funcionamento-Interno-do-Git-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git a/external/book/content/book/pt-br/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/pt-br/v2/GitHub-Maintaining-a-Project.html index 7aeedce7ed..1bb5577ada 100644 --- a/external/book/content/book/pt-br/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/pt-br/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git a/external/book/content/book/pt-pt/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/pt-pt/v2/GitHub-Maintaining-a-Project.html index 6a0e193da6..1b2c7d46c6 100644 --- a/external/book/content/book/pt-pt/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/pt-pt/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git a/external/book/content/book/pt-pt/v2/Internos-do-Git-The-Refspec.html b/external/book/content/book/pt-pt/v2/Internos-do-Git-The-Refspec.html index f646c1f186..473940caf4 100644 --- a/external/book/content/book/pt-pt/v2/Internos-do-Git-The-Refspec.html +++ b/external/book/content/book/pt-pt/v2/Internos-do-Git-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is, first, an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is, first, an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t listed as a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git "a/external/book/content/book/ru/v2/Git-\320\270\320\267\320\275\321\203\321\202\321\200\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270-\321\201\321\201\321\213\320\273\320\276\320\272.html" "b/external/book/content/book/ru/v2/Git-\320\270\320\267\320\275\321\203\321\202\321\200\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270-\321\201\321\201\321\213\320\273\320\276\320\272.html" index 9e3cde4b11..1b687bccc1 100644 --- "a/external/book/content/book/ru/v2/Git-\320\270\320\267\320\275\321\203\321\202\321\200\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270-\321\201\321\201\321\213\320\273\320\276\320\272.html" +++ "b/external/book/content/book/ru/v2/Git-\320\270\320\267\320\275\321\203\321\202\321\200\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\320\270\320\272\320\260\321\206\320\270\320\270-\321\201\321\201\321\213\320\273\320\276\320\272.html" @@ -39,8 +39,8 @@

Спецификации ссылок

-

Формат спецификации следующий: опциональный `, далее пара `<src>:<dst>`, где `<src>` -- шаблон ссылок в удалённом репозитории, а `<dst>` -- соответствующий шаблон локальных ссылок. -Символ ` сообщает Git, что обновление необходимо выполнять даже в том случае, если оно не является простым смещением.

+

Формат спецификации следующий: опциональный +, далее пара <src>:<dst>, где <src> — шаблон ссылок в удалённом репозитории, а <dst> — соответствующий шаблон локальных ссылок. +Символ + сообщает Git, что обновление необходимо выполнять даже в том случае, если оно не является простым смещением.

По умолчанию, после выполнения git remote add origin, Git забирает все ссылки из refs/heads/ на сервере, и записывает их в refs/remotes/origin/ локально. diff --git a/external/book/content/book/sl/v2/Notranjost-Gita-Refspec.html b/external/book/content/book/sl/v2/Notranjost-Gita-Refspec.html index b12fb82ef7..d06b11d70d 100644 --- a/external/book/content/book/sl/v2/Notranjost-Gita-Refspec.html +++ b/external/book/content/book/sl/v2/Notranjost-Gita-Refspec.html @@ -38,8 +38,8 @@

Refspec

-

Oblika refspec je najprej neobvezni `, ki mu sledi `<src>:<dst>`, kjer je `<src>` vzorec za reference na oddaljeni strani in `<dst>` je lokacija, kjer bodo te reference sledene lokalno. -` pove Gitu, naj posodobi referenco, tudi če ni t. i. fast-forward.

+

Oblika refspec je najprej neobvezni +, ki mu sledi <src>:<dst>, kjer je <src> vzorec za reference na oddaljeni strani in <dst> je lokacija, kjer bodo te reference sledene lokalno. ++ pove Gitu, naj posodobi referenco, tudi če ni t. i. fast-forward.

V privzetem primeru, je to avtomatsko zapisano z ukazom git remote add origin, Git prenese vse reference pod refs/heads/ na strežniku in jih zapiše v refs/remotes/origin/ lokalno. diff --git "a/external/book/content/book/sr/v2/\320\223\320\270\321\202-\320\270\320\267\320\275\321\203\321\202\321\200\320\260-\320\240\320\265\321\204\321\201\320\277\320\265\320\272.html" "b/external/book/content/book/sr/v2/\320\223\320\270\321\202-\320\270\320\267\320\275\321\203\321\202\321\200\320\260-\320\240\320\265\321\204\321\201\320\277\320\265\320\272.html" index 7d377f1956..92b1bcba8c 100644 --- "a/external/book/content/book/sr/v2/\320\223\320\270\321\202-\320\270\320\267\320\275\321\203\321\202\321\200\320\260-\320\240\320\265\321\204\321\201\320\277\320\265\320\272.html" +++ "b/external/book/content/book/sr/v2/\320\223\320\270\321\202-\320\270\320\267\320\275\321\203\321\202\321\200\320\260-\320\240\320\265\321\204\321\201\320\277\320\265\320\272.html" @@ -39,8 +39,8 @@

Рефспек

-

Формат рефспека је прво необавезни ` за којим следи `<изв>:<одр>`, где је `<изв>` шаблон за референце на удаљеној страни, а `<одр>` је место на којем ће се те референце пратити локално. -Знак ` говори програму Гит да ажурира референцу чак и ако није у питању премотавање унапред.

+

Формат рефспека је прво необавезни + за којим следи <изв>:<одр>, где је <изв> шаблон за референце на удаљеној страни, а <одр> је место на којем ће се те референце пратити локално. +Знак + говори програму Гит да ажурира референцу чак и ако није у питању премотавање унапред.

У подразумеваном случају који аутоматски уписује команда git remote add, програм Гит преузима све референце под refs/heads/ на серверу и пише их локално у refs/remotes/origin/. diff --git a/external/book/content/book/sv/v2/Git-Internals-The-Refspec.html b/external/book/content/book/sv/v2/Git-Internals-The-Refspec.html index 467c5d91a7..409f917e1f 100644 --- a/external/book/content/book/sv/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/sv/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is, first, an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is, first, an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be tracked locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add origin command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t listed as a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git a/external/book/content/book/sv/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/sv/v2/GitHub-Maintaining-a-Project.html index 6b7d398bf7..2a5b020d5c 100644 --- a/external/book/content/book/sv/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/sv/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git a/external/book/content/book/tl/v2/GitHub-Pagpapanatili-ng-isang-Proyekto.html b/external/book/content/book/tl/v2/GitHub-Pagpapanatili-ng-isang-Proyekto.html index 90fbfc7f73..849f00cf38 100644 --- a/external/book/content/book/tl/v2/GitHub-Pagpapanatili-ng-isang-Proyekto.html +++ b/external/book/content/book/tl/v2/GitHub-Pagpapanatili-ng-isang-Proyekto.html @@ -25,7 +25,7 @@

Pagpapanatili ng isang Proyekto

Paglilikha ng isang Bagong Repositoryo

Lumikha ng isang bagong repositoryo upang maibahagi ang ating code ng proyekto. -Simulan sa pamamagitan ng pag-click sa pindutan na “Bagong Repositoryo” sa kanang bahagi ng dashboard, o mula sa pindutan na + sa itaas na toolbar kasunod sa iyong usernmame gaya ng nakikita sa }}">Ang dropdown na “Bagong repositoryo”..

+Simulan sa pamamagitan ng pag-click sa pindutan na “Bagong Repositoryo” sa kanang bahagi ng dashboard, o mula sa pindutan na {plus} sa itaas na toolbar kasunod sa iyong usernmame gaya ng nakikita sa }}">Ang dropdown na “Bagong repositoryo”..

diff --git a/external/book/content/book/tl/v2/Mga-Panloob-ng-GIT-Ang-Refspec.html b/external/book/content/book/tl/v2/Mga-Panloob-ng-GIT-Ang-Refspec.html index 465650084d..bfe1eeb8f6 100644 --- a/external/book/content/book/tl/v2/Mga-Panloob-ng-GIT-Ang-Refspec.html +++ b/external/book/content/book/tl/v2/Mga-Panloob-ng-GIT-Ang-Refspec.html @@ -38,8 +38,8 @@

Ang Refspec

-

Ang format ng refspec ay, una, ang opsyonal na +, sinusundan ng <src>:<dst>, kung saan ang <src> ay ang pattern para sa mga reperensiya sa remote na bahagi at <dst> ay kung saan ang mga reperensiya ay susubaybayan nang lokal. -Ang + ay nagsasabi sa Git na i-update ang reperensiya kahit na ito ay hindi isang mabilis na pasulong.

+

Ang format ng refspec ay, una, ang opsyonal na {plus}, sinusundan ng <src>:<dst>, kung saan ang <src> ay ang pattern para sa mga reperensiya sa remote na bahagi at <dst> ay kung saan ang mga reperensiya ay susubaybayan nang lokal. +Ang {plus} ay nagsasabi sa Git na i-update ang reperensiya kahit na ito ay hindi isang mabilis na pasulong.

Sa default na kaso na awtomatikong isinulat ng isang git remote add na utos, kinukuha ng Git ang lahat ng mga reperensiya sa ilalim ng mga refs/heads/ sa server at sinusulat ito sa refs/remotes/origin/ nang lokal. @@ -90,7 +90,7 @@

Ang Refspec

Sa kasong ito, ang master na branch na pull ay tinanggihan dahil hindi ito nakalista bilang mabilis na pasulong na reperensiya. -Maari mo itong sapawan sa pamamagitan ng pagdagdag ng + sa unang bahagi ng refspec.

+Maari mo itong sapawan sa pamamagitan ng pagdagdag ng {plus} sa unang bahagi ng refspec.

Maaari mo ring tukuyin ang maramihang mga refspec sa iyong configuration file para sa pagkuha. diff --git "a/external/book/content/book/tr/v2/Dahili-Git-\303\226geleri-Refspec.html" "b/external/book/content/book/tr/v2/Dahili-Git-\303\226geleri-Refspec.html" index decccabca3..bc9f6fab0a 100644 --- "a/external/book/content/book/tr/v2/Dahili-Git-\303\226geleri-Refspec.html" +++ "b/external/book/content/book/tr/v2/Dahili-Git-\303\226geleri-Refspec.html" @@ -90,7 +90,7 @@

Refspec

Burada bir hızlı ileri-sarma referansı olarak listelenmediği için master dalının çekilmesi reddedildi. -Bunu, refspec’in önüne + belirterek geçersiz kılabilirsiniz.

+Bunu, refspec’in önüne {plus} belirterek geçersiz kılabilirsiniz.

Ayrıca, yapılandırma dosyanızda çekme için birden fazla refspec belirtebilirsiniz. diff --git "a/external/book/content/book/tr/v2/GitHub-Proje-Bak\304\261m\304\261.html" "b/external/book/content/book/tr/v2/GitHub-Proje-Bak\304\261m\304\261.html" index d40ae6d44f..50f406a8ad 100644 --- "a/external/book/content/book/tr/v2/GitHub-Proje-Bak\304\261m\304\261.html" +++ "b/external/book/content/book/tr/v2/GitHub-Proje-Bak\304\261m\304\261.html" @@ -26,7 +26,7 @@

Proje Bakımı

Yeni Bir Repo Oluşturma

Projemizin kodunu paylaşmak için yeni bir repo oluşturalım. -Bunun için, panonun sağ tarafında bulunan ``New repository`` (Yeni Repo) düğmesine veya }}">``New repository`` (yeni repo) açılır-listesi.'da göründüğü gibi kullanıcı adınızın yanındaki üst araç çubuğundaki + düğmesine tıklayarak başlayın.

+Bunun için, panonun sağ tarafında bulunan ``New repository`` (Yeni Repo) düğmesine veya }}">``New repository`` (yeni repo) açılır-listesi.'da göründüğü gibi kullanıcı adınızın yanındaki üst araç çubuğundaki {plus} düğmesine tıklayarak başlayın.

    diff --git "a/external/book/content/book/uk/v2/Git-\320\267\321\201\320\265\321\200\320\265\320\264\320\270\320\275\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\321\226\320\272\320\260\321\206\321\226\321\217-\320\277\320\276\321\201\320\270\320\273\320\260\320\275\321\214-refspec.html" "b/external/book/content/book/uk/v2/Git-\320\267\321\201\320\265\321\200\320\265\320\264\320\270\320\275\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\321\226\320\272\320\260\321\206\321\226\321\217-\320\277\320\276\321\201\320\270\320\273\320\260\320\275\321\214-refspec.html" index de6d1b2063..0d4a7f1954 100644 --- "a/external/book/content/book/uk/v2/Git-\320\267\321\201\320\265\321\200\320\265\320\264\320\270\320\275\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\321\226\320\272\320\260\321\206\321\226\321\217-\320\277\320\276\321\201\320\270\320\273\320\260\320\275\321\214-refspec.html" +++ "b/external/book/content/book/uk/v2/Git-\320\267\321\201\320\265\321\200\320\265\320\264\320\270\320\275\320\270-\320\241\320\277\320\265\321\206\320\270\321\204\321\226\320\272\320\260\321\206\321\226\321\217-\320\277\320\276\321\201\320\270\320\273\320\260\320\275\321\214-refspec.html" @@ -39,8 +39,8 @@

    Специфікація посилань (refspec)

-

Формат специфікації — необов’язвокий перший +, за яким слідує <src>:<dst>, де <src> — це шаблон для посилань віддаленого сховища, а <dst> — під яким локальним ім’ям Git стежитиме за цим посиланням. -+ каже Git оновлювати посилання, навіть якщо буде не швидке перемотування вперед.

+

Формат специфікації — необов’язвокий перший {plus}, за яким слідує <src>:<dst>, де <src> — це шаблон для посилань віддаленого сховища, а <dst> — під яким локальним ім’ям Git стежитиме за цим посиланням. +{plus} каже Git оновлювати посилання, навіть якщо буде не швидке перемотування вперед.

У типовому випадку, який автоматично записує команда git remote add, Git отримує всі посилання під refs/heads/ з віддаленого сховища та записує їх до refs/remotes/origin/ локально. @@ -89,7 +89,7 @@

Специфікація посилань (refspec)

У даному випадку, отримання гілки master було відхилено, для неї не дозволено перемотування вперед. -Це можна змінити: треба додати + на початку специфікації.

+Це можна змінити: треба додати {plus} на початку специфікації.

Ви також можете задати декілька специфікацій для отримання у своєму конфігураційному файлі. diff --git "a/external/book/content/book/uk/v2/GitHub-\320\241\321\203\320\277\321\200\320\276\320\262\320\276\320\264\320\266\321\203\320\262\320\260\320\275\320\275\321\217-\320\277\321\200\320\276\320\265\320\272\321\202\321\203.html" "b/external/book/content/book/uk/v2/GitHub-\320\241\321\203\320\277\321\200\320\276\320\262\320\276\320\264\320\266\321\203\320\262\320\260\320\275\320\275\321\217-\320\277\321\200\320\276\320\265\320\272\321\202\321\203.html" index a65f9ad911..aa75405374 100644 --- "a/external/book/content/book/uk/v2/GitHub-\320\241\321\203\320\277\321\200\320\276\320\262\320\276\320\264\320\266\321\203\320\262\320\260\320\275\320\275\321\217-\320\277\321\200\320\276\320\265\320\272\321\202\321\203.html" +++ "b/external/book/content/book/uk/v2/GitHub-\320\241\321\203\320\277\321\200\320\276\320\262\320\276\320\264\320\266\321\203\320\262\320\260\320\275\320\275\321\217-\320\277\321\200\320\276\320\265\320\272\321\202\321\203.html" @@ -26,7 +26,7 @@

Супроводжування проектуСтворення нового сховища

Створимо нове сховище, до якого ми додамо код нашого проекту. -Спочатку натиснемо кнопку “New repository” (нове сховище) праворуч панелі керування, чи за допомогою кнопки + у верхній панелі інструментів біля вашого імені користувача, як можна побачити в }}">“New repository” (нове сховище) у випадному списку..

+Спочатку натиснемо кнопку “New repository” (нове сховище) праворуч панелі керування, чи за допомогою кнопки {plus} у верхній панелі інструментів біля вашого імені користувача, як можна побачити в }}">“New repository” (нове сховище) у випадному списку..

diff --git a/external/book/content/book/uz/v2/Git-Internals-The-Refspec.html b/external/book/content/book/uz/v2/Git-Internals-The-Refspec.html index 8526c5d1f4..4838d827cd 100644 --- a/external/book/content/book/uz/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/uz/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git a/external/book/content/book/uz/v2/GitHub-Maintaining-a-Project.html b/external/book/content/book/uz/v2/GitHub-Maintaining-a-Project.html index a2238278af..87867358d5 100644 --- a/external/book/content/book/uz/v2/GitHub-Maintaining-a-Project.html +++ b/external/book/content/book/uz/v2/GitHub-Maintaining-a-Project.html @@ -25,7 +25,7 @@

Maintaining a Project

Creating a New Repository

Let’s create a new repository to share our project code with. -Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the + button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

+Start by clicking the “New repository” button on the right-hand side of the dashboard, or from the {plus} button in the top toolbar next to your username as seen in }}">The “New repository” dropdown..

diff --git a/external/book/content/book/zh-tw/v2/Git-Internals-The-Refspec.html b/external/book/content/book/zh-tw/v2/Git-Internals-The-Refspec.html index ad30f5bc3e..b5c4b32415 100644 --- a/external/book/content/book/zh-tw/v2/Git-Internals-The-Refspec.html +++ b/external/book/content/book/zh-tw/v2/Git-Internals-The-Refspec.html @@ -38,8 +38,8 @@

The Refspec

-

The format of the refspec is an optional +, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. -The + tells Git to update the reference even if it isn’t a fast-forward.

+

The format of the refspec is an optional {plus}, followed by <src>:<dst>, where <src> is the pattern for references on the remote side and <dst> is where those references will be written locally. +The {plus} tells Git to update the reference even if it isn’t a fast-forward.

In the default case that is automatically written by a git remote add command, Git fetches all the references under refs/heads/ on the server and writes them to refs/remotes/origin/ locally. @@ -88,7 +88,7 @@

The Refspec

In this case, the master branch pull was rejected because it wasn’t a fast-forward reference. -You can override that by specifying the + in front of the refspec.

+You can override that by specifying the {plus} in front of the refspec.

You can also specify multiple refspecs for fetching in your configuration file. diff --git "a/external/book/content/book/zh-tw/v2/Git-\345\237\272\347\244\216-\346\252\242\350\246\226\346\217\220\344\272\244\347\232\204\346\255\267\345\217\262\350\250\230\351\214\204.html" "b/external/book/content/book/zh-tw/v2/Git-\345\237\272\347\244\216-\346\252\242\350\246\226\346\217\220\344\272\244\347\232\204\346\255\267\345\217\262\350\250\230\351\214\204.html" index 3685e2d37a..cc0b268c52 100644 --- "a/external/book/content/book/zh-tw/v2/Git-\345\237\272\347\244\216-\346\252\242\350\246\226\346\217\220\344\272\244\347\232\204\346\255\267\345\217\262\350\250\230\351\214\204.html" +++ "b/external/book/content/book/zh-tw/v2/Git-\345\237\272\347\244\216-\346\252\242\350\246\226\346\217\220\344\272\244\347\232\204\346\255\267\345\217\262\350\250\230\351\214\204.html" @@ -115,7 +115,7 @@

檢視提交的歷史記錄

-

這個選項除了顯示相同的資訊以外,還會在每筆提交資訊後面附加每個修改檔案的差異內容(譯註:使用 - + 來表示差異,- 是刪除行,+ 是新增行;未修改的上下文資訊預設是三行,用來定位有修改的地方); +

這個選項除了顯示相同的資訊以外,還會在每筆提交資訊後面附加每個修改檔案的差異內容(譯註:使用 - {plus} 來表示差異,- 是刪除行,{plus} 是新增行;未修改的上下文資訊預設是三行,用來定位有修改的地方); 對於「程式碼審核」或「快速瀏覽」協同工作者所新增的一系列提交內容,這是非常有幫助的。 你也可以使用 git log 提供的一系列「摘要」選項; 例如:若想檢視每筆提交簡略的統計資訊,你可以使用 --stat 選項:

diff --git "a/external/book/content/book/zh-tw/v2/GitHub-\347\266\255\350\255\267\345\260\210\346\241\210.html" "b/external/book/content/book/zh-tw/v2/GitHub-\347\266\255\350\255\267\345\260\210\346\241\210.html" index 0b4f7628ea..92e7bffc87 100644 --- "a/external/book/content/book/zh-tw/v2/GitHub-\347\266\255\350\255\267\345\260\210\346\241\210.html" +++ "b/external/book/content/book/zh-tw/v2/GitHub-\347\266\255\350\255\267\345\260\210\346\241\210.html" @@ -26,7 +26,7 @@

維護專案

建立一個新倉儲

來建立一個拿來分享我們的原始碼的倉儲吧。 -首先點擊主控面板右邊的「New Repository」;或是點擊頂端工具列裡面使用者名稱旁邊的 + 按鈕,如 }}">「New repository」下拉式選單. 所示。

+首先點擊主控面板右邊的「New Repository」;或是點擊頂端工具列裡面使用者名稱旁邊的 {plus} 按鈕,如 }}">「New repository」下拉式選單. 所示。

diff --git "a/external/book/content/book/zh/v2/Git-\345\206\205\351\203\250\345\216\237\347\220\206-\345\274\225\347\224\250\350\247\204\350\214\203.html" "b/external/book/content/book/zh/v2/Git-\345\206\205\351\203\250\345\216\237\347\220\206-\345\274\225\347\224\250\350\247\204\350\214\203.html" index d441af2cec..a8f01f5f85 100644 --- "a/external/book/content/book/zh/v2/Git-\345\206\205\351\203\250\345\216\237\347\220\206-\345\274\225\347\224\250\350\247\204\350\214\203.html" +++ "b/external/book/content/book/zh/v2/Git-\345\206\205\351\203\250\345\216\237\347\220\206-\345\274\225\347\224\250\350\247\204\350\214\203.html" @@ -40,10 +40,10 @@

引用规范

-

引用规范的格式由一个可选的 ` 号和紧随其后的 `<src>:<dst>` 组成, -其中 `<src>` 是一个模式(pattern),代表远程版本库中的引用; -`<dst>` 是本地跟踪的远程引用的位置。 -` 号告诉 Git 即使在不能快进的情况下也要(强制)更新引用。

+

引用规范的格式由一个可选的 + 号和紧随其后的 <src>:<dst> 组成, +其中 <src> 是一个模式(pattern),代表远程版本库中的引用; +<dst> 是本地跟踪的远程引用的位置。 ++ 号告诉 Git 即使在不能快进的情况下也要(强制)更新引用。

默认情况下,引用规范由 git remote add origin 命令自动生成, diff --git a/script/update-book2.rb b/script/update-book2.rb index 36baea4b52..a25aca5f10 100644 --- a/script/update-book2.rb +++ b/script/update-book2.rb @@ -74,6 +74,9 @@ def genbook(language_code, &get_content) content = expand(initial_content, "progit.asc") { |filename| get_content.call(filename) } # revert internal links decorations for ebooks content.gsub!(/<<.*?\#(.*?)>>/, "<<\\1>>") + # work around AsciiDoctor v2.0.19 and later mis-interpreting multiple `+` as + # indicating the start or the end of literal monospace. + content.gsub!(/`\+`/, "`{plus}`") asciidoc = Asciidoctor::Document.new(content, attributes: { "lang" => language_code }) html = asciidoc.render