From f85720415d55d836691fe04f9b9192cdc1b427ba Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 17:13:02 -0400 Subject: comment --- ...omment_3_c69eaa9c6ae5b07b5c2dd2591de965a3._comment | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/todo/fail_if_modification_not_commited_when_using_--spin/comment_3_c69eaa9c6ae5b07b5c2dd2591de965a3._comment (limited to 'doc/todo/fail_if_modification_not_commited_when_using_--spin') diff --git a/doc/todo/fail_if_modification_not_commited_when_using_--spin/comment_3_c69eaa9c6ae5b07b5c2dd2591de965a3._comment b/doc/todo/fail_if_modification_not_commited_when_using_--spin/comment_3_c69eaa9c6ae5b07b5c2dd2591de965a3._comment new file mode 100644 index 00000000..60bdf597 --- /dev/null +++ b/doc/todo/fail_if_modification_not_commited_when_using_--spin/comment_3_c69eaa9c6ae5b07b5c2dd2591de965a3._comment @@ -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: + +
+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
+
+"""]] -- cgit v1.2.3