Discard stderr output from git-rev-parse

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 4e775fc5d452dbc96aa7be320dd6fafc13eb1b17..52d2a696d5d0c004fa13c7327136f75f44655650 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -1,6 +1,6 @@
 # StGIT configuration file. Copy it to any of ~/.gitconfig or
 # .git/config and modify as needed. Note that the latter overrides
 # StGIT configuration file. Copy it to any of ~/.gitconfig or
 # .git/config and modify as needed. Note that the latter overrides

-# the former. The "git repo-config" command can be used as well
+# the former. The "git config" command can be used as well

 
 [user]
        # Default author/committer details (standard GIT variables)
 
 [user]
        # Default author/committer details (standard GIT variables)


@@ -18,8 +18,16 @@
        # 'refresh' will automatically mark the conflicts as resolved
        #autoresolved = no
 
        # 'refresh' will automatically mark the conflicts as resolved
        #autoresolved = no
 

+       # SMTP server for sending patches

        #smtpserver = localhost:25
        #smtpserver = localhost:25

+
+       # Set to 'yes' to use SMTP over TLS
+       #smtptls = no
+
+       # Username for SMTP authentication, required if TLS is used

        #smtpuser = username
        #smtpuser = username

+
+       # Password for SMTP.  If not provided, it will be asked

        #smtppassword = password
 
        # delay between messages in seconds (defaults to 5)
        #smtppassword = password
 
        # delay between messages in seconds (defaults to 5)


@@ -33,14 +41,24 @@
        #pager = ~/share/stgit/contrib/diffcol.sh
        #pager = filterdiff --annotate | colordiff | less -FRX
 
        #pager = ~/share/stgit/contrib/diffcol.sh
        #pager = filterdiff --annotate | colordiff | less -FRX
 

-       # GIT pull command (should take the same arguments as
+       # GIT pull and fetch commands (should take the same arguments as

        # git-fetch or git-pull).  By default:
        # git-fetch or git-pull).  By default:

-       #pullcmd = git-fetch
-       #pull-does-rebase = yes
-       # Alternative (old behaviour), less intuitive but maybe useful
-       # for some workflows:

        #pullcmd = git-pull
        #pullcmd = git-pull

-       #pull-does-rebase = no
+       #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:
+       #pull-policy = pull
+       # To support remote rewinding parent branches:
+       #pull-policy = fetch-rebase
+       # To support local parent branches:
+       #pull-policy = rebase

 
        # The three-way merge tool. Note that the 'output' file contains the
        # same data as 'branch1'. This is useful for tools that do not take an
 
        # The three-way merge tool. Note that the 'output' file contains the
        # same data as 'branch1'. This is useful for tools that do not take an


@@ -49,14 +67,19 @@
        #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
        #       > \"%(output)s\"
 
        #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
        #       > \"%(output)s\"
 

-       # Interactive three-way merge tool. It is executed by the 'resolved
-       # --interactive' command
-       #imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
+       # Interactive two/three-way merge tool. It is executed by the
+       # 'resolved --interactive' command
+       #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \

        #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
        #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"
        #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
        #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"

-       #imerger = emacs --eval '(ediff-merge-files-with-ancestor \
+       #i2merge = xxdiff --title1 current --title2 patched \
+       #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
+       #       \"%(branch1)s\" \"%(branch2)s\"
+       #i3merge = emacs --eval '(ediff-merge-files-with-ancestor \

        #       \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
        #       \"%(output)s\")'
        #       \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
        #       \"%(output)s\")'

+       #i2merge = emacs --eval '(ediff-merge-files \
+       #       \"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")'

 
        # Automatically invoke the interactive merger in case of conflicts
        #autoimerge = no
 
        # Automatically invoke the interactive merger in case of conflicts
        #autoimerge = no


@@ -76,6 +99,9 @@
        # current one by the 'series --short' command
        #shortnr = 5
 
        # 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
 [mail "alias"]
        # E-mail aliases used with the 'mail' command
        git = git@vger.kernel.org