diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:16:00 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:16:00 -0800 |
commit | bd6934af9bb8c4b86026d6aeb3a9c85d32ae1790 (patch) | |
tree | 8b4fc8d5947555eeb8fc82d069b106b150ec6b66 /git-merge-resolve.sh | |
parent | 05f1539b7fb4809a406feaa8434bc2c58155d13d (diff) | |
parent | 99c08d4eb28f0525d71125e7903fd4462bfd6787 (diff) | |
download | git-bd6934af9bb8c4b86026d6aeb3a9c85d32ae1790.tar.gz git-bd6934af9bb8c4b86026d6aeb3a9c85d32ae1790.tar.xz |
Merge branch 'tg/ls-remote-symref'
"ls-remote" learned an option to show which branch the remote
repository advertises as its primary by pointing its HEAD at.
* tg/ls-remote-symref:
ls-remote: add support for showing symrefs
ls-remote: use parse-options api
ls-remote: fix synopsis
ls-remote: document --refs option
ls-remote: document --quiet option
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions