(This is a resend from 2024-02-01 and from today) Hi! Using git-2.26.2 (probably quite old), I frequently do: git add –interactive git stash -k # test whether the stages stuff looks OK git commit git stash pop # sometimes I’m getting conflict s to resolve in some files #...continue work… git add –interactive git commit Unfortunately I many cases I overlooked that “git stash pop” does change the index (i.e.: it does “git add” for some files). I doubt whether this is useful at all, and specifically I wonder why I cannot use option -k for “git stash pop” to keep the index, too. See also https://stackoverflow.com/q/63843552/6607497 So I’m suggesting a new feature 😉 Kind regards, Ulrich