Changes between Version 10 and Version 11 of notes/git

Timestamp:

2018-12-05T01:36:09Z (6 years ago)

Author:

root

Comment:

--

notes/git

@@ -30 +30 @@
 }}}
 
+[[br]]
+
 == pull all branches to local
 {{{#!bash
@@ -37 +39 @@
 }}}
 
+[[br]]
+
 == pull single branch to local
 `git checkout -t remotes/origin/<branch_name>`
 
+[[br]]
+
 == drop last `n` commits
 `git reset --hard HEAD~n`
+
+[[br]]
 
 == update branch to master and top up unpushed commits
@@ -47 +55 @@
 * `git merge master` - merge master commits to selected branch
 
+[[br]]
+
 == edit, reword, squash, fixup, drop last `n` commits
 `git rebase -i HEAD~n`
 
+[[br]]
+
 == grep commit contents
 `git log -p --all -G clean_empty_state`
+
+[[br]]
+
+== github enterprise behavior
+- create a merge commit:
+ - 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 all source commits into single commit;
+ - add resulting commit on top of target branch;
+- rebase ant merge: add all commits from source branch on top of target branch