diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:49:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:49:33 -0700 |
| commit | 90e6255a6d01760d13d8ac635cca5819b0b4dbc5 (patch) | |
| tree | ae04f89b4316b70e09807479c3edd949751c4c20 /builtin/update-index.c | |
| parent | Merge branch 'nd/sha1-file-delta-stack-leakage-fix' (diff) | |
| parent | remote-bzr: support the new 'force' option (diff) | |
| download | tgif-90e6255a6d01760d13d8ac635cca5819b0b4dbc5.tar.xz | |
Merge branch 'fc/transport-helper-fixes'
Updates transport-helper, fast-import and fast-export to allow the
ref mapping and ref deletion in a way similar to the natively
supported transports.
* fc/transport-helper-fixes:
remote-bzr: support the new 'force' option
test-hg.sh: tests are now expected to pass
transport-helper.c: do not overwrite forced bit
transport-helper: check for 'forced update' message
transport-helper: add 'force' to 'export' helpers
transport-helper: don't update refs in dry-run
transport-helper: mismerge fix
Diffstat (limited to 'builtin/update-index.c')
0 files changed, 0 insertions, 0 deletions