Skip to content

De – new file and folder structure #10

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.

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

Closed
wants to merge 793 commits into from
Closed

Conversation

max123kl
Copy link

File and folder structure renewed and adapted to /progit/progit2.
Updated existing translations.

ben and others added 30 commits February 15, 2019 08:31
Rename 'Git Basics' from chapter 1 to 'What is Git?'
cleaning: minor rewording, mention "clean.requireForce" config var
Recording changes: Replace lone, single hyphen with proper "--"
Undoing things: Clarify what "git checkout" does to local files
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Branching: Add a note about "git checkout -b"
Among other things:

 - explain that pushing tags pushes both types
 - add second variation of how to delete remote tags

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Tagging: Small amount of grammatical cleanup, enhance some explanations
Rewriting history: Minor cleanups; update "git rebase -i" menu
In addition to some semantic tidying up, de-capitalize the terms
"index" and "working directory", as those terms are not normally
capitalized in the official Git docs.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
…fied

Reset demystified: Some semantic cleanup, and much de-capitalization
…ction

Revision selection: Couple minor clarifications and updates
Add link to the mentioned figer 28
Signed-off-by: Junjie Yuan <junjieyuanxiling@gmail.com>
Fetch and push on different repositories
use of the superlative for RCS
@mynetx
Copy link

mynetx commented Sep 3, 2019

@max123kl Help wanted heißt, hier wären zusätzliche Augen zum Nachsehen der Änderungen hilfreich. Sind deine Änderungen zusammenführbar?

@max123kl
Copy link
Author

max123kl commented Sep 3, 2019

Ich denke ja.
Da aber die File- und Ordnerstruktur des deutschen Repos auf dem Stand von vor 4 Jahren ist und mein PR auf der des Fork-Ursprungs basiert, kann ich nicht absolut sicher sein.

Vielleicht hilft es meine Vorgehensweise kurz zu erläutern:
a) Download von "progit-de/progit2-de/master" in ein lokales tmp-Verzeichnis
b) Aufbau und Korrigieren des Verzeichnis-Baums um kompatibel mit dem Fork-Ursprung zu sein
c) schon übersetzte Artikel mit den Artikeln im Fork-Ursprung verglichen und, wenn nötig, aktualisiert
d) meiner lokalen Fork von progit/progit2/master den Branch "de" hinzugefügt
e) das tmp-Verzeichnis in "de" kopiert, rebase durchgeführt
f) eigene Übersetzung gestartet und diesen PR gestartet

Da ich in der Root einige Dateien, die mir, speziell für die deutsche Übersetzung, notwendig erscheinen neu verlinkt bzw. hinzugefügt habe, sollte dort genauer beobachtet werden, ob mein Vorschlag allgemein angenommen oder noch einmal überdacht werden sollte.

@jnavila
Copy link

jnavila commented Sep 3, 2019

@mynetx: it seems @max123kl wants to move things forward; if you don't have time to deal with this, would you consider giving him push rights on the repo? As one of maintainers of the git-scm.com, I'd really like to see the german translation at the level it was for the first edition. At the same time, I'd like to have administrative rights on the repo in order to set up automatic compilation of the book. That would help ensure consistency of the sources and would provide ebooks and PDF for git-scm.com.

@mynetx
Copy link

mynetx commented Sep 6, 2019

@jnavila This should be reviewed by at least 1 other contributor #10 (comment) :)

I added push rights to @max123kl and administrative rights for you @jnavila 😃

@max123kl max123kl closed this Sep 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.