diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-11-07 18:34:04 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-11-07 18:34:04 +0100 |
| commit | e1930cab994c11ec67adb42fb1ec5ba2a45dd4d4 (patch) | |
| tree | 762861192fe467818d87a8fb162273533dd5c34e /git-follow | |
| parent | 51f6dc28af869d244f534575340788b213e69ecb (diff) | |
| download | ndim-git-utils-e1930cab994c11ec67adb42fb1ec5ba2a45dd4d4.tar.gz ndim-git-utils-e1930cab994c11ec67adb42fb1ec5ba2a45dd4d4.tar.xz ndim-git-utils-e1930cab994c11ec67adb42fb1ec5ba2a45dd4d4.zip | |
Prepare for rename git-follow -> git-rebase-subtree
Diffstat (limited to 'git-follow')
| -rw-r--r-- | git-follow/Makefile-files | 9 | ||||
| -rw-r--r-- | git-follow/git-follow.in | 38 | ||||
| -rw-r--r-- | git-follow/git-rebase-subtree.man.in | 53 |
3 files changed, 62 insertions, 38 deletions
diff --git a/git-follow/Makefile-files b/git-follow/Makefile-files index 26d78b9..8290654 100644 --- a/git-follow/Makefile-files +++ b/git-follow/Makefile-files @@ -2,3 +2,12 @@ bin_SCRIPTS += git-follow/git-follow EXTRA_DIST += git-follow/git-follow.in UPLOAD_FILES += git-follow/git-follow + +man1_MANS += git-follow/git-rebase-subtree.man +EXTRA_DIST += git-follow/git-rebase-subtree.man.in + +if HAVE_NDIM_MAN2TXT +dist_doc_DATA += git-follow/git-rebase-subtree.txt +CLEANFILES += git-follow/git-rebase-subtree.txt +UPLOAD_FILES += git-follow/git-rebase-subtree.txt +endif diff --git a/git-follow/git-follow.in b/git-follow/git-follow.in index b98aa1d..d2422ab 100644 --- a/git-follow/git-follow.in +++ b/git-follow/git-follow.in @@ -1,43 +1,5 @@ #!/bin/sh # -# Note: Letters A-Z are branch names, not revs. -# -# Old tree: -# *--F -# / -# origin=master--A--B--G -# \ -# *--D--H -# \ -# *--*--K -# -# Set "git config follow.tree" to: -# master A -# A B -# B F -# B G -# A D -# D H -# D K -# -# After "git-fetch -v": -# *--F -# / -# master---A--B--G -# \ \ -# * *--D--H -# \ \ -# *--origin' *--*--K -# -# After "git-rebase-subtree origin master": -# -# *'--F' -# / -# origin'=master'--A'--B'--G' -# \ -# *'--D'--H' -# \ -# *'--*'--K' unset CDPATH SED="${SED-sed}" diff --git a/git-follow/git-rebase-subtree.man.in b/git-follow/git-rebase-subtree.man.in new file mode 100644 index 0000000..9f51432 --- /dev/null +++ b/git-follow/git-rebase-subtree.man.in @@ -0,0 +1,53 @@ +.TH GIT-REBASE-SUBTREE 1 "@PACKAGE_TARNAME@ @PACKAGE_VERSION@" "2007\-11\-02" "@PACKAGE_NAME@ @PACKAGE_VERSION@" +.SH NAME +git\-rebase\-subtree \- rebase set of interdependant git branches +.SH SYNOPSIS +.B "git\-rebase\-subtree" +.I "<origin-branch>" +.I "<master-branch>" +.SH DESCRIPTION +So you are tracking some upstream's git repo and maintain your own set +of interdependent feature branches ("branch subtree"). +.PP +And you want to keep that "branch subtree" up-to-date in relation to +upstream so it stays sweet, small, and clean, increasing the chances +that upstream will finally pick something up from it. +.PP +Initial situation: Local branch master tracks remote origin. +.PP +Note: Letters A\-Z are branch names, not revs. +.PP +Old tree: +.nf + *\-\-F + / + origin=master\-\-A\-\-B\-\-G + \\ + *\-\-D\-\-H + \\ + *\-\-*\-\-K +.fi +.PP +After "git\-fetch \-v": +.nf + *\-\-F + / + master\-\-\-A\-\-B\-\-G + \\ \\ + * *\-\-D\-\-H + \\ \\ + origin' *\-\-*\-\-K +.fi +.PP +After hypothetical "git\-rebase\-subtree origin master": +.nf + *'\-\-F' + / + origin'=master'\-\-A'\-\-B'\-\-G' + \\ + *'\-\-D'\-\-H' + \\ + *'\-\-*'\-\-K' +.fi +.SH "SEE ALSO" +git\-rebase(1). |