summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorCharles Bailey <charles@hashpling.org>2010-04-18 18:27:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-20 17:03:10 (GMT)
commit2ba2fe292c13d6442456c1b8a1948bea27992953 (patch)
tree174c9c7758a181c44ea63bc9f22352dda6e645a7 /ll-merge.h
parent7aa5d43cc6204efab0d2c2f4fbf46d2cfd350fec (diff)
downloadgit-2ba2fe292c13d6442456c1b8a1948bea27992953.zip
git-2ba2fe292c13d6442456c1b8a1948bea27992953.tar.gz
git-2ba2fe292c13d6442456c1b8a1948bea27992953.tar.bz2
stash tests: stash can lose data in a file removed from the index
If a file is removed from the index and then modified in the working tree then stash will discard the working tree file with no way to recover the changes. This can might be done in one of a number of ways. git rm file vi file # edit a new version git stash or with git mv git mv file newfile vi file # make a new file with the old name git stash Signed-off-by: Charles Bailey <charles@hashpling.org>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions