Changes between Version 8 and Version 9 of notes/git

Timestamp:

2018-01-08T15:00:27Z (7 years ago)

Author:

root

Comment:

--

notes/git

@@ -39 +39 @@
 == pull single branch to local
 `git checkout -t remotes/origin/<branch_name>`
+
+== drop last `n` commits
+`git reset --hard HEAD~n`
+
+== update branch to master and top up unpushed commits
+* `git pull --rebase origin master` - in not pushed branch with local only commits. if something already pushed to remote it will desynchronize local and remote sides. in this case use:
+* `git merge master` - merge master commits to selected branch
+
+== edit, reword, squash, fixup, drop last `n` commits
+`git rebase -i HEAD~n`