[Privoxy-devel] what did I do?

[Lee]

I only did one 'git push' this morning to fix compiler warnings.  I
don't know how those
  Lee	Merge branch 'master' of ssh://git.privoxy.org:23/git...
entries got created unless it was my normal get the latest changes process:

  git checkout master  -- to get back to the "master" branch
  git pull                     -- get the latest source
  git checkout lee       -- get back to my branch
  git merge master     -- merge the latest changes into my branch

but I've never noticed anything showing up on privoxy.org/gitweb/ before.

Did I actually change anything & if so, how do I undo it?


https://www.privoxy.org/gitweb/?p=privoxy.git;a=summary

shortlog
16 min ago 	Lee	fix compiler warnings about including winsock2.h
before... master 	commit | commitdiff | tree | snapshot
68 min ago 	Lee	Merge branch 'master' of
ssh://git.privoxy.org:23/git... 	commit | commitdiff | tree | snapshot
98 min ago 	Fabian Keil	Bring back the select()-based fallback code
	commit | commitdiff | tree | snapshot
2 hours ago 	Lee	Merge branch 'master' of
ssh://git.privoxy.org:23/git... 	commit | commitdiff | tree | snapshot
5 hours ago 	Fabian Keil	Regenerate docs 	commit | commitdiff | tree | snapshot

Lee