[StGit PATCH] Fix dirty index errors when resolving conflicts

changes, since it goes without saying that, when present, these are the main problem. - Not complaining about staged changes if there are no unstaged changes in the working directory, since the presence of --index is immaterial in this case. Signed-off-by: Zane Bitter zbit...@redhat.com

[StGit PATCH] Include emacs and vim contribs in source tarball

This will enable downstream distros to package them. Signed-off-by: Zane Bitter zbit...@redhat.com --- MANIFEST.in |3 +++ 1 file changed, 3 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index c94eef6..a80f013 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,6 +9,9 @@ include

[StGit PATCH] contrib/vim: Fix filetype detection in VIM >=7.4

tlocal filetype=" instead to ensure that we override any previously detected filetype. Signed-off-by: Zane Bitter <zbit...@redhat.com> --- contrib/vim/ftdetect/stg.vim | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/contrib/vim/ftdetect/stg.vim b/contri