franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a scenario C, where one wants to append changes to the most recent commit they made.

Mat M 2018-08-26 00:36:38 -04:00
parent 37073f6a71
commit aa24f4409b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Typical-Git-Workflow.md

@ -40,6 +40,20 @@ It's appreciated if every single commit in a branch on its own compiles on all s
* `git checkout new-branch-name` * `git checkout new-branch-name`
* `git rebase -i upstream/master` * `git rebase -i upstream/master`
## Scenario C: I made a commit and want to add other changes to it
To append changes to the most recently made commit, simply:
1. Stage the changed files to append to the commit with either:
* `git add <list of files separated by spaces>`
* or `git add -u` to stage all modified files.
2. Enter:
* `git commit --amend` — if you want to also change your commit message
* `git commit --amend --no-edit` — if you want to append your changes to the commit and make no changes to the commit message
3. Done
## Your branch is getting near completion, now you're ready for a pull request! ## Your branch is getting near completion, now you're ready for a pull request!
1. From your branch, rebase `upstream/master` 1. From your branch, rebase `upstream/master`