| --- Log opened Wed Jul 24 00:00:42 2019 |
| 00:44 | | celticminstrel [celticminst@Nightstar-6an2qt.dsl.bell.ca] has joined #code |
| 00:44 | | mode/#code [+o celticminstrel] by ChanServ |
| 02:02 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has quit [Connection closed] |
| 04:25 | | celticminstrel [celticminst@Nightstar-6an2qt.dsl.bell.ca] has quit [[NS] Quit: And lo! The computer falls into a deep sleep, to awake again some other day!] |
| 04:55 | | Pinkhair [user1@Nightstar-g7hdo5.dyn.optonline.net] has joined #code |
| 04:56 | | Pink [user1@Nightstar-g7hdo5.dyn.optonline.net] has quit [Ping timeout: 121 seconds] |
| 05:23 | | Pink` [user1@Nightstar-g7hdo5.dyn.optonline.net] has joined #code |
| 05:27 | | Pinkhair [user1@Nightstar-g7hdo5.dyn.optonline.net] has quit [Ping timeout: 121 seconds] |
| 05:31 | | ToxicFrog [ToxicFrog@ServerAdministrator.Nightstar.Net] has quit [Ping timeout: 121 seconds] |
| 05:35 | | ToxicFrog [ToxicFrog@ServerAdministrator.Nightstar.Net] has joined #code |
| 05:35 | | mode/#code [+ao ToxicFrog ToxicFrog] by ChanServ |
| 07:41 | | macdjord [macdjord@Nightstar-rslo4b.mc.videotron.ca] has joined #code |
| 07:41 | | mode/#code [+o macdjord] by ChanServ |
| 07:44 | | mac [macdjord@Nightstar-rslo4b.mc.videotron.ca] has quit [Ping timeout: 121 seconds] |
| 08:10 | | mac [macdjord@Nightstar-rslo4b.mc.videotron.ca] has joined #code |
| 08:10 | | mode/#code [+o mac] by ChanServ |
| 08:13 | | macdjord [macdjord@Nightstar-rslo4b.mc.videotron.ca] has quit [Ping timeout: 121 seconds] |
| 08:15 | | macdjord|slep [macdjord@Nightstar-rslo4b.mc.videotron.ca] has joined #code |
| 08:15 | | mode/#code [+o macdjord|slep] by ChanServ |
| 08:18 | | mac [macdjord@Nightstar-rslo4b.mc.videotron.ca] has quit [Ping timeout: 121 seconds] |
| 08:32 | | Degi [Degi@Nightstar-tsn1km.dyn.telefonica.de] has joined #code |
| 08:38 | | Degi [Degi@Nightstar-tsn1km.dyn.telefonica.de] has quit [Connection closed] |
| 09:33 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has joined #code |
| 09:33 | | mode/#code [+qo Vornicus Vornicus] by ChanServ |
| 13:09 | | celticminstrel [celticminst@Nightstar-6an2qt.dsl.bell.ca] has joined #code |
| 13:09 | | mode/#code [+o celticminstrel] by ChanServ |
| 13:51 | | celticminstrel is now known as celmin|away |
| 15:04 | <&jeroud> | When you reach the "Japanese whisky" stage of a kubernetes cluster upgrade... https://usercontent.irccloud-cdn.com/file/uWrLJeVh/IMAG1105_1.jpg |
| 16:20 | | catalyst [Jessikat@Nightstar-5dv16h.cable.virginm.net] has joined #code |
| 16:26 | | catalyst` [Jessikat@Nightstar-5dv16h.cable.virginm.net] has joined #code |
| 16:27 | | catalyst [Jessikat@Nightstar-5dv16h.cable.virginm.net] has quit [Ping timeout: 121 seconds] |
| 16:28 | | ErikMesoy1 [Bruker@Nightstar-idn3a6.bb.online.no] has joined #code |
| 16:31 | | ErikMesoy [Bruker@Nightstar-idn3a6.bb.online.no] has quit [Ping timeout: 121 seconds] |
| 16:55 | | Emmy [Emmy@Nightstar-9p7hb1.direct-adsl.nl] has joined #code |
| 17:08 | <&[R]> | <ToxicFrog> I believe there's some set of arguments you can pass to `git pull` that lets you do this in fewer commands, but I rarely use `pull`. <-- how do you get updates from upstream then? |
| 17:13 | | ErikMesoy1 is now known as ErikMesoy |
| 17:13 | <&ToxicFrog> | [R]: I use `fetch` and then `merge` or `rebase`. |
| 17:13 | | mode/#code [+o ErikMesoy] by ChanServ |
| 17:13 | <&[R]> | Ah, what's the advantage of that? |
| 17:14 | <&ToxicFrog> | Greater control over how (or if) upstream changes get integrated into my local work. |
| 17:15 | <&ToxicFrog> | `pull` is just an alias for `fetch` followed by `merge` or `rebase` (which one, and the exact details of the invokation, depending on how you invoked pull and what your remote and per-branch configurations are) |
| 17:15 | <&[R]> | I'll have to try that |
| 17:15 | <&ToxicFrog> | Running them separately lets you look at what you just fetched before it gets integrated and decide how to handle it. |
| 17:15 | | * [R] should really learn how to use branches |
| 17:19 | <&ToxicFrog> | They're pretty handy. |
| 21:16 | <@TheWatcher> | git fetch && git diff ...origin/branchname has saved me some serious headaches before now |
| 21:50 | | Emmy [Emmy@Nightstar-9p7hb1.direct-adsl.nl] has quit [Ping timeout: 121 seconds] |
| 21:55 | | catalyst` [Jessikat@Nightstar-5dv16h.cable.virginm.net] has quit [Connection closed] |
| 22:28 | <@Alek> | makes you wish you could git diff on nvidia's video drivers, to figure out what made your games stop working and when. :P |
| --- Log closed Thu Jul 25 00:00:43 2019 |