diff options
| author | Joey Hess <joey@kitenet.net> | 2010-09-14 15:45:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-09-14 15:45:38 -0400 |
| commit | cd794613b6f5140365e51f79023c882e8ea71197 (patch) | |
| tree | 5a59301da5e14c8f4cdcd5f1d31a4558e87ae78d /debian | |
| parent | 8c8d2c2d2cd259f3e72fd0a4022d02e15e66104f (diff) | |
| download | ikiwiki-cd794613b6f5140365e51f79023c882e8ea71197.tar ikiwiki-cd794613b6f5140365e51f79023c882e8ea71197.tar.gz | |
git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 46401b58c..27e0fb103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. + * git: When updating from remote, use git pull --prune, to avoid possible + errors from conflicting obsolete remote branches. -- Joey Hess <joeyh@debian.org> Tue, 07 Sep 2010 12:08:05 -0400 |