diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-19 17:44:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-19 17:44:07 -0700 |
| commit | 288c0384505e6c25cc1a162242919a0485d50a74 (patch) | |
| tree | 4113c62c9cabbd2b2f3b4937c97556ebaa767658 /git-merge-resolve.sh | |
| parent | Fix build procedure for builtin-init-db (diff) | |
| parent | Add a conversion tool to migrate remote information into the config (diff) | |
| download | tgif-288c0384505e6c25cc1a162242919a0485d50a74.tar.xz | |
Merge branch 'js/fetchconfig'
* js/fetchconfig:
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions