diff options
| author | Guido Günther <agx@sigxcpu.org> | 2018-05-24 15:15:29 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-05-24 15:32:38 +0200 |
| commit | 1592882c38fcbb107332d9a0a63b8da4e0bf8a48 (patch) | |
| tree | 9ef0c19712cbef98f0836a581c46f4c4f3eec226 /gbp/config.py | |
| parent | a287bf6155747ce8fc17580c11547f6ecc4e7aea (diff) | |
gbp import-ref: New command to merge in changes from a upstream using git
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 e1b2328d..2226e629 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', |