diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-11 12:43:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-11 12:43:58 -0700 |
| commit | fb60f344e441788040dbeec8f85ccd826ceaacd1 (patch) | |
| tree | d6960dbf992b0fe67911b28066336b395b4ffc66 /resolve-undo.c | |
| parent | 3b942e9df7314f40d99e6aaa2c62070bb36024c5 (diff) | |
| parent | 682853e687ff0106bea25bdb5e9d60d9657cecb3 (diff) | |
| download | git-fb60f344e441788040dbeec8f85ccd826ceaacd1.tar.gz git-fb60f344e441788040dbeec8f85ccd826ceaacd1.tar.xz | |
Merge branch 'jc/request-pull-match-tagname' into maint
"git request-pull $url dev" when the tip of "dev" branch was tagged
with "ext4-for-linus" used the contents from the tag in the output
but still asked the "dev" branch to be pulled, not the tag.
* jc/request-pull-match-tagname:
request-pull: really favor a matching tag
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions