![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:44:03 +0000 (12:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:44:03 +0000 (12:44 -0800) | ||
| commit | 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 | |
| tree | 8aa05c695e7db70270d1473f40c4db0409f1d9d2 | tree | snapshot |
| parent | 1067f8dd0eef81062f740ba4bc680ac9649a0d42 | commit | diff |
| parent | 44df2e297025d7a9af6c265dfefb687b09e2537a | commit | diff |
Merge branch 'jm/stash-diff-disambiguate'
* jm/stash-diff-disambiguate:
stash: Don't fail if work dir contains file named 'HEAD'
* jm/stash-diff-disambiguate:
stash: Don't fail if work dir contains file named 'HEAD'