diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-23 18:48:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-23 18:48:52 -0400 |
| commit | 9d975e9ee4c44782da0815fb161ea8676dbf559c (patch) | |
| tree | b74c1037324cdc4308c98e475202649bf91e27df /debian/changelog | |
| parent | baba668033f86b7c91f6b15c58002ea4bdbf3da2 (diff) | |
add --merge
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e70e6a9b..683fed21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ propellor (1.1.0) UNRELEASED; urgency=medium * hasSomePassword and hasPassword now default to using the name of the host as the Context for the password. To specify a different context, use hasSomePassword' and hasPassword' (API change) + * Add --merge, to combine multiple --spin commits into a single, more useful + commit. -- Joey Hess <joeyh@debian.org> Sat, 22 Nov 2014 00:12:35 -0400 |