Skip to content

Instantly share code, notes, and snippets.

@davisp
Last active August 29, 2015 13:56
Show Gist options
  • Save davisp/8848265 to your computer and use it in GitHub Desktop.
Save davisp/8848265 to your computer and use it in GitHub Desktop.
Splitting an RCouch App
=======================
$ git reset --hard add9173^
$ git subtree split -P src/couch_mrview/
# Snipped...
-n 3769/ 3771 (3768)
-n 3770/ 3771 (3769)
-n 3771/ 3771 (3770)
9f593394c81790a87b7060e02c03d3dc8dd80163
$ git reset --hard 941a823^
$ git subtree split -P apps/couch_mrview/ --onto 9f59339 add9173^..
# Snipped...
-n 14/ 16 (13)
-n 15/ 16 (14)
-n 16/ 16 (15)
bcd75612527360c6368c2c7d031f12c653480113
$ git reset --hard e62a4fc^
$ git subtree split -P src/apps/couch_mrview/ --onto bcd7561 941a823^..
# Snipped...
-n 22/ 24 (21)
-n 23/ 24 (22)
-n 24/ 24 (23)
60f4bf3d0e62d1ff47f5bede7e4fab1bafeab7cb
$ git reset --hard origin/1994-merge-rcouch
$ git subtree split -P apps/couch_mrview/ --onto 60f4bf3 e62a4fc^..
# Snipped...
-n 42/ 44 (41)
-n 43/ 44 (42)
-n 44/ 44 (43)
4ecc7cf2e79f2ef9666386d4e87583d9d63428c5
$ git checkout -b split-couch-mrview 4ecc7cf
$ git rebase 60f4bf3
$ git rebase bcd7561
$ git rebase 9f59339
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment