| 00:12.22 | Ressy | ah |
| 03:15.12 | *** join/#arl pompy (~Mike@c-50-166-85-212.hsd1.nj.comcast.net) |
| 03:15.12 | *** mode/#arl [+v pompy] by ChanServ |
| 14:03.33 | *** join/#arl Elkano (~elkano@WoWUIDev/WoWAce/Elkano) |
| 15:14.00 | sidji | moin |
| 15:56.57 | *** join/#arl Ressy (~Ressy@WoWUIDev/WoWAce/ARL/Ressy) |
| 15:56.58 | *** mode/#arl [+v Ressy] by ChanServ |
| 15:56.59 | Ressy | morning |
| 15:57.02 | Ressy | just had to do a merge. |
| 15:57.15 | Ressy | I'd been working on ARL trainer updates in Icecrown yesterday |
| 15:58.03 | Torhal | Ressy: Protip: Commit your changes, then pull/rebase. |
| 15:58.19 | Torhal | That avoids a merge. By doing a fast-forward commit. |
| 15:58.43 | Torhal | And I have no idea why I ended that sentence at merge |
| 15:58.48 | Ressy | I did to that. |
| 15:58.59 | Ressy | Commited, pulled, then pushed |
| 15:59.07 | Ressy | but that still showed up as a merge |
| 15:59.16 | Torhal | Did you do a rebase while you pulled, though? :D |
| 15:59.29 | Ressy | what is a rebase |
| 15:59.43 | Torhal | Are you using Git GUI? |
| 15:59.58 | Ressy | For pulling I'm using Git Bash, everything else is Git GUI |
| 16:00.27 | Torhal | Ok, from commandline: git pull --rebase |
| 16:00.36 | Ressy | and what does that do |
| 16:01.08 | Torhal | http://git-scm.com/book/en/Git-Branching-Rebasing |
| 16:01.29 | Torhal | Though that might be too convoluted because it involves branches. |
| 16:03.34 | Torhal | https://coderwall.com/p/7aymfa |
| 16:03.51 | Torhal | That explains it exactly. |
| 16:03.59 | Torhal | I've been up 24 hours so I'm wonky. |
| 16:04.01 | Torhal | Hehe |
| 16:04.10 | Ressy | I get the example on that first link |
| 16:04.47 | Ressy | will do that from now on |
| 16:07.30 | Torhal | Anyway, I wanted to make all the dumping stuff easier to do so I was going to add "/arl dump <type>" |
| 16:07.41 | Ressy | cool |
| 16:07.47 | Torhal | I ended up rewriting the command handler and fixing a nasty bug with "/arl scan" |
| 16:08.14 | Torhal | You could type anything at all after "scan" and it'd happily get passed to the Scan() method |
| 16:08.18 | Torhal | BOOM. |
| 18:47.06 | *** join/#arl Elkano (~elkano@WoWUIDev/WoWAce/Elkano) |
| 19:02.29 | Ac-town | you can also after just normally pulled |
| 19:02.34 | Ac-town | git rebase -i branch |
| 19:02.49 | Ac-town | which will also let you squash your commits |