[Swan-dev] odd commit [Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

I'm not sure what the below is?

I rsync'ed my desktop libreswan.git to nssec.nohats.ca. Created a new
branch and worked there and pushed.

I have no idea where these merge commits are coming from. I think it
might have been caused by different git default behaviour.

A git pull back on my desktop shows the 9bfd0366687801 containing
nothing, so I hope indeed nothing happened.

Paul

---------- Forwarded message ----------
Date: Tue, 19 May 2015 15:32:59
From: Paul Wouters <paul at vault.libreswan.fi>
To: swan-commit at lists.libreswan.org
Subject: [Swan-commit] Changes to ref refs/heads/master

New commits:
commit 9bfd036668780167204355526e04c9bf2a688c83
Merge: 1ef9e06 ad39e9a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue May 19 15:31:47 2015 -0400

     Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan

commit 1ef9e06c7f2f1b67d564e882b23e1d8a940ac56c
Merge: 381d967 4ea973b
Author: root <root at nssec.nohats.ca>
Date:   Wed May 6 23:50:34 2015 -0400

     Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan

commit 381d9676d39847672ddd2bfc92298f8254b75261
Merge: 38a2327 1e23461
Author: root <root at vpn.nohats.ca>
Date:   Wed Jan 21 22:53:29 2015 -0500

     Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan

commit 38a2327b4cfa01c9979f98f1dd45286471bb677a
Merge: ada4081 180868a
Author: root <root at vpn.nohats.ca>
Date:   Sat Oct 4 21:02:09 2014 -0400

     Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan

commit ada4081a01d5531f94c8021e67b9b23ea0abc200
Merge: 3aa49a6 17f61d2
Author: root <root at vpn.nohats.ca>
Date:   Fri May 30 11:30:20 2014 -0400

     Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan

commit 3aa49a61780ad07bd55c7945b069fdeb6f58b739
Merge: ef23440 b345e49
Author: root <root at vpn.nohats.ca>
Date:   Tue Apr 29 22:09:04 2014 -0400

     Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan

commit ef23440894906f8168c28a7fb3792caff22e2738
Merge: b5ba210 efcf0ea
Author: root <root at vpn.nohats.ca>
Date:   Tue Apr 29 10:38:33 2014 -0400

     Merge branch 'addresspool-play'

_______________________________________________
Swan-commit mailing list
Swan-commit at lists.libreswan.org
https://lists.libreswan.org/mailman/listinfo/swan-commit