diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:17:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:17:22 -0700 |
| commit | 99d9ec090677c925c534001f01cbaf303a31cb82 (patch) | |
| tree | d171c279c00aaced94ab6ee81885a874eedda564 /mergetools/ecmerge | |
| parent | Update draft release notes to 1.8.4 (diff) | |
| parent | transport-helper: check if the dry-run is supported (diff) | |
| download | tgif-99d9ec090677c925c534001f01cbaf303a31cb82.tar.xz | |
Merge branch 'fc/transport-helper-no-refspec'
With "export" remote-helper protocol,
(1) a push that tries to update a remote ref whose name is
different from the pushing side does not work yet, and
(2) the helper may not know how to do --dry-run
Detect such problematic cases and disable them for now.
* fc/transport-helper-no-refspec:
transport-helper: check if the dry-run is supported
transport-helper: barf when user tries old:new
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions