split git commands

2014-03-09 13:20:13 +01:00
parent b609908fe0
commit 4d70294f06
12 changed files with 141 additions and 59 deletions
--- a/pages/common/git-merge.md
+++ b/pages/common/git-merge.md
@@ -0,0 +1,11 @@
+#git merge
+
+> Merge branches
+
+- Merge a branch with your current branch
+
+`git merge {{BRANCH-NAME}}`
+
+- Edit the merge message
+
+`git merge -e {{BRANCH-NAME}}`