|
84.
|
|
|
By default, this command only works on branches that have not diverged. ![](/@@/translation-newline)
Branches are considered diverged if the destination branch's most recent ![](/@@/translation-newline)
commit is one that has not been merged (directly or indirectly) into the ![](/@@/translation-newline)
parent.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1104
|
|
85.
|
|
|
If branches have diverged, you can use 'bzr merge' to integrate the changes ![](/@@/translation-newline)
from one into the other. Once one branch has merged, the other should ![](/@@/translation-newline)
be able to pull it again.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1109
|
|
86.
|
|
|
If you want to replace your local changes and just want your branch to ![](/@@/translation-newline)
match the remote one, use pull --overwrite. This will work even if the two ![](/@@/translation-newline)
branches have diverged.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Wenn Sie Ihre lokalen Änderungen ersetzen möchten und Ihr Zweig ![](/@@/translation-newline)
nur mit dem entfernten Zweig übereinstimmen soll, nutzen Sie pull --overwrite. ![](/@@/translation-newline)
Das funktioniert auch, wenn zwei Zweige voneinander abweichen.
|
|
Translated and reviewed by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1113
|
|
87.
|
|
|
If there is no default location set, the first pull will set it (use ![](/@@/translation-newline)
--no-remember to avoid setting it). After that, you can omit the ![](/@@/translation-newline)
location to use the default. To change the default, use --remember. The ![](/@@/translation-newline)
value will only be saved if the remote location can be accessed.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Wird kein Standardverzeichnis angegeben, wird dies mit dem ersten Abgleich definiert ![](/@@/translation-newline)
(benutzen Sie --no-remember, um es nicht zu definieren). Danach können Sie ![](/@@/translation-newline)
das Standardverzeichnis bei der Voreinstellung belassen. Benutzen Sie --remember, um den ![](/@@/translation-newline)
Standard zu ändern . Der Wert wird nur gespeichert, wenn die Gegenstelle erreichbar ist.
|
|
Translated and reviewed by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1117
|
|
88.
|
|
|
The --verbose option will display the revisions pulled using the log_format ![](/@@/translation-newline)
configuration option. You can use a different format by overriding it with ![](/@@/translation-newline)
-Olog_format=<other_format>.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Die Option --verbose zeigt die heruntergeladenen Versionen unter Benutzung der ![](/@@/translation-newline)
log_format-Konfiguration an. Sie können ein anderes Format verwenden, indem Sie ![](/@@/translation-newline)
es mit -Olog_format=<Anderes_Format> überschreiben.
|
|
Translated and reviewed by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1122
|
|
89.
|
|
|
Note: The location can be specified either in the form of a branch, ![](/@@/translation-newline)
or in the form of a path to a file containing a merge directive generated ![](/@@/translation-newline)
with bzr send.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Beachten Sie: Das Verzeichnis kann in Form eines Zweiges oder in Form ![](/@@/translation-newline)
eines Pfades angegeben werden, in dem sich eine bei der bzr-Übertragung ![](/@@/translation-newline)
entstandene Zusammenführungsanweisung befindet.
|
|
Translated and reviewed by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1126
|
|
90.
|
|
|
Show logs of pulled revisions.
|
|
|
|
Protokolle geladener Revisionen anzeigen.
|
|
Translated and reviewed by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1134
|
|
91.
|
|
|
Branch to pull into, rather than the one containing the working directory.
|
|
|
|
Zweig, in den an Stelle des aktuellen Arbeitsverzeichnisses heruntergeladen wird.
|
|
Translated and reviewed by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1136
|
|
92.
|
|
|
Perform a local pull in a bound branch. Local pulls are not applied to the master branch.
|
|
|
|
Führen Sie einen lokalen Pull in einem gebundenen Zweig durch. Lokale Pulls werden nicht auf den Master-Zweig angewendet.
|
|
Translated by
Jens Maucher
|
|
Reviewed by
Torsten Franz
|
|
|
|
Located in
bzrlib/builtins.py:1139
|
|
93.
|
|
|
Need working tree for --show-base.
|
|
|
|
Ein Arbeitsbaum wird für --show-base benötigt.
|
|
Translated by
Andreas Fernandez
|
|
Reviewed by
Daniel Winzen
|
|
|
|
Located in
bzrlib/builtins.py:1168
|