Hacker News new | comments | ask | show | jobs | submit login

Since interactive rebase was mentioned I'd recommend taking a look at its --autosquash flag and the --fixup flag of commit. With autosquash the interactive rebase will move fixup commits to where they belong:

  git commit --fixup=<commitref>
  git rebase -i --autosquash HEAD~5

Also enable --autostash (git config --global --add rebase.autostash true) for that workflow so that dirty files do not get in the way.

Guidelines | FAQ | Support | API | Security | Lists | Bookmarklet | Legal | Apply to YC | Contact