diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-11-07 22:01:05 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-11-07 22:01:05 +0100 |
| commit | e5bcc48e3f7bd81c9dc5a716c3fe43e8314d4304 (patch) | |
| tree | 493be844984ca6a973c27ce80d13e13bdbc7f148 /git-rebase-subtree/git-rebase-subtree.in | |
| parent | 59d2deee090b53b56b5856d23a44fb9d994e1f8f (diff) | |
| download | ndim-git-utils-e5bcc48e3f7bd81c9dc5a716c3fe43e8314d4304.tar.gz ndim-git-utils-e5bcc48e3f7bd81c9dc5a716c3fe43e8314d4304.tar.xz ndim-git-utils-e5bcc48e3f7bd81c9dc5a716c3fe43e8314d4304.zip | |
A few words of caution about git-rebase-subtree
Diffstat (limited to 'git-rebase-subtree/git-rebase-subtree.in')
| -rw-r--r-- | git-rebase-subtree/git-rebase-subtree.in | 4 |
1 files changed, 4 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 |