added discarding of unstaged file changes