summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-04 14:28:16 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-04 14:29:32 +0100
commitbc3be36a946aeb6485259be594645c3c3d69550f (patch)
tree9ed4a918951e5a7d1b68561d65ef2d8543a7e0bf /debian
parentd436b26183c219a8633f84aa39cf991fd8b6de4d (diff)
git-debrebase: check for git-rebase in progress and abort most operations
scrap should abort, but doesn't yet. status just prints a message. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 787cd2c..fdd5509 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dgit (6.5~) unstable; urgency=medium
* git-debrebase: Provide new convert-from-dgit-view operation.
The output is, unavoidably, not very pretty. Closes:#905322.
* git-debrebase: New feature `scrap'. Closes:#905063.
+ * git-debrebase: check for git-rebase in progress and abort most operations.
--