X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/b3bfa1200ad22ba55ed1531bff439d6d63ec36e5..2cf7e94e933bf3e8091622d7d6730e145cc9bf64:/examples/stgitrc diff --git a/examples/stgitrc b/examples/stgitrc index 2b85c1f..cc6e910 100644 --- a/examples/stgitrc +++ b/examples/stgitrc @@ -9,6 +9,12 @@ #commname: Your Name #commemail: your.name@yourcompany.com +# E-mail sender (added to the "From: " header) +#sender: Your Name + +# Automatically Bcc the address below +#autobcc: your.name@yourcompany.com + # Set to 'yes' if you don't want to use the 'resolved' command. # 'refresh' will automatically mark the conflicts as resolved #autoresolved: no @@ -47,6 +53,9 @@ # Leave the original files in the working tree in case of a merge conflict #keeporig: yes +# Optimize (repack) the object store after every pull +#keepoptimized: yes + # Extensions for the files involved in a three-way merge (ancestor, # current, patched) #extensions: .ancestor .current .patched