diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-19 17:12:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-19 17:12:36 -0700 |
| commit | 00a5b79466f79a2df6e0f42806adefbe4891c40b (patch) | |
| tree | c6de10054647cc929ce77910e6f9fd55c2948c16 /Documentation/git-merge-one-file.txt | |
| parent | df43b41afcc9bf5e4b8751dc9a53b068b33f52a8 (diff) | |
| parent | 896ba14d653c43bd7a43b6b291e941ab60855c04 (diff) | |
| download | git-00a5b79466f79a2df6e0f42806adefbe4891c40b.tar.gz | |
Merge branch 'jc/graduate-remote-hg-bzr' (early part)
* 'jc/graduate-remote-hg-bzr' (early part):
remote-helpers: point at their upstream repositories
contrib: remote-helpers: add move warnings (v2.0)
Revert "Merge branch 'fc/transport-helper-sync-error-fix'"
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions