summaryrefslogtreecommitdiff
path: root/git-lost-found.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-11 21:52:18 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-11 21:52:18 -0700
commit7baf32a829e6e253f8b3b683da470be36b54c377 (patch)
tree61d90f9c79285ec276cc4478c148395ca7c7ed6d /git-lost-found.sh
parent3fc44a10f62fdca29558dc553a3e12949af30637 (diff)
parent27269fc5f2781cd8f6e832043f9abf7305aa3d49 (diff)
downloadgit-7baf32a829e6e253f8b3b683da470be36b54c377.tar.gz
Merge branch 'jn/doc-dashdash' into maint
* jn/doc-dashdash: Documentation/i18n: quote double-dash for AsciiDoc Documentation: quote double-dash for AsciiDoc Conflicts: Documentation/git-mergetool--lib.txt
Diffstat (limited to 'git-lost-found.sh')
0 files changed, 0 insertions, 0 deletions