summaryrefslogtreecommitdiffstats
path: root/Git-subtree.md
diff options
context:
space:
mode:
authortmk <tmk@users.noreply.github.com>2015-04-28 03:27:11 +0200
committertmk <tmk@users.noreply.github.com>2015-04-28 03:27:11 +0200
commit3e0c1937f4cddc490d5a2aa772b1b2f9e227d00a (patch)
tree102ef0ec6c8f3df41a9f1dce3d01aa2310669307 /Git-subtree.md
parent398c4feed469172eaddacd9a87a18c81a8259e48 (diff)
downloadqmk_firmware-3e0c1937f4cddc490d5a2aa772b1b2f9e227d00a.tar.gz
qmk_firmware-3e0c1937f4cddc490d5a2aa772b1b2f9e227d00a.tar.xz
Updated Git subtree (markdown)
Diffstat (limited to 'Git-subtree.md')
-rw-r--r--Git-subtree.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/Git-subtree.md b/Git-subtree.md
index b2704ca2c..4fd7f8bea 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