summaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2016-02-02 18:59:14 +0100
committerPeter Palfrader <peter@palfrader.org>2016-02-02 18:59:14 +0100
commit7e3bf0b05b4008a3a2cbc27e30ffa727607084b8 (patch)
tree734941dfe9ba4e1354b28d267afc897035c9ed5e /gitconfig
parent3ba6d398e22b85620bbb31e2c5f227a28ca4baef (diff)
gitconfig: add log=5000 to more mergeoptions
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitconfig b/gitconfig
index fc78559..f944978 100644
--- a/gitconfig
+++ b/gitconfig
@@ -19,9 +19,9 @@
summary = true
log = 5000
[branch "debian-merge"]
- mergeoptions = --no-ff --no-commit
+ mergeoptions = --no-ff --no-commit --log=5000
[branch "debian"]
- mergeoptions = --no-ff --no-commit
+ mergeoptions = --no-ff --no-commit --log=5000
[core]
excludesfile = ~/.gitignore
#[push]