From cd794613b6f5140365e51f79023c882e8ea71197 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:45:38 -0400 Subject: git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') 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 Tue, 07 Sep 2010 12:08:05 -0400 -- cgit v1.2.3