Hi, I frequently use 'git add -p' to filter changes before committing. This usually works, but on many occasions, the use of add and commit results in unstaged chunks and files being committed. Steps to reproduce: 1. Create unstaged changes 2. Use add -p to add some of those changes 3. Use git commit to commit the staged changes Expectation: Only added chunks are committed. Result: 1. When editing the commit message, the added files appear staged in the comments at the end of the commit message, and the unstage files appear unstaged. (expected behaviour) 2. All unstaged changes and files are committed. 3. Once git enters this state, even git add produces the same result: Using git add to only add some files (and not chunks), and subsequently committing, results in unstaged files also being committed. 4. Even after restarting git bash, the behaviour persists. 5. The same behaviour occurs when adding and committing a file, while leaving other files unstaged, when using Git GUI instead of Git Bash Environment: Git version 2.12.2.windows.2 Windows 10 enterprise Hooks: commit-msg, and pre-commit Changes were being committed, reset, and rebased prior to this add -p attempt If more information is needed, please do not hesitate to contact me. Since this is a significant part of my workflow, the failure of the command to work in the expected way is fairly disruptive to my workflow. Any help or thoughts would be appreciated! Kind Regards, Beenish Khurshid, E.I.T I Applications Engineer ANT Wireless | 124 - 30 Bow Street Common, Cochrane, AB, Canada T4C 2N1 P: 587.493.4156 | F: 403.932.6521