h759bkyo4/Documentation
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

git/squash-commits.md: Replace German git output with English

Browse source
This commit is contained in:
tomac 2021-03-06 20:26:39 +01:00
parent 020316ccbd
commit ca998ddbcc
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
content/git/squash-commits.md
View file

@ -21,11 +21,11 @@ $ git log --graph --decorate --oneline
* 662e04e Initial commit * 662e04e Initial commit
$ git status $ git status
Auf Branch master On branch master
Ihr Branch ist 4 Commits vor 'origin/master'. Your branch is ahead of 'origin/master' by 4 commits.
(benutzen Sie "git push", um lokale Commits zu publizieren) (use "git push" to publish your local commits)
nichts zu committen, Arbeitsverzeichnis unverändert nothing to commit, working tree clean
``` ```
You want to merge the last 4 commits from `a` to `english`. You want to merge the last 4 commits from `a` to `english`.
@ -33,13 +33,13 @@ You want to merge the last 4 commits from `a` to `english`.
```bash ```bash
$ git reset --soft "HEAD~4" $ git reset --soft "HEAD~4"
$ git status $ git status
Auf Branch master On branch master
Ihr Branch ist auf demselben Stand wie 'origin/master'. Your branch is up to date with 'origin/master'.
Zum Commit vorgemerkte Änderungen: Changes to be committed:
(benutzen Sie "git reset HEAD <Datei>..." zum Entfernen aus der Staging-Area) (use "git reset HEAD <file>..." to unstage)
neue Datei: a new file: a
$ git commit --amend $ git commit --amend
[master 24e0e06] English [master 24e0e06] English
@ -53,4 +53,4 @@ $ git log --graph --decorate --oneline
* 662e04e Initial commit * 662e04e Initial commit
``` ```
After that you can push it to remote repository via `git push`. After that you can push it to remote repository via `git push`.