Marmelator/pdf.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Squashing Commits (markdown)

yurydelendik 2014-10-22 12:06:56 -07:00
parent 67d2b864b9
commit 895c074dd4
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Squashing-Commits.md

@ -8,12 +8,15 @@ These directions assume that you named the Mozilla pdf.js repo (not your fork) `
[alias] [alias]
squash = !sh -c 'git checkout upstream/master && git merge --no-commit --squash $0 && git checkout -B $0 && git commit -e' squash = !sh -c 'git checkout upstream/master && git merge --no-commit --squash $0 && git checkout -B $0 && git commit -e'
``` ```
1. Then you simply need to do: 1. Then you simply need to do:
```bash ```bash
git merge upstream/master git merge upstream/master
git squash super-feature git squash super-feature
``` ```
1. That will bring up your editor to allow you to put in the commit message you want. After entering a commit message, press Esc and type `:wq` to exit the editor (if the editor is set to vim). 1. That will bring up your editor to allow you to put in the commit message you want. After entering a commit message, press Esc and type `:wq` to exit the editor (if the editor is set to vim).
1. Then update the pull request: 1. Then update the pull request:
```bash ```bash
git push --force origin super-feature git push --force origin super-feature