diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2012-08-08 19:55:00 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2012-08-08 19:55:00 +0200 |
| commit | 1c75bccb3fc69e94859394e5844ca77bab75d22a (patch) | |
| tree | faf542aa0829ca6291a31ccf726875bacb32a1ce /debian/gbp.conf | |
| parent | fa8ea69e292ecbeeab180635f0cd0a787c9f3ef3 (diff) | |
| download | zsh-1c75bccb3fc69e94859394e5844ca77bab75d22a.tar.gz zsh-1c75bccb3fc69e94859394e5844ca77bab75d22a.zip | |
Sync do-dch, gbp.conf and our workflow docs wrt. git-dch options
Default git-dch options are now only present in gbp.conf.
We consistently use a commit id length of 8.
Diffstat (limited to 'debian/gbp.conf')
| -rw-r--r-- | debian/gbp.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index 8c381dbf3..bc1dd705e 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -8,5 +8,6 @@ debian-tag = debian/%(version)s # Options only affecting git-dch [git-dch] -id-length = 7 +id-length = 8 meta = True +multimaint-merge = True |