| 1 | # StGIT configuration file. Copy it to any of ~/.gitconfig or |
| 2 | # .git/config and modify as needed. Note that the latter overrides |
| 3 | # the former. The "git config" command can be used as well |
| 4 | |
| 5 | [user] |
| 6 | # Default author/committer details (standard GIT variables) |
| 7 | name = Your Name |
| 8 | email = your.name@yourcompany.com |
| 9 | |
| 10 | [stgit] |
| 11 | # E-mail sender (added to the "From: " header) |
| 12 | #sender = Your Name <your.name@yourcompany.com> |
| 13 | |
| 14 | # Automatically Bcc the address below |
| 15 | #autobcc = your.name@yourcompany.com |
| 16 | |
| 17 | # Set to 'yes' if you don't want to use the 'resolved' command. |
| 18 | # 'refresh' will automatically mark the conflicts as resolved |
| 19 | #autoresolved = no |
| 20 | |
| 21 | # SMTP server for sending patches |
| 22 | #smtpserver = localhost:25 |
| 23 | |
| 24 | # Set to 'yes' to use SMTP over TLS |
| 25 | #smtptls = no |
| 26 | |
| 27 | # Username for SMTP authentication, required if TLS is used |
| 28 | #smtpuser = username |
| 29 | |
| 30 | # Password for SMTP. If not provided, it will be asked |
| 31 | #smtppassword = password |
| 32 | |
| 33 | # delay between messages in seconds (defaults to 5) |
| 34 | #smtpdelay = 5 |
| 35 | |
| 36 | # stg will look for this first, then look for the EDITOR environmental |
| 37 | # variable, then default to using 'vi' |
| 38 | #editor = /usr/bin/vi |
| 39 | |
| 40 | # this value overrides the default PAGER environment variable |
| 41 | #pager = ~/share/stgit/contrib/diffcol.sh |
| 42 | #pager = filterdiff --annotate | colordiff | less -FRX |
| 43 | |
| 44 | # GIT pull and fetch commands (should take the same arguments as |
| 45 | # git-fetch or git-pull). By default: |
| 46 | #pullcmd = git-pull |
| 47 | #fetchcmd = git-fetch |
| 48 | |
| 49 | # Rebase command. Note that this command is internally implemented in |
| 50 | # a different way. Only define this option if a different rebase |
| 51 | # is needed (i.e. 'git svn rebase') |
| 52 | #rebasecmd = git-reset |
| 53 | |
| 54 | # "stg pull" policy. This is the repository default, which can be |
| 55 | # overriden on a per-branch basis using branch.*.stgit.pull-policy |
| 56 | # By default: |
| 57 | #pull-policy = pull |
| 58 | # To support remote rewinding parent branches: |
| 59 | #pull-policy = fetch-rebase |
| 60 | # To support local parent branches: |
| 61 | #pull-policy = rebase |
| 62 | |
| 63 | # The three-way merge tool. Note that the 'output' file contains the |
| 64 | # same data as 'branch1'. This is useful for tools that do not take an |
| 65 | # output parameter |
| 66 | #merger = diff3 -L current -L ancestor -L patched -m -E \ |
| 67 | # \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \ |
| 68 | # > \"%(output)s\" |
| 69 | |
| 70 | # Interactive two/three-way merge tool. It is executed by the |
| 71 | # 'resolved --interactive' command |
| 72 | #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \ |
| 73 | # --show-merged-pane -m -E -O -X -M \"%(output)s\" \ |
| 74 | # \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" |
| 75 | #i2merge = xxdiff --title1 current --title2 patched \ |
| 76 | # --show-merged-pane -m -E -O -X -M \"%(output)s\" \ |
| 77 | # \"%(branch1)s\" \"%(branch2)s\" |
| 78 | #i3merge = emacs --eval '(ediff-merge-files-with-ancestor \ |
| 79 | # \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \ |
| 80 | # \"%(output)s\")' |
| 81 | #i2merge = emacs --eval '(ediff-merge-files \ |
| 82 | # \"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")' |
| 83 | |
| 84 | # Automatically invoke the interactive merger in case of conflicts |
| 85 | #autoimerge = no |
| 86 | |
| 87 | # Leave the original files in the working tree in case of a |
| 88 | # merge conflict |
| 89 | #keeporig = yes |
| 90 | |
| 91 | # Optimize (repack) the object store after every pull |
| 92 | #keepoptimized = yes |
| 93 | |
| 94 | # Extensions for the files involved in a three-way merge (ancestor, |
| 95 | # current, patched) |
| 96 | #extensions = .ancestor .current .patched |
| 97 | |
| 98 | # The number of patches to be listed before and after the |
| 99 | # current one by the 'series --short' command |
| 100 | #shortnr = 5 |
| 101 | |
| 102 | # The maximum length of an automatically generated patch name |
| 103 | #namelenth = 30 |
| 104 | |
| 105 | [mail "alias"] |
| 106 | # E-mail aliases used with the 'mail' command |
| 107 | git = git@vger.kernel.org |