chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: a639e7b)
Don't clean away patches with conflicts
authorKarl Hasselström <kha@treskal.com>
Sun, 27 Jan 2008 06:48:02 +0000 (07:48 +0100)
committerKarl Hasselström <kha@treskal.com>
Tue, 29 Jan 2008 03:26:13 +0000 (04:26 +0100)
If we have conflicts, it means that the topmost patch is empty because
of those conflicts (since StGit explicitly makes a conflicting patch
empty), so don't let "stg clean" touch it.

Signed-off-by: Karl Hasselström <kha@treskal.com>

No differences found
GIT patch-maintenance porcelain (local modifications)