diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:22 -0800 |
| commit | 200888ef3bbc150cc20b99e0aa039c751c00e07a (patch) | |
| tree | 8b1421c5aafe507c8ca50b1b421c8f33cf084d9a /t/t6037-merge-ours-theirs.sh | |
| parent | e443bdfe1e8e1ef8b3665cfd1c1295bd73e13773 (diff) | |
| parent | 02f7914734eb8360cf314d887931c5d5ad0d8046 (diff) | |
| download | git-200888ef3bbc150cc20b99e0aa039c751c00e07a.tar.gz | |
Merge branch 'jk/http-push-to-empty'
* jk/http-push-to-empty:
remote-curl: don't pass back fake refs
Conflicts:
remote-curl.c
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions