dummys · November 14, 2019 09:35 · Jan 24, 2015 · Jan 24, 2015 · Jan 24, 2015 · Jan 24, 2015
diff --git a/git-subdirectory-tracking.md b/git-subdirectory-tracking.md
@@ -17,7 +17,7 @@ git remote add -f jsdoc-upstream [email protected]:jsdoc3/jsdoc.git
 git checkout -b upstream/jsdoc jsdoc-upstream/master
 
 # split off subdir of tracking branch into separate branch
-git subtree split --squash --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc
+git subtree split -q --squash --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc
 
 # add separate branch as subdirectory on master.
 git checkout master
@@ -31,11 +31,11 @@ git checkout upstream/jsdoc
 git pull jsdoc-upstream/master
 
 # update the separate branch with changes from upstream
-git subtree split --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc
+git subtree split -q --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc
 
 # switch back to master and use subtree merge to update the subdirectory
 git checkout master
-git subtree merge --prefix=templates/default --squash merging/jsdoc
+git subtree merge -q --prefix=templates/default --squash merging/jsdoc
 ```
 
 May I never have to google this again.  I still haven't tried merging upstream yet, guess I'll cross that bridge when I get to it.
diff --git a/git-subdirectory-tracking.md b/git-subdirectory-tracking.md
@@ -25,7 +25,7 @@ git subtree add --prefix=jsdoc-template --squash merging/jsdoc
 ```
 
 ## Fetching upstram
-```
+```sh
 # switch back to tracking branch, fetch & rebase.
 git checkout upstream/jsdoc 
 git pull jsdoc-upstream/master

diff --git a/git-subdirectory-tracking.md b/git-subdirectory-tracking.md
@@ -9,6 +9,8 @@ In this particular case, I'm interested in bringing in the 'default' template of
 
 After much struggling with git, subtree and git-subtree, I ended up finding this http://archive.h2ik.co/2011/03/having-fun-with-git-subtree/ -- it basically sets up separate branches from tracking remote, the particular sub-directory, and uses git subtree contrib module to pull it all togther.  Following are the commands, modified for my use case :
 
+## Initial setup...
+
 ```sh
 # add jsdoc remote, create new tracking branch, 
 git remote add -f jsdoc-upstream [email protected]:jsdoc3/jsdoc.git
@@ -20,7 +22,10 @@ git subtree split --squash --prefix=templates/default --annotate="[jsdoc] " --re
 # add separate branch as subdirectory on master.
 git checkout master
 git subtree add --prefix=jsdoc-template --squash merging/jsdoc
+```
 
+## Fetching upstram
+```
 # switch back to tracking branch, fetch & rebase.
 git checkout upstream/jsdoc 
 git pull jsdoc-upstream/master
@@ -33,4 +38,4 @@ git checkout master
 git subtree merge --prefix=templates/default --squash merging/jsdoc
 ```
 
-May I never have to google this again.
+May I never have to google this again.  I still haven't tried merging upstream yet, guess I'll cross that bridge when I get to it.
diff --git a/git-subdirectory-tracking.md b/git-subdirectory-tracking.md
@@ -26,7 +26,7 @@ git checkout upstream/jsdoc
 git pull jsdoc-upstream/master
 
 # update the separate branch with changes from upstream
-git subtree split --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc`
+git subtree split --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc
 
 # switch back to master and use subtree merge to update the subdirectory
 git checkout master

diff --git a/git-subdirectory-tracking.md b/git-subdirectory-tracking.md
@@ -11,12 +11,10 @@ After much struggling with git, subtree and git-subtree, I ended up finding this
 
 ```sh
 # add jsdoc remote, create new tracking branch, 
-
 git remote add -f jsdoc-upstream [email protected]:jsdoc3/jsdoc.git
 git checkout -b upstream/jsdoc jsdoc-upstream/master
 
 # split off subdir of tracking branch into separate branch
-
 git subtree split --squash --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc
 
 # add separate branch as subdirectory on master.

diff --git a/git subdirectory tracking → git-subdirectory-tracking.md b/git subdirectory tracking → git-subdirectory-tracking.md
diff --git a/gistfile1.md → git subdirectory tracking b/gistfile1.md → git subdirectory tracking
diff --git a/gistfile1.md b/gistfile1.md
@@ -0,0 +1,38 @@
+This is way more complicated than it should be.  The following conditions need to be met :
+
+1. need to be able to track and merge in upstream changes
+2. don't want remote commit messages in master
+3. only interested in sub-directory of another repo
+4. needs to go in a subdirectory in my repo.
+
+In this particular case, I'm interested in bringing in the 'default' template of jsdoc as a sub-directory in my project so I could potentially make changes to the markup it genereates while also being able to update from upstream if there are changes. Ideally their template should be a separate repo added to jsdoc via a submodule -- this way I could fork it and things would be much easier.... but, it is what it is.
+
+After much struggling with git, subtree and git-subtree, I ended up finding this http://archive.h2ik.co/2011/03/having-fun-with-git-subtree/ -- it basically sets up separate branches from tracking remote, the particular sub-directory, and uses git subtree contrib module to pull it all togther.  Following are the commands, modified for my use case :
+
+```sh
+# add jsdoc remote, create new tracking branch, 
+
+git remote add -f jsdoc-upstream [email protected]:jsdoc3/jsdoc.git
+git checkout -b upstream/jsdoc jsdoc-upstream/master
+
+# split off subdir of tracking branch into separate branch
+
+git subtree split --squash --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc
+
+# add separate branch as subdirectory on master.
+git checkout master
+git subtree add --prefix=jsdoc-template --squash merging/jsdoc
+
+# switch back to tracking branch, fetch & rebase.
+git checkout upstream/jsdoc 
+git pull jsdoc-upstream/master
+
+# update the separate branch with changes from upstream
+git subtree split --prefix=templates/default --annotate="[jsdoc] " --rejoin -b merging/jsdoc`
+
+# switch back to master and use subtree merge to update the subdirectory
+git checkout master
+git subtree merge --prefix=templates/default --squash merging/jsdoc
+```
+
+May I never have to google this again.
No results found