diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-07-19 01:59:24 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-07-19 21:23:12 +0200 |
| commit | 28ef28a59c5bdcc0049aab69c1840c23e7319be6 (patch) | |
| tree | 84ab27645765edea2187228e6db9ca1dd153abf5 /git-rebase-subtree/git-rebase-subtree.man.in | |
| parent | e8f31e1b353299d13720e76b3fe53c0a7aea0fa0 (diff) | |
| download | ndim-git-utils-28ef28a59c5bdcc0049aab69c1840c23e7319be6.tar.gz ndim-git-utils-28ef28a59c5bdcc0049aab69c1840c23e7319be6.tar.xz ndim-git-utils-28ef28a59c5bdcc0049aab69c1840c23e7319be6.zip | |
Update docs resources for publication
Also work around git interpreting "=====" strings as merge
conflicts by just removing the ASCII art.
Diffstat (limited to 'git-rebase-subtree/git-rebase-subtree.man.in')
| -rw-r--r-- | git-rebase-subtree/git-rebase-subtree.man.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-rebase-subtree/git-rebase-subtree.man.in b/git-rebase-subtree/git-rebase-subtree.man.in index 6d45aab..67202b8 100644 --- a/git-rebase-subtree/git-rebase-subtree.man.in +++ b/git-rebase-subtree/git-rebase-subtree.man.in @@ -91,6 +91,10 @@ After hypothetical "git\-rebase\-subtree \-\-reverse master Y": .fi .SH "BUGS" .TP +.B "Obsoleted by git 1.5.6" +git 1.5.6 can trigger branch rebases on pulls automatically without +external tools. +.TP .B "Lacks generality (fixation about 'master')" Yes. .TP |