diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:23:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:23:48 -0700 |
commit | 91788cf26e86c5bfb54431e7af34783d4c71dda0 (patch) | |
tree | 47c288c47c5b5d72a06ad42e774503a73493d639 /git-gui/lib | |
parent | 2b7d947b8f57f377b24bc2e802d0af67ff911d6f (diff) | |
parent | 2ba2fe292c13d6442456c1b8a1948bea27992953 (diff) | |
download | git-91788cf26e86c5bfb54431e7af34783d4c71dda0.tar.gz git-91788cf26e86c5bfb54431e7af34783d4c71dda0.tar.xz |
Merge branch 'cb/maint-stash-orphaned-file' into maint
* cb/maint-stash-orphaned-file:
stash tests: stash can lose data in a file removed from the index
stash: Don't overwrite files that have gone from the index
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions