diff options
| author | Peter Palfrader <peter@palfrader.org> | 2016-02-02 18:58:56 +0100 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2016-02-02 18:58:56 +0100 |
| commit | 3ba6d398e22b85620bbb31e2c5f227a28ca4baef (patch) | |
| tree | 3ccf747f0f9c551f00dcc32e0bb045959a32948a /gitconfig | |
| parent | 92619e31a9feecf8290a83d5af59b6fa381b1c24 (diff) | |
gitconfig: add log=5000 to merge
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -17,6 +17,7 @@ sslCAPath = /etc/ssl/certs [merge] summary = true + log = 5000 [branch "debian-merge"] mergeoptions = --no-ff --no-commit [branch "debian"] |