| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** nash has quit IRC | 00:01 | |
| llnz | bbl | 00:33 |
|---|---|---|
| *** llnz has quit IRC | 00:33 | |
| *** Landon has quit IRC | 00:59 | |
| *** Landon has joined #tp | 01:00 | |
| *** jnengland77 has joined #tp | 01:02 | |
| *** Greywhind has quit IRC | 01:02 | |
| *** Landon has quit IRC | 01:12 | |
| *** Landon has joined #tp | 01:12 | |
| *** jnengland77 has quit IRC | 01:40 | |
| *** shenki_ has joined #tp | 02:19 | |
| *** shenki has quit IRC | 02:20 | |
| *** shenki_ is now known as shenki | 02:33 | |
| *** llnz has joined #tp | 06:16 | |
| mithro | hey llnz | 06:32 |
| llnz | hi mithro | 06:34 |
| *** mithro has quit IRC | 07:14 | |
| ezod | looks like we need to let google know by oct 1 if we don't plan on sending anyone besides me to the summit | 07:16 |
| ezod | s/don't// | 07:16 |
| ezod | oh | 07:17 |
| ezod | mithro is on there :) | 07:18 |
| *** llnz2 has joined #tp | 08:07 | |
| *** llnz has quit IRC | 08:07 | |
| *** llnz2 is now known as llnz | 08:07 | |
| * llnz wanders off | 08:24 | |
| llnz | later all | 08:24 |
| *** llnz has quit IRC | 08:24 | |
| *** shenki has quit IRC | 09:14 | |
| *** shenki has joined #tp | 09:16 | |
| *** shenki has joined #tp | 09:18 | |
| *** peres has joined #tp | 09:19 | |
| *** shenki_ has joined #tp | 09:21 | |
| *** shenki_ has quit IRC | 09:28 | |
| *** bddebian has joined #tp | 10:02 | |
| *** peres has quit IRC | 11:25 | |
| *** DTRemenak|RDP is now known as DTRemenak | 11:46 | |
| *** jmtan has joined #tp | 12:27 | |
| *** zzorn has quit IRC | 14:20 | |
| *** zzorn has joined #tp | 14:21 | |
| *** zzorn has quit IRC | 14:26 | |
| *** zzorn has joined #tp | 14:27 | |
| *** jmtan has quit IRC | 15:07 | |
| *** Greywhind has joined #tp | 15:38 | |
| *** alanp has joined #tp | 15:56 | |
| *** bddebian has quit IRC | 16:35 | |
| *** llnz has joined #tp | 16:36 | |
| llnz | morning all | 16:36 |
| alanp | hey | 16:36 |
| *** alanp has quit IRC | 16:56 | |
| *** jnengland77 has joined #tp | 17:08 | |
| *** alanp_ is now known as alanp | 17:28 | |
| *** Erroneous has joined #tp | 19:06 | |
| *** jnengland77 has quit IRC | 19:12 | |
| *** nash has joined #tp | 19:21 | |
| *** mithro has joined #tp | 20:24 | |
| shenki | any git experts able to lend some advice? | 20:46 |
| shenki | im writing a patch on a branch, and need to rebase it every now and then, but trunk is changing so often that some of the earlier patches keep gaining conflicts | 20:47 |
| shenki | what's a git-ish way to say "forget about all of my branch history, just make the branch rebased with the latest version of my code" | 20:47 |
| shenki | some form of squashed commit is what i want, but i dunno the right way to do it | 20:48 |
| tansell | shenki, just use --amend to keep a single patch? | 20:54 |
| shenki | tansell: what commaned is amend associated with? | 20:56 |
| tansell | commit | 20:56 |
| shenki | ah, only one 'm' in amend | 20:57 |
| tansell | shenki, and I'm the one who can't spell :P | 21:00 |
| shenki | ;) | 21:00 |
| shenki | hrm | 21:00 |
| shenki | i missread the documentation | 21:00 |
| shenki | if i just git reset --soft <some old commit>, have i lost all of my commits between HEAD and <some old commit> ? | 21:00 |
| tansell | shenki, reflog to the rescue! | 21:01 |
| shenki | omg. that is awesome. | 21:01 |
| shenki | it's like a diary | 21:01 |
| *** Erroneous has quit IRC | 21:01 | |
| tansell | only time you loose data if you do a git gc | 21:02 |
| Landon | OH | 21:02 |
| * Landon was wondering why we were flogging git | 21:02 | |
| shenki | tansell: hrm, so ammend works if i only have a pair of commits | 21:05 |
| shenki | is there a way to do this when i have about 10 commits that i want to squash? | 21:05 |
| tansell | yeah you can squash commit | 21:05 |
| tansell | which is a basically a merge then commit | 21:06 |
| tansell | create a new branch | 21:06 |
| tansell | do a "git merge --squash" | 21:06 |
| shenki | ah yep | 21:06 |
| shenki | see, thats how i was going to solve it | 21:06 |
| shenki | but git cl stores the metadata associating my branch to a CL | 21:06 |
| shenki | so i wanted to see if i could do it in the current branch | 21:07 |
| shenki | but nvm, it's not hard to copy the metadata | 21:07 |
| tansell | just delete the original branch | 21:07 |
| tansell | and rename your branch back to the original name? | 21:07 |
| tansell | I had a proposal for using tags which would make this work properly | 21:07 |
| tansell | but I never finished it | 21:07 |
| shenki | tags for git cl? or? | 21:08 |
| tansell | yeah use tags rather then stuff in the .git/config file | 21:09 |
| tansell | means that you could push around the information | 21:09 |
| shenki | yep | 21:09 |
| *** jnengland77 has joined #tp | 21:31 | |
| *** alanp_ has joined #tp | 22:55 | |
| *** alanp has quit IRC | 22:57 | |
| *** tansell-laptop has joined #tp | 23:30 | |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!