| 01:21.59 | *** join/#bzflag infobot (ibot@rikers.org) |
| 01:21.59 | *** topic/#bzflag is https://BZFlag.org || http://ohloh.net/p/bzflag || https://bzflag.org/help || Channel Logs: http://infobot.rikers.org/%23bzflag/ || 2.4.12 released! https://forums.bzflag.org/viewtopic.php?f=62&t=19720 |
| 01:21.59 | *** mode/#bzflag [+v infobot] by ChanServ |
| 01:28.30 | *** join/#bzflag nadir (uid134094@gateway/web/irccloud.com/x-xaxjurozkkhxgouc) |
| 01:39.36 | *** mode/#bzflag [-v Foo_man_choo] by ChanServ |
| 02:57.12 | *** join/#bzflag McSpider (~McSpider@li1055-178.members.linode.com) |
| 05:04.28 | *** join/#bzflag nadir (uid134094@gateway/web/irccloud.com/x-mheqdkdpjghtdrix) |
| 05:47.20 | *** join/#bzflag galileo_ (~QUJAAAAAA@d216-108-171-73.nt.northwestel.net) |
| 08:22.24 | *** join/#bzflag L4m3r_ (~L4m3r@bzflag/developer/L4m3r) |
| 08:22.24 | *** mode/#bzflag [+v L4m3r_] by ChanServ |
| 08:50.11 | *** join/#bzflag L4m3r__ (~L4m3r@bzflag/developer/L4m3r) |
| 08:50.11 | *** mode/#bzflag [+v L4m3r__] by ChanServ |
| 14:03.01 | *** join/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 14:03.01 | *** mode/#bzflag [+v BulletCatcher] by ChanServ |
| 14:05.06 | *** join/#bzflag nadir (uid134094@gateway/web/irccloud.com/x-fasukeeadlxbndjg) |
| 18:26.12 | *** join/#bzflag AAA_awright (~aaa@ns4001783.ip-198-100-144.net) |
| 19:05.42 | *** join/#bzflag gustavwashere (uid276023@gateway/web/irccloud.com/x-dchokkxsrwrnsjik) |
| 20:58.34 | *** join/#bzflag bertman (~bert@unaffiliated/bertman) |
| 21:13.46 | JeffM | so how do I take the last 3 commits from here, https://github.com/JeffM2501/LibBZFlag/commits/master and put them in this branch https://github.com/JeffM2501/LibBZFlag/tree/Many_Threads ? |
| 21:26.05 | allejo | git checkout Many_Threads; git merge master |
| 21:26.11 | allejo | it should fast forward you |
| 21:26.23 | allejo | or does Many_Threads have separate commits? |
| 21:26.39 | allejo | if it has separate commits then, git rebase master |
| 21:47.04 | JeffM | I only want those 2 |
| 21:47.16 | JeffM | master has commits I don't want in many_threads |
| 21:47.26 | JeffM | those 3 I mean |
| 21:47.36 | JeffM | is it simpler to just make the same changes in the branch? |
| 22:45.47 | allejo | ohh if it's just those two, then you can cherry pick them |
| 22:47.02 | allejo | git cherry-pick <hash> |
| 22:58.52 | JeffM | hey lookit that :) |
| 22:58.57 | JeffM | htanks |
| 22:58.59 | JeffM | thanks |
| 22:59.18 | JeffM | my mainline is not stable, but I have a branch using the code with a ton of threads. |
| 22:59.56 | JeffM | I anted to put those 3 commits for bzw parsing into the more stable branch |