cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comment

This commit is contained in:
Joey Hess 2014-11-23 17:13:02 -04:00
parent 1074374425
commit f85720415d
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/todo/fail_if_modification_not_commited_when_using_--spin/comment_3_c69eaa9c6ae5b07b5c2dd2591de965a3._comment Normal file
View File

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2014-11-23T21:12:19Z"
content="""
Here's a almost-script to do it, which worked when it did it by hand:
<pre>
get old-head
get curr-branch (refs/heads/master eg)
find old-commit (look back through git log for the first commit that was not "propellor spin")
git reset old-commit
git commit -a # user gets to edit commit message for all the spins and any staged changes here
git merge -S -s ours old-head
get current-commit (result of merge)
git update-ref curr-branch current-commit
git checkout curr-branch
</pre>
"""]]