Skip to content

Add missing translation for branch nutshell #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max123kl merged 3 commits into from
Nov 20, 2019
Merged

Add missing translation for branch nutshell #46

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8754cc6
Add missing translation
cbachhuber Nov 18, 2019
8cb0473
Update book/03-git-branching/sections/nutshell.asc
cbachhuber Nov 19, 2019
f1b191b
Accept pastatopf's suggestion
cbachhuber Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions book/03-git-branching/sections/nutshell.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ $ git commit -a -m 'made other changes'
----

Jetzt hat sich Ihr Projektverlauf verzweigt (siehe <<divergent_history,Verzweigter Verlauf>>).
You created and switched to a branch, did some work on it, and then switched back to your main branch and did other work.
Both of those changes are isolated in separate branches: you can switch back and forth between the branches and merge them together when you're ready.
And you did all that with simple `branch`, `checkout`, and `commit` commands.
Sie haben einen Branch erstellt und sind zu ihm gewechselt, haben einige Arbeiten daran durchgeführt und sind dann wieder zu Ihrem Hauptzweig zurückgekehrt, um andere Arbeiten durchzuführen.
Beide Änderungen sind in separaten Branches isoliert: Sie können zwischen den Branches hin und her wechseln und sie zusammenführen, wenn Sie bereit sind.
Und das alles mit den einfachen Befehlen `branch`, `checkout` und `commit`.

[[divergent_history]]
.Verzweigter Verlauf
Expand Down