~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include summary of added/deleted files in diffstat
[stgit]
/
examples
/
gitconfig
diff --git
a/examples/gitconfig
b/examples/gitconfig
index
637f153
..
f181f82
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)
@@
-54,14
+62,19
@@
# \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
# > \"%(output)s\"
# \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
# > \"%(output)s\"
- # Interactive t
hree-way merge tool. It is executed by the 'resolved
- # --interactive' command
- #i
merger
= xxdiff --title1 current --title2 ancestor --title3 patched \
+ # Interactive t
wo/three-way merge tool. It is executed by the
+ #
'resolved
--interactive' command
+ #i
3merge
= 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
@@
-81,6
+94,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