diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 21:44:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 21:44:03 +0100 |
| commit | 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 (patch) | |
| tree | 8aa05c695e7db70270d1473f40c4db0409f1d9d2 /notes-merge.c | |
| parent | Merge branch 'jh/fetch-head-update' (diff) | |
| parent | stash: Don't fail if work dir contains file named 'HEAD' (diff) | |
| download | git-4a3a1edd0be1c5254ae4fc66e06297d87ef7d530.tar.xz git-4a3a1edd0be1c5254ae4fc66e06297d87ef7d530.zip | |
Merge branch 'jm/stash-diff-disambiguate'
* jm/stash-diff-disambiguate:
stash: Don't fail if work dir contains file named 'HEAD'
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions