2 commits

Author	SHA1	Message	Date
Junio C Hamano	ceff079bdc	Make sure git-stash works from subdirectory. ... We say "SUBDIRECTORY_OK" but we did not chdir to toplevel; this is fine as long as everything we use can be started from a subdirectory, but unfortunately "merge-recursive" is not one of the programs you can safely use from a subdirectory. Signed-off-by: Junio C Hamano <gitster@pobox.com>	2007-07-25 15:34:52 -07:00
Johannes Schindelin	150937c425	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 <gitster@pobox.com>	2007-07-06 01:43:24 -07:00