Commit 150937c4 authored by Committed by Junio C Hamano
Teach git-stash to "apply --index"
When given this subcommand, git-stash will try to merge the stashed index into the current one. Only trivial merges are possible, since we have no index for the index ;-) If a trivial merge is not possible, git-stash will bail out with a hint to skip the --index option. For good measure, finally include a test case. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <firstname.lastname@example.org>
Showing with 89 additions and 1 deletion