1

During rebase, git status listed some files in three categories: "Changes to be committed", "Unmerged paths" and "Changes not staged for commit". After git add ., All files from "Unmerged paths" were moved to "Changes to be committed". How can I move them back, so my merge tool can recognize them and help me resolve?

Note: "git update-index --unresolve" seems to be intended for that, according to this answer, but it's giving me Not in the middle of a merge. (apparently because a rebase is treated differently).

Community
  • 1
  • 1
Victor Basso
  • 5,556
  • 5
  • 42
  • 60
  • 1
    It's more of a workaround thatn a solution, but can't you abort the rebase, redo it and this time not go for `git add .`? I do realize it's not always desired to start from scratch with the rebase, but maybe in your case... – CptBartender Jun 02 '16 at 11:53

1 Answers1

0
git reset

Unstages your working changes. (Or more technically, resets the index).

The files will be unchanged, but no longer ready-for-comit.

RJFalconer
  • 10,890
  • 5
  • 51
  • 66