summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Git-subtree.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/Git-subtree.md b/Git-subtree.md
index b2704ca2c5..4fd7f8beaa 100644
--- a/Git-subtree.md
+++ b/Git-subtree.md
@@ -4,4 +4,4 @@
git co core
git merge <tmp_branch>
git co master
- git subtree merge -P tmk_core
+ git subtree merge -P tmk_core --squash