~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The user does not want to mess with the refspecs.
[stgit]
/
examples
/
gitconfig
diff --git
a/examples/gitconfig
b/examples/gitconfig
index
0c0555a
..
60f6e85
100644
(file)
--- a/
examples/gitconfig
+++ b/
examples/gitconfig
@@
-33,8
+33,14
@@
#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)
+ # GIT pull command (should take the same arguments as
+ # 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
# 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
@@
-50,6
+56,9
@@
#imerger = emacs --eval '(ediff-merge-files-with-ancestor \
# "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
#imerger = emacs --eval '(ediff-merge-files-with-ancestor \
# "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
+ # Automatically invoke the interactive merger in case of conflicts
+ #autoimerge = no
+
# Leave the original files in the working tree in case of a
# merge conflict
#keeporig = yes
# Leave the original files in the working tree in case of a
# merge conflict
#keeporig = yes
@@
-61,6
+70,10
@@
# current, patched)
#extensions = .ancestor .current .patched
# current, patched)
#extensions = .ancestor .current .patched
+ # The number of patches to be listed before and after the
+ # current one by the 'series --short' command
+ #shortnr = 5
+
[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