1 files changed, 7 insertions, 4 deletions
diff --git a/rfc.sh b/rfc.sh
index e6cce0d2c..baf700495 100755
--- a/rfc.sh
+++ b/rfc.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 
-branch="master";
+branch="development";
 
 
 set_hooks_commit_msg()
@@ -16,6 +16,9 @@ set_hooks_commit_msg()
     curl -o $f $u || wget -O $f $u;
 
     chmod +x .git/hooks/commit-msg;
+
+    # Let the 'Change-Id: ' header get assigned on first run of rfc.sh
+    GIT_EDITOR=true git commit --amend;
 }
 
 
@@ -31,7 +34,7 @@ is_num()
 
 rebase_changes()
 {
-    git fetch;
+    git fetch origin;
 
     GIT_EDITOR=$0 git rebase -i origin/$branch;
 }
@@ -82,13 +85,13 @@ assert_diverge()
 
 main()
 {
+    set_hooks_commit_msg;
+
     if [ -e "$1" ]; then
         editor_mode "$@";
         return;
     fi
 
-    set_hooks_commit_msg;
-
     rebase_changes;
 
     assert_diverge;