Andrew's git / gitweb.git / diff
?
Merge branch 'np/maint-sideband-favor-status' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:50:24 +0000 (13:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:50:24 +0000 (13:50 -0800)
* np/maint-sideband-favor-status:
give priority to progress messages

1  2 
builtin-upload-archive.c patch | diff1 | diff2 | blob | history
upload-pack.c patch | diff1 | diff2 | blob | history
diff --cc builtin-upload-archive.c
Simple merge
diff --cc upload-pack.c
Simple merge