How can I interactively disable a specific piece in git?

Question

In git, if I have a couple of hunks from the same file put in my index, how can I interactively disable one of them?

Is there any alternative to not installing the whole file, and then re-setting the hunks that I want to save, or manually undoing changes to the working copy, and then interactively adding those undo changes?

Answer 1

Try git reset --patch filename ; this should do the opposite of git add --patch , as per the documentation. The short form -p also works for both commands.

Answer 2

GitX has a nice user interface for unordered file fragments:

The official client has not been supported for a while, but the fork on GitHub with many features is popular in some circles. ( blog post about this )