News for hackers. Stuff that matters.
Re:Git Tips by chris_wot on Wednesday April 20, 2016 @10:24AM (#11534580)
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?
Re:Git Tips by wickedshimmy on Wednesday April 20, 2016 @02:03PM (#11536379)

  git add -u
Re:Git Tips by chris_wot on Wednesday April 20, 2016 @10:52PM (#11539322)
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.