Merge branch 'nd/fetch-depth-is-broken'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:39:24 +0000 (12:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:39:24 +0000 (12:39 -0800)
"git fetch --depth" was broken in at least three ways.  The
resulting history was deeper than specified by one commit, it was
unclear how to wipe the shallowness of the repository with the
command, and documentation was misleading.

* nd/fetch-depth-is-broken:
  fetch: elaborate --depth action
  upload-pack: fix off-by-one depth calculation in shallow clone
  fetch: add --unshallow for turning shallow repo into complete one

1  2 
commit.h
upload-pack.c

diff --cc commit.h
Simple merge
diff --cc upload-pack.c
Simple merge