diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:03 -0800 |
| commit | 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 (patch) | |
| tree | 8aa05c695e7db70270d1473f40c4db0409f1d9d2 /pretty.c | |
| parent | 1067f8dd0eef81062f740ba4bc680ac9649a0d42 (diff) | |
| parent | 44df2e297025d7a9af6c265dfefb687b09e2537a (diff) | |
| download | git-4a3a1edd0be1c5254ae4fc66e06297d87ef7d530.tar.gz | |
Merge branch 'jm/stash-diff-disambiguate'
* jm/stash-diff-disambiguate:
stash: Don't fail if work dir contains file named 'HEAD'
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions