The problem I have is described in more detail in the issue here with magit: https://github.com/magit/magit/issues/4222 The conclusion there was that this is an upstream problem due to some recent changes in git. As it has been mentioned in the issue itself, it is understood that git had problems with handling hunks without context, so I assume this upstream change was to eliminate such issues. Yet my experience was that hunks without context worked fine before 80% of the time, except if they were right next to each other, they might get mixed/messed up. Even in that case, I found that if I staged/unstaged hunks in top-down order in magit it didn't cause problems. Without handling no-context hunks, I see I will have to stash/redo entire change-sets, to be able to commit logically separate hunks separately. This would be a major PITA. Is there a plan to reintroduce handling of hunks with 0 line context in the future, or is this something which is technically not going to be possible ever? Cheers, Dan
