From 28ef28a59c5bdcc0049aab69c1840c23e7319be6 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 19 Jul 2008 01:59:24 +0200 Subject: Update docs resources for publication Also work around git interpreting "=====" strings as merge conflicts by just removing the ASCII art. --- git-rebase-subtree/git-rebase-subtree.man.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git-rebase-subtree/git-rebase-subtree.man.in') 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 -- cgit