diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
commit | c3b21df9639ae811a7b8c436a34d558917526b47 (patch) | |
tree | 96b68f3392b1a376bf487c53fafd3d215573ea36 /git-debrebase | |
parent | 839b666ac93688e2ef24c3fb7b1fbb0a0024bb33 (diff) | |
parent | 97d91ead98b8c771271e1b6878b14db030932560 (diff) |
Merge tag 'debian/9.5' into buster-bpo
dgit release 9.5 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 22 Jul 2019 09:40:00 PM BST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index 01429fb..06f56d8 100755 --- a/git-debrebase +++ b/git-debrebase @@ -3,7 +3,8 @@ # Script helping make fast-forwarding histories while still rebasing # upstream deltas when working on Debian packaging # -# Copyright (C)2017,2018 Ian Jackson +# Copyright (C)2017-2019 Ian Jackson +# Copyright (C)2019 Niko Tyni # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -120,7 +121,6 @@ our $playprefix = 'debrebase'; our $rd; our $workarea; -our @git = qw(git); our @dgit = qw(dgit); sub in_workarea ($) { |