summaryrefslogtreecommitdiff
path: root/t/t4020-diff-external.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-02 12:14:49 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-07-06 01:43:24 -0700
commit150937c42591b0e9fb6c17f96c459d57b5f3bfdb (patch)
treec6e6c6563da7c6e5846056d49ffaee88a92aec60 /t/t4020-diff-external.sh
parentPrefer EMAIL to username@hostname. (diff)
downloadtgif-150937c42591b0e9fb6c17f96c459d57b5f3bfdb.tar.xz
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>
Diffstat (limited to 't/t4020-diff-external.sh')
0 files changed, 0 insertions, 0 deletions