diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-03 13:48:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-03 13:48:00 -0800 |
| commit | 228c3418356d06d0596408bee1c863e53ca27d58 (patch) | |
| tree | c31e492269375ccca3cc081b015d26c5f13769df /contrib/examples/git-merge-ours.sh | |
| parent | Update draft release notes to 1.7.9 (diff) | |
| parent | Merge branch 'maint-1.7.7' into maint (diff) | |
| download | tgif-228c3418356d06d0596408bee1c863e53ca27d58.tar.xz | |
Merge branch 'maint'
* maint:
docs: describe behavior of relative submodule URLs
fix hang in git fetch if pointed at a 0 length bundle
Documentation: read-tree --prefix works with existing subtrees
Add MYMETA.json to perl/.gitignore
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions