diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-05 21:08:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-05 21:08:53 -0800 |
| commit | 76d44c8cfda9be1db78884580ab045c421b083fe (patch) | |
| tree | 9ac31805cf463c84b0bd097e5246a1711181323b /resolve-undo.h | |
| parent | is_submodule_modified(): fix breakage with external GIT_INDEX_FILE (diff) | |
| parent | receive-pack: Send hook output over side band #2 (diff) | |
| download | tgif-76d44c8cfda9be1db78884580ab045c421b083fe.tar.xz | |
Merge branch 'sp/maint-push-sideband' into sp/push-sideband
* sp/maint-push-sideband:
receive-pack: Send hook output over side band #2
receive-pack: Wrap status reports inside side-band-64k
receive-pack: Refactor how capabilities are shown to the client
send-pack: demultiplex a sideband stream with status data
run-command: support custom fd-set in async
run-command: Allow stderr to be a caller supplied pipe
Update git fsck --full short description to mention packs
Conflicts:
run-command.c
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions