diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:52 -0700 |
commit | d26792ad69c0d2ea0b197656ae9a562e2c1f900e (patch) | |
tree | 06b8527f68bc9705bc6fe979f9c3f75ab2bb5e05 /refs.c | |
parent | Merge branch 'jc/maint-diff-core-safecrlf' (diff) | |
parent | git stash: avoid data loss when "git stash save" kills a directory (diff) | |
download | tgif-d26792ad69c0d2ea0b197656ae9a562e2c1f900e.tar.xz |
Merge branch 'pb/stash-refuse-to-kill'
"git stash save" is not just about "saving" the local changes, but
also is to restore the working tree state to that of HEAD. If you
changed a non-directory into a directory in the local change, you
may have untracked files in that directory, which have to be killed
while doing so, unless you run it with --include-untracked. Teach
the command to detect and error out before spreading the damage.
This needed a small fix to "ls-files --killed".
* pb/stash-refuse-to-kill:
git stash: avoid data loss when "git stash save" kills a directory
treat_directory(): do not declare submodules to be untracked
Diffstat (limited to 'refs.c')
0 files changed, 0 insertions, 0 deletions