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 | |
| 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.
| -rw-r--r-- | README | 23 | ||||
| -rw-r--r-- | git-rebase-subtree/git-rebase-subtree.man.in | 4 |
2 files changed, 16 insertions, 11 deletions
@@ -1,17 +1,18 @@ -======================================================================== +------------------------------------------------------------------------ ndim's git utilities - a collection of scripts and docs around git Copyright (C) 2007, 2008 Hans Ulrich Niedermann <hun@n-dimensional.de> -======================================================================== +------------------------------------------------------------------------ The utilities in detail -======================= +~~~~~~~~~~~~~~~~~~~~~~~ git-amb (status: stable) Makes building, installing, and testing multiple git branches of some source tree built with automake easy, clean and flexible. The name stands for "git *a*uto*m*ake *b*uild". For details, see git-amb(1) man page. + git-amb(1) is about to be obsoleted by the generalized nbb(1) tool. git-buildmsg (status: testing) Generate .h file containing information about the current git @@ -22,26 +23,26 @@ The utilities in detail git-rebase-subtree (status: stale) Rebase not only a single branch, but a whole "subtree of branches". Useful for maintaining your own subtree of branches close to some - upstream's branch. + upstream's branch, but is in dire need of proper error handling. Probably obsoleted by automatic branch..rebase setup in git 1.5.6. -Updates -======= +Resources +~~~~~~~~~ Home page: - http://nix.lauft.net/ndim-git-utils.git/ + none at the moment Git repository: - $ git clone http://nix.lauft.net/ndim-git-utils.git/ + $ git clone git://fedorapeople.org/~ndim/ndim-git-utils.git License -======= +~~~~~~~ Partly MIT, partly GPL. Shared parts dual-licensed. -======================================================================== +------------------------------------------------------------------------ End of README for ndim's git utilities. -======================================================================== +------------------------------------------------------------------------ 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 |