diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-09 01:40:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-09 01:40:08 -0700 |
| commit | 0bb3a0ba9e3cbb283a747e4736bcf7484d076a73 (patch) | |
| tree | 8e922c74687a8f335ea422a0eb9643a54d0d8c9b /git-mergetool.sh | |
| parent | a9fd1383a73878284d4157b20ac7c735e876102e (diff) | |
| parent | 0f4f4d1597219bad74c4fde624321d8a05d1b55e (diff) | |
| download | git-0bb3a0ba9e3cbb283a747e4736bcf7484d076a73.tar.gz git-0bb3a0ba9e3cbb283a747e4736bcf7484d076a73.tar.xz | |
Merge branch 'maint'
* maint:
asciidoc markup fixes
Fail properly when cloning from invalid HTTP URL
Conflicts:
Documentation/git-push.txt
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions