Changes between Version 11 and Version 12 of notes/git

Timestamp:

2020-12-09T13:04:31Z (4 years ago)

Author:

root

Comment:

--

notes/git

@@ -54 +54 @@
 * `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
+or
+* `git rebase master` - rebase master commits to selected branch
 
 [[br]]
@@ -71 +73 @@
  - merge all commits from source branch into the middle of target branch;
  - create merge commit on top of target branch with all source commits as parents;
-- squash and merge (prefered):
+- squash and merge:
  - squash all source commits into single commit;
  - add resulting commit on top of target branch;