Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-07-07 07:35:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Squashing Commits (markdown)

Tim van der Meij 2013-07-16 06:56:19 -07:00
parent 9b189ed245
commit 1fea66f2e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Squashing-Commits.md

@ -21,7 +21,7 @@ git push --force origin super-feature
## Alternatives
1. Step-by-step commands
```
# fetch the current upstream repository
# fetches the current upstream repository
git fetch upstream
# resets HEAD to the current upstream
git checkout upstream/master
@ -31,7 +31,7 @@ git merge --no-commit --squash super-feature
git checkout -B super-feature
# lets you edit the commit and checks in the changes (you can also use git commit -m "message")
git commit -e
# push the changes (in general, be careful with the --force parameter)
# pushes the changes (in general, be careful with the --force parameter)
git push --force origin super-feature
```