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

I seriously must be doing something wrong, but when I'm doing an interactive rebase, if it stops due to a merge conflict I sometimes find I need to tweak other files, and to add the files to git I find I do the following:

  git add $(git diff --name-only)
Am I wrong, or is this the right way of doing this?

  git add -u

Awesome :-) I guess I need to re-read the git man pages yet again. There's also git add -A which I can use if I add a new file.

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