no fast forward: git merge --no-ff Regular Usage stage the unstaged files, deleted filed included: git add -u unstage a file: git reset [filename]