Skip to content

Commit

Permalink
Update readme
Browse files Browse the repository at this point in the history
commit-id:1c48b1be
  • Loading branch information
ejoffe committed Jul 9, 2021
1 parent 8afe7f2 commit c3abc6b
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Run **git spr update** to sync your whole commit stack to github and create pull
Amending Commits
----------------
When you need to update a commit, either to fix tests, update code based on review comments, or just need to change something because you feel like it. You should amend the commit.
Use **git amend** to easily amend your changes anywhere in the stack. Stage the files you want to amend, and instead of calling git commit, use the amend script and choose the commit you want to amend when prompted.
Use **git amend** to easily amend your changes anywhere in the stack. Stage the files you want to amend, and instead of calling git commit, use **git amend** and choose the commit you want to amend when prompted.
```shell
> git add .....
> git amend
Expand All @@ -88,20 +88,6 @@ Use **git amend** to easily amend your changes anywhere in the stack. Stage the
Commit to amend [1-3]: 2
```

If the commit is on top of the stack you can also simply:
```shell
> git add .....
> git commit --amend
```

Another approach is to create a new fixup commit on top of the stack and then use rebase to squash it into the right commit in the middle of the stack.
```shell
> git add .....
> git commit -m "fixup to commit XXX"
> git rebase -i
```
Now use the editor to get the commit to the right place. **git rebase -i** is your friend, if you want to learn more about it: https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history

Merge Status Bits
-----------------
Each pull request has four merge status bits signifying the request's ability to be merged. For a request to be merged, all required status bits need to show ****. Each status bit has the following meaning:
Expand Down

0 comments on commit c3abc6b

Please sign in to comment.