A few words of caution about git-rebase-subtree

2 files changed, 21 insertions, 0 deletions

diff --git a/git-rebase-subtree/git-rebase-subtree.in b/git-rebase-subtree/git-rebase-subtree.in
index 3b3274d..d16d837 100644
--- a/git-rebase-subtree/git-rebase-subtree.in
+++ b/git-rebase-subtree/git-rebase-subtree.in
@@ -94,6 +94,10 @@ gf_rebase_tree() {
     oldroot="$2"
     test "x$oldroot" = "x" && die "Need <oldroot> parameter"
     echo
+    echo "CAUTION: ${self} does not handle merge errors yet - that will mess up your repo!"
+    echo "Press Ctrl-C to abort. Or, if you feel adventurous, press ENTER."
+    read
+    echo
     echo "$self: Preparing subtree rebase"
     git config "$configvar" | while read from to restofline; do
 	if test "x#" = "x$(echo "$from" | sed -n '1s/^\(.\).*/\1/p')"; then continue; fi
diff --git a/git-rebase-subtree/git-rebase-subtree.man.in b/git-rebase-subtree/git-rebase-subtree.man.in
index 01a21cb..6d45aab 100644
--- a/git-rebase-subtree/git-rebase-subtree.man.in
+++ b/git-rebase-subtree/git-rebase-subtree.man.in
@@ -93,5 +93,22 @@ After hypothetical "git\-rebase\-subtree \-\-reverse master Y":
 .TP
 .B "Lacks generality (fixation about 'master')"
 Yes.
+.TP
+.B "Needs complicated config"
+Yes. Auto-generating the graph may be possible.
+.TP
+.B "Needs merge conflict handling"
+Definitely. At the moment, it just messes up your branch tree if some
+error happens during the rebase.
+.TP
+.B "Needs proper error handling"
+Definitely. Possibly just renaming the
+.I rebasetree-old/foo
+branches to
+.I foo
+could do the job. Needs more investigation, though.
+.TP
+.B "Should bail out if old/foo exists and is not equal to foo"
+Yes.
 .SH "SEE ALSO"
 git\-rebase(1).