Teach "stg assimilate" to repair patch reachability

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index f1c653e..52d2a69 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -46,6 +46,11 @@
        #pullcmd = git-pull
        #fetchcmd = git-fetch
 
+       # Rebase command. Note that this command is internally implemented in
+       # a different way. Only define this option if a different rebase
+       # is needed (i.e. 'git svn rebase')
+       #rebasecmd = git-reset
+
        # "stg pull" policy.  This is the repository default, which can be
        # overriden on a per-branch basis using branch.*.stgit.pull-policy
        # By default:
@@ -94,6 +99,9 @@
        # current one by the 'series --short' command
        #shortnr = 5
 
+       # The maximum length of an automatically generated patch name
+       #namelenth = 30
+
 [mail "alias"]
        # E-mail aliases used with the 'mail' command
        git = git@vger.kernel.org