diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-11-17 11:00:54 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-11-17 11:00:54 -0700 |
| commit | fde00691054302b53783d14880ef015e8f81758b (patch) | |
| tree | 323aae3f069791b9b9966ffdbf8fe3f5fc979cd6 /git-debrebase | |
| parent | 43faee259ac0418b98f0c973a794c21f47c9d1c1 (diff) | |
| parent | bfb113c41cdc9bc875cec6f1c24f930e664e853e (diff) | |
Merge tag 'debian/8.1' into stretch-bpo
dgit release 8.1 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Wed 07 Nov 2018 07:11:36 PM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 5e8a8bb..829ab82 100755 --- a/git-debrebase +++ b/git-debrebase @@ -47,7 +47,7 @@ usages: git-debrebase [<options>] prepush [--prose=...] git-debrebase [<options>] quick|conclude git-debrebase [<options>] new-upstream <new-version> [<details ...>] - git-debrebase [<options>] convert-from-gbp [<upstream-commitish>] + git-debrebase [<options>] convert-from-* ... ... See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit). END @@ -2537,6 +2537,7 @@ sub complete_convert_from ($$$$) { update_head_checkout $old_head, $new_head, $mrest; } +sub cmd_convert_from_unapplied () { cmd_convert_from_gbp(); } sub cmd_convert_from_gbp () { badusage __ "want only 1 optional argument, the upstream git commitish" unless @ARGV<=1; |