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.man.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.man.in')
| -rw-r--r-- | git-rebase-subtree/git-rebase-subtree.man.in | 17 |
1 files changed, 17 insertions, 0 deletions
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). |