Merged master into upstream of libsdl2-image

[Dominique Dumont]

On Saturday 19 October 2013 00:31:26 Manuel A. Fernandez Montecelo wrote:
> Perhaps it would be better if one of you who has the directory checked
> out, before pulling my changes, reset the origin repository to your
> local state?

No need to.

I did not have the repo on my disk so i cloned from remote.

The merge from upstream into master did not break much: the upstream branch is 
now tied to master, but the actual history looks fine. 

The fix consists in putting upstream branch back on the latest upstream commit 
(tagged upstream/2.0.0+dfsg):

- delete upstream branch locally: git branch -d upstream
- delete remote branch: git push :upstream
- recreate upstream branch from the right place:
  git checkout -b upstream upstream/2.0.0+dfsg
- check the result with gitk
- push upstream: git push --all

Then the remote repo should be back to normal.

Feel free to get back to me in case of issue

HTH
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.alioth.debian.org/pipermail/pkg-sdl-maintainers/attachments/20131019/3c6de025/attachment.sig>