diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 18:39:24 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 18:39:24 +0200 |
| commit | 1ad6d46235d135582d5cbb91ec0186b485c7b5c1 (patch) | |
| tree | e4a98d08b88862305d9f13ccef82180de33e8bcc /git-merge-resolve.sh | |
| parent | Merge branch 'am/status' (diff) | |
| parent | push: receiver end advertises refs from alternate repositories (diff) | |
| download | git-1ad6d46235d135582d5cbb91ec0186b485c7b5c1.tar.xz git-1ad6d46235d135582d5cbb91ec0186b485c7b5c1.zip | |
Merge branch 'jc/alternate-push'
* jc/alternate-push:
push: receiver end advertises refs from alternate repositories
push: prepare sender to receive extended ref information from the receiver
receive-pack: make it a builtin
is_directory(): a generic helper function
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions