diff options
| author | Guido Günther <agx@sigxcpu.org> | 2018-08-19 19:48:10 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-08-19 19:48:10 +0200 |
| commit | 7ce98d64b3e505c09ad785a561f59815ca26d20d (patch) | |
| tree | 24457159e0596bd55924fcc0c620109fe8b93232 /gbp/config.py | |
| parent | 95af23e853d4068e97dc0d6766776d131749ac1e (diff) | |
New command to merge in changes from a upstream using git
This reverts commit 3384a0f7a763144e5d627c454d7d76c2841e553b.
Diffstat (limited to 'gbp/config.py')
| -rw-r--r-- | gbp/config.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gbp/config.py b/gbp/config.py index 95b02442..76a850de 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -131,6 +131,7 @@ class GbpOptionParser(OptionParser): 'full': 'False', 'git-author': 'False', 'git-log': '--no-merges', + 'git-ref': 'upstream/latest', 'hooks': 'True', 'id-length': '0', 'ignore-branch': 'False', |