I had created a shallow clone of a huge repository (for saving my time) using
git clone --depth=1 ...
Some days later, I thought I'd fetch the latest commits from the remote repository. I entered
git pull
but it started downloading a lot more info than I had in the first place (my initial shallow clone was ~150MB and here the pull was already downloading more than 100MB and showing 22%) so I pressed Ctrl-C and stopped it. After that, I tried (just randomly)
git pull --depth=1
and that threw up a lot of errors. And now I am left with a local repository where git status says:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 3 and 4 different commits each, respectively.
#
Is there any way to set things right, apart from creating a new shallow clone? I have no commits of my own so all is cool.