diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-24 02:34:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-24 02:34:27 -0800 |
| commit | 3fbe2d54d7d91378934df7b16d70dc5877586fae (patch) | |
| tree | 8aef6b68c45dc994937c12d12083bf010c63def0 /git-merge-octopus.sh | |
| parent | 30d055aa1e45b4740edc3bfbff77fa5d65e106ff (diff) | |
| parent | 937a515a15f776aa84430574f71367292a52b978 (diff) | |
| download | git-3fbe2d54d7d91378934df7b16d70dc5877586fae.tar.gz | |
Merge branch 'jc/upload-pack'
* jc/upload-pack:
upload-pack: stop the other side when they have more roots than we do.
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions