| commit | 150937c42591b0e9fb6c17f96c459d57b5f3bfdb | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Mon, 2 Jul 2007 11:14:49 +0000 (2 12:14 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jul 2007 08:43:24 +0000 (6 01:43 -0700) | ||
| tree | c6e6c6563da7c6e5846056d49ffaee88a92aec60 | treesnapshot (tar.gz zip) |
| parent | 46f74f007b86452c4b4135f5145f94eefc994ea2 | commitdiff |
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>
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>
| git-stash.sh | diffblobblamehistory | |
| t/t3903-stash.sh | [new file with mode: 0755] | blob |