Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More Git notes

Browse source
This commit is contained in:
Jeff Parsons 2015-04-29 09:58:42 -07:00 • committed by jeffpar
commit c092386f50
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
notes.md
View file

@ -48,6 +48,23 @@ You can also do this with files from other branches, and such. `man git-checkout
The rest of the Internet will tell you to use `git reset --hard`, but this resets all uncommitted changes you’ve
made in your working copy. Type this with care.
Amending a commit
---
Sometimes I'm too quick with the "Commit and Push" button, and I've left a stale comment in the comment field.
To correct that:
git commit --amend -m "New comment"
Unfortunately, updating the remote is not as simple as `git push`, which will complain:
Updates were rejected because the tip of your current branch is behind its remote counterpart.
Integrate the remote changes (e.g. 'git pull ...') before pushing again.
But in this case, there's nothing to pull, so force the push (this example assumes the current branch is *master*):
git push -f origin master
Node "Cheat Sheet"
===