author | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Sep 2011 18:42:12 +0000 (11:42 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Sep 2011 18:42:12 +0000 (11:42 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 | 2 | |||
---|---|---|---|---|
Documentation/git-receive-pack.txt | patch | | diff1 | | diff2 | | blob | history |
Documentation/git.txt | patch | | diff1 | | diff2 | | blob | history |
builtin/receive-pack.c | patch | | diff1 | | diff2 | | blob | history |
remote-curl.c | patch | | diff1 | | diff2 | | blob | history |
transport.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-receive-pack.txt
Simple merge
diff --cc Documentation/git.txt
Simple merge
diff --cc builtin/receive-pack.c
Simple merge
diff --cc remote-curl.c
Simple merge
diff --cc transport.c
Simple merge