search

sbp / saxo

Quick and flexible irc bot, extensible in any language
http://inamidst.com/saxo/
Apache License 2.0
52 stars 22 forks source link

Git is stupid #16

Closed nomicode closed 10 years ago

nomicode commented 10 years ago

Why does anybody use it?

sbp commented 10 years ago

I don't know what caused the earlier commits to appear in this PR, but I expect that the PR that was used to merge from upstream was done after branching. For our reference, it appears that the proper way to sync with upstream is:

$ git remote add upstream git://github.com/sbp/saxo.git
$ git fetch upstream
$ git checkout master
$ git merge upstream/master master

Though it looks like some people do a rebase too.

Anyway, fix suggestion noted in new issue #17! Thanks.