| 2014-01-07 |
| ← hays_ left | 00:00 |
| → hays_ joined | 00:00 |
| → girishr_ joined | 00:00 |
| → nafg__ joined | 00:00 |
| → azyr joined | 00:00 |
| → de-Vri-es_ joined | 00:00 |
| ← tang^^ left | 00:00 |
| ← skorgon_ left | 00:01 |
| → Petazz_ joined | 00:02 |
| → yhager_ joined | 00:02 |
| → daivyk_ joined | 00:02 |
| → brandonw1 joined | 00:02 |
| ← petey left | 00:02 |
| ← daivyk left | 00:02 |
| ← _Qman left | 00:02 |
| ← Octalot left | 00:02 |
| ← raniere left | 00:02 |
| ← mizu_no_oto left | 00:02 |
| ← yhager left | 00:02 |
| ← BiggFREE left | 00:02 |
| ← netcarver left | 00:02 |
| ← pheaver left | 00:02 |
| ← simesy left | 00:02 |
| ← Gamecubic left | 00:02 |
| ← aartist left | 00:02 |
| ← Chaser left | 00:02 |
| ← ivan` left | 00:02 |
| ← Will| left | 00:02 |
| ← girishr left | 00:02 |
| ← rafaqueque left | 00:02 |
| ← akiva left | 00:02 |
| ← michaelpjohnson left | 00:02 |
| ← bwreilly left | 00:02 |
| ← hyperair left | 00:02 |
| ← mmattice left | 00:02 |
| ← rpg left | 00:02 |
| ← acharlieh left | 00:02 |
| ← tang^ left | 00:02 |
| ← keller left | 00:02 |
| ← de-Vri-es left | 00:02 |
| ← blahdodo left | 00:02 |
| ← Layke left | 00:02 |
| ← jxport left | 00:02 |
| ← Lunatrius left | 00:02 |
| ← dsantiago left | 00:02 |
| ← gdrc left | 00:02 |
| ← lifelike left | 00:02 |
| ← obert left | 00:02 |
| ← nafg left | 00:02 |
| ← qsusOFFcs left | 00:02 |
| ← regreddit left | 00:02 |
| ← azyr_ left | 00:02 |
| ← hays left | 00:02 |
| ← Petazz left | 00:02 |
| ← odigity left | 00:02 |
| ← brandonw left | 00:02 |
| ← ribasushi left | 00:02 |
| Lunatrius` → Lunatrius | 00:02 |
| ← Eryn_1983_FL left | 00:03 |
| → mizu_no_oto joined | 00:03 |
| → akiva joined | 00:03 |
| ← bwreilly_ left | 00:03 |
| → acharlieh joined | 00:03 |
| → netcarver joined | 00:03 |
| → gdrc joined | 00:03 |
| → simesy joined | 00:03 |
| → qsusOFFcs joined | 00:03 |
| → lite_ joined | 00:03 |
| → Will| joined | 00:03 |
| → Layke joined | 00:04 |
| ← Layke left | 00:04 |
| → Layke joined | 00:04 |
| ← decotii left | 00:04 |
| → odigity joined | 00:04 |
| → ribasushi joined | 00:04 |
| → mmattice joined | 00:04 |
| → ivan` joined | 00:04 |
| → michaelpjohnson joined | 00:04 |
| → pheaver joined | 00:04 |
| → raniere joined | 00:04 |
| → regreddit joined | 00:04 |
| → gelardi_ joined | 00:04 |
| ← amortimer_mbp left | 00:04 |
| → dsantiago joined | 00:05 |
| ← raniere left | 00:05 |
| → skorgon_1 joined | 00:05 |
| ← zhost left | 00:06 |
| → Chaser joined | 00:06 |
| → blahdodo joined | 00:06 |
| → daube joined | 00:06 |
| → jxport joined | 00:06 |
| ← halu left | 00:07 |
| → BillyJack joined | 00:07 |
| ← lite_ left | 00:08 |
| ← aton` left | 00:08 |
| ← senj left | 00:09 |
| ← shawndumas left | 00:09 |
| ← leeN left | 00:09 |
| → xpirator joined | 00:10 |
| ← ariscop left | 00:11 |
| ← skorgon_1 left | 00:11 |
| ← slyfox left | 00:11 |
| → dsdeiz joined | 00:12 |
| ← rlubke left | 00:13 |
| ← gelardi_ left | 00:13 |
| ← MacWinner left | 00:13 |
| → MrSmurf joined | 00:13 |
| ← kevwil left | 00:13 |
| ← xSmurf left | 00:14 |
| MrSmurf → xSmurf | 00:14 |
| → royho joined | 00:14 |
| → rfoust joined | 00:14 |
| ← gdogrady left | 00:15 |
| → mribeirodantas joined | 00:15 |
| → skorgon_1 joined | 00:15 |
| ← royho left | 00:15 |
| ← angrytongan left | 00:16 |
| ← Landshark753 left | 00:17 |
| → gdogrady joined | 00:19 |
| ← Noldorin left | 00:19 |
| → LuxuryMode joined | 00:19 |
| ← joelm_ left | 00:19 |
| → rlubke joined | 00:20 |
| ← abbycabs left | 00:20 |
| → Noldorin joined | 00:20 |
| → joelm joined | 00:20 |
| ← skorgon_1 left | 00:20 |
| → dfanjul joined | 00:21 |
| ← LuxuryMode left | 00:22 |
| → LuxuryMode joined | 00:22 |
| ← JGarrido left | 00:22 |
| ← ciampix left | 00:22 |
| → abbycabs joined | 00:23 |
| ← abbycabs left | 00:23 |
| → JustinMac joined | 00:23 |
| ← LucasKA left | 00:24 |
| ← rafaqueq_ left | 00:24 |
| → skorgon_1 joined | 00:24 |
| ← rlubke left | 00:24 |
| → bwreilly joined | 00:24 |
| → dyng joined | 00:26 |
| ← joelm left | 00:26 |
|
offby1
| *shudder* | 00:27 |
| → joelm joined | 00:27 |
|
offby1
| nickoe: it might depend on exactly how you invoked it. Can you paste the command line? | 00:27 |
|
nickoe
| offby1: I did like "git svn clone http://my-project.googlecode.com/svn -s my_project" | 00:28 |
|
| or rather "git svn clone file:///afs/foo/svn" | 00:29 |
|
offby1
| what does "svn ls file:///afs/foo/svn" say? | 00:29 |
|
| I'm wondering if you need to specify another component in that URL | 00:29 |
|
| Note that I haven't run git-svn in _years_ | 00:30 |
| ← skorgon_1 left | 00:30 |
|
nickoe
| hmm, wait a minute | 00:31 |
|
| seems to work now | 00:31 |
| zz_karupanerura → karupanerura | 00:31 |
|
nickoe
| doing git svn clone file:///afs/foo/svnrepo | 00:31 |
| → tmcmahon joined | 00:32 |
| ← smashwilson left | 00:32 |
|
offby1
| guess you musta mistyped "svn" for "svnrepo". | 00:32 |
|
| Or else you're pretty sloppy with what you're pasting into the channe | 00:33 |
|
| l | 00:33 |
|
nickoe
| hmm, so when I invoke it with any options it fails, and only leave an empty | 00:33 |
|
| offby1: no the repodir is correct, and the same as when I invoke it with or withour paramaters. | 00:34 |
| → skorgon_1 joined | 00:34 |
| → Kayra joined | 00:34 |
| ← schemanic left | 00:34 |
| → zack6849 joined | 00:35 |
|
offby1
| glad it's working | 00:35 |
|
| be prepared to wait a _long_ time :) | 00:35 |
| → john2x joined | 00:35 |
| ← marhaban left | 00:35 |
|
nickoe
| offby1: the repo is not that big only about 90 commits | 00:36 |
| → kukks joined | 00:37 |
|
nickoe
| Good that worked, though the log is messy because of those svn-id's and the author is not good | 00:37 |
| ← Sonderblade left | 00:37 |
|
nickoe
| ok, seems like I can use --no-metadata and --authors-file but apparently not -s | 00:38 |
|
| that was the option I would have expected to absolutely not make any problems | 00:38 |
|
offby1
| nickoe: if you're not satisfied with the resulting git-repository, take a look at Eric Raymond's "reposurgeon" | 00:39 |
| ← skorgon_1 left | 00:39 |
|
nickoe
| offby1: thank you I will keep that in mind. But now lets see if it is good enough with the authors file and no metadata. | 00:40 |
| ← tmcmahon left | 00:41 |
|
nickoe
| ohh, I misunderstood -s | 00:41 |
|
| :o | 00:41 |
|
| stupid me | 00:41 |
|
| this repo does not have trunk et.al | 00:41 |
|
| Logs seems good now, so it appears it was just me that was the entire problem. sigh | 00:43 |
| → skorgon_1 joined | 00:43 |
| ← bwreilly left | 00:45 |
| ← phipes left | 00:46 |
| ← cebor left | 00:47 |
| ← hwrdprkns left | 00:47 |
| → johnkevinmbasco joined | 00:47 |
| ← trevlix left | 00:47 |
| ← Diemuzi left | 00:49 |
| ← skorgon_1 left | 00:49 |
| → Cephalostrum joined | 00:49 |
| → bwreilly joined | 00:49 |
| ← lavaman left | 00:51 |
| → LucasKA joined | 00:52 |
| → BiggFREE joined | 00:52 |
| → hwrdprkns joined | 00:52 |
| → phipes joined | 00:53 |
| → skorgon_1 joined | 00:53 |
| → angrytongan joined | 00:53 |
| → konadr joined | 00:55 |
| ← Kayra left | 00:55 |
|
nickoe
| offby1: huh, the git repo is twice the size of the svn | 00:56 |
|
| whilst the checked out svn is a little over twice the git | 00:57 |
| ← refried_ left | 00:58 |
| → refried_ joined | 00:58 |
| → ariscop joined | 00:58 |
| ← skorgon_1 left | 00:59 |
| ← HelloShitty left | 00:59 |
| → ni__ joined | 00:59 |
| ← harish_ left | 00:59 |
| → harish joined | 01:00 |
| ← konadr left | 01:00 |
| ← tvw left | 01:00 |
| → leeN joined | 01:00 |
| ← leeN left | 01:00 |
|
offby1
| nickoe: I think "git gc" or "git repack" will compress it nicely | 01:01 |
|
| not sure which is best; rtfm | 01:02 |
| ← oriba left | 01:02 |
| → mallet joined | 01:02 |
|
offby1
| typically a git repository that's been converted from svn will be much _smaller_ than the original, not bigger. | 01:02 |
| → skorgon_1 joined | 01:03 |
| ← robbyoconnor left | 01:03 |
| ← gsvolt left | 01:03 |
| ← phipes left | 01:03 |
| → robbyoconnor joined | 01:03 |
|
nickoe
| Well the "checked out" git repo is smaller than the svn checkout, but the repo on the server is smaller. I will look at gc and repack | 01:03 |
| ← imachuchu left | 01:04 |
| ← nwertman left | 01:04 |
| → pikaren joined | 01:04 |
| → adambrenecki joined | 01:04 |
| ← LucasKA left | 01:05 |
|
d0liver
| test | 01:05 |
| ← daube left | 01:05 |
| ← dsdeiz left | 01:05 |
|
nickoe
| d0liver: pong | 01:05 |
| → sakb joined | 01:06 |
| ← nevyn left | 01:07 |
| → hyperair joined | 01:07 |
| ← skorgon_1 left | 01:08 |
| ← xpirator left | 01:09 |
| ← harish left | 01:11 |
| ← Skrypter left | 01:11 |
| ← Zarthus left | 01:12 |
| ← ni__ left | 01:12 |
| → HelloShitty joined | 01:12 |
| → skorgon_1 joined | 01:12 |
| → arizuka joined | 01:13 |
| ← becks__ left | 01:13 |
| → Skrypter joined | 01:13 |
| ← Skrypter left | 01:13 |
| → sgu joined | 01:13 |
| → Skrypter joined | 01:14 |
|
sgu
| Hi all, I am using Magit. Is there a way to do git check -- <file> to discard changes? | 01:14 |
|
offby1
| you meant "checkout", and yeah, I think so | 01:14 |
|
sgu
| yes. | 01:15 |
|
offby1
| sgu: better to ask in #emacs, if you can stand the low s/n :-) | 01:15 |
| → rjc joined | 01:15 |
|
offby1
| I think k, in the *magit-status* buffer, will "kill" your changes | 01:15 |
|
| effectively doing "git checkout --" | 01:15 |
| ← aleng_ left | 01:16 |
| → nevyn joined | 01:16 |
| → LucasKA joined | 01:17 |
| ← Guest52001 left | 01:17 |
| → koda joined | 01:18 |
| ← skorgon_1 left | 01:18 |
| ← Skrypter left | 01:19 |
|
sgu
| yes, "k" does it. | 01:20 |
| → Skrypter joined | 01:21 |
| ← Skrypter left | 01:21 |
|
sgu
| But can I select multiple files in magit and then press only one "k", and undo all the changes? | 01:21 |
| → skorgon_1 joined | 01:21 |
| → Skrypter joined | 01:22 |
| ← Skrypter left | 01:22 |
| → Skrypter joined | 01:22 |
| ← Skrypter left | 01:22 |
| → Skrypter joined | 01:23 |
| ← Gamecubic_ left | 01:23 |
| ← thalisson_ left | 01:23 |
| ← FatDarrel left | 01:23 |
| → thalisson_ joined | 01:24 |
| ← refried_ left | 01:24 |
| → Spudster_away joined | 01:24 |
| → phipes joined | 01:25 |
| → ehmatthes joined | 01:25 |
| ← Spudster_away left | 01:25 |
| ← rjc left | 01:25 |
| → nwertman joined | 01:25 |
| ← dreiss left | 01:26 |
| → Spudster joined | 01:27 |
| ← skorgon_1 left | 01:27 |
| → dragon3_ joined | 01:27 |
| ← tobias__ left | 01:29 |
| ← bwreilly left | 01:30 |
| ← ehmatthes left | 01:30 |
| ← rhubarb left | 01:30 |
| → skorgon_1 joined | 01:31 |
| → weiyang joined | 01:32 |
| ← hahuang65 left | 01:34 |
| → sgambino joined | 01:34 |
| → Targen joined | 01:34 |
| ← phipes left | 01:34 |
| ← Noldorin left | 01:35 |
| ← skorgon_1 left | 01:36 |
| ← blinkdesign left | 01:37 |
| ← SocalNick left | 01:38 |
| LulzonAway → Lulzon | 01:39 |
| → _Qman joined | 01:39 |
| → dinoangelov_ joined | 01:40 |
| → Targen_ joined | 01:40 |
| → Gamecubic_ joined | 01:40 |
| → skorgon_1 joined | 01:40 |
| ← _Qman left | 01:41 |
| ← weiyang left | 01:41 |
| ← Targen left | 01:41 |
| → cads joined | 01:42 |
| → _Qman joined | 01:42 |
| → harish joined | 01:42 |
| → ehmatthes joined | 01:43 |
| ← sakb left | 01:43 |
| ← dinoangelov_ left | 01:44 |
| → bwreilly joined | 01:44 |
| ← harish left | 01:45 |
| → redrocket joined | 01:45 |
| ← skorgon_1 left | 01:46 |
| ← koda left | 01:46 |
| → moondoggy joined | 01:46 |
| ← acharlieh left | 01:46 |
| ← Cyb3r-Assassin left | 01:46 |
| → cmpera joined | 01:47 |
| → acharlieh joined | 01:47 |
| → harish joined | 01:47 |
| ← AaronMT left | 01:49 |
| → JGarrido joined | 01:50 |
| → skorgon_1 joined | 01:50 |
| → bodom joined | 01:50 |
| ← Spudster left | 01:50 |
| ← johnkevinmbasco left | 01:51 |
| ← dragon3_ left | 01:51 |
| → dragon3_ joined | 01:52 |
| → luc_ joined | 01:52 |
| damccull_ → damccull | 01:52 |
| → Cyb3r-Assassin joined | 01:52 |
| → johnkevinmbasco joined | 01:53 |
| → becks__ joined | 01:53 |
| → floatingpoint joined | 01:53 |
| ← hwrdprkns left | 01:55 |
| ← yhager_ left | 01:55 |
| → Kayra joined | 01:55 |
| ← skorgon_1 left | 01:55 |
| ← albel727 left | 01:56 |
| ← dragon3_ left | 01:56 |
| → weiyang joined | 01:58 |
| ← harish left | 01:58 |
| ← thalisson_ left | 01:59 |
| → pbrobst_ joined | 01:59 |
| ← ketas left | 01:59 |
| → skorgon_1 joined | 01:59 |
| ← pbrobst left | 02:00 |
| pbrobst_ → pbrobst | 02:00 |
| ← Kayra left | 02:00 |
| → thalisson_ joined | 02:02 |
| → phipes joined | 02:02 |
| ← mizu_no_oto left | 02:03 |
| ← thalisson_ left | 02:04 |
| ← pbrobst left | 02:04 |
| ← jhulten left | 02:04 |
| ← skorgon_1 left | 02:04 |
| → thalisson_ joined | 02:04 |
| ← thalisson_ left | 02:04 |
| ← JustinMac left | 02:06 |
| ← pen left | 02:06 |
| → refried_ joined | 02:07 |
| → pen joined | 02:07 |
| → skorgon_1 joined | 02:08 |
| ← JGarrido left | 02:09 |
| → Noldorin joined | 02:10 |
| → ryez joined | 02:11 |
| ← pen left | 02:11 |
| → GT4066 joined | 02:13 |
| ← phipes left | 02:13 |
| ← skorgon_1 left | 02:14 |
| → dragon3_ joined | 02:14 |
| → Kayra joined | 02:15 |
| → daito joined | 02:16 |
| → JSharpe2 joined | 02:16 |
| ← sgu left | 02:16 |
| ← ncthom91 left | 02:16 |
| → skorgon_1 joined | 02:18 |
| → echo-area joined | 02:19 |
| → yacks joined | 02:20 |
| ← Kayra left | 02:20 |
| ← akiva left | 02:22 |
| ← d33tah left | 02:22 |
| ← endiruna left | 02:22 |
| ← xSmurf left | 02:23 |
| ← cads left | 02:23 |
| → dreiss joined | 02:23 |
| ← BiggFREE left | 02:23 |
| ← skorgon_1 left | 02:23 |
| ← BSaboia left | 02:24 |
| ← robbyoconnor left | 02:24 |
| ← rasto left | 02:24 |
| ← arizuka left | 02:25 |
| ← Kabaka left | 02:25 |
| → hwrdprkns joined | 02:26 |
| ← daivyk_ left | 02:26 |
| → skorgon_1 joined | 02:27 |
| → rurufufuss joined | 02:27 |
| ← refried_ left | 02:27 |
| → robbyoconnor joined | 02:28 |
| ← Mars___ left | 02:28 |
| ← johnkevinmbasco left | 02:29 |
| → harish joined | 02:29 |
| ← hyperair left | 02:29 |
| ← bl33 left | 02:31 |
| ← Gamecubic_ left | 02:32 |
| → Gamecubic_ joined | 02:32 |
| ← becks__ left | 02:32 |
| → arizuka joined | 02:32 |
| ← skorgon_1 left | 02:33 |
| → johnkevinmbasco joined | 02:33 |
| ← Targen_ left | 02:34 |
| → Goplat joined | 02:35 |
| ← veebers left | 02:35 |
| → veebers joined | 02:35 |
| ← chrisss404 left | 02:35 |
| → SHyx0rmZ joined | 02:36 |
| ← yacks left | 02:36 |
| → skorgon_1 joined | 02:36 |
| ← dxdt left | 02:37 |
| → rasto joined | 02:37 |
| → Mars__ joined | 02:37 |
| ← Mars__ left | 02:37 |
| ← Gamecubic_ left | 02:38 |
| ← acharlieh left | 02:39 |
| ← dreiss left | 02:39 |
| ← JSharpe2 left | 02:39 |
| → JustinMac joined | 02:40 |
| → acharlieh joined | 02:40 |
| ← pheaver left | 02:40 |
| → chrisss404 joined | 02:41 |
| ← skorgon_1 left | 02:42 |
| → yacks joined | 02:42 |
| → endiruna joined | 02:42 |
| ← rpg_ left | 02:43 |
| ← bitkiller_ left | 02:43 |
| → fire joined | 02:44 |
| ← johnkevinmbasco left | 02:44 |
| → skorgon_1 joined | 02:45 |
| ← MistuhKurtz left | 02:47 |
| ← cilly left | 02:47 |
| ← DrShoggoth left | 02:47 |
| → hyperair joined | 02:48 |
| → johnkevinmbasco joined | 02:50 |
| → Gamecubic_ joined | 02:50 |
| ← dfanjul left | 02:51 |
| ← skorgon_1 left | 02:51 |
| → cilly joined | 02:51 |
| ← acharlieh left | 02:52 |
| → master_j joined | 02:54 |
| → skorgon_1 joined | 02:54 |
| ← LuxuryMode left | 02:56 |
| → konadr joined | 02:56 |
| → cads joined | 02:56 |
| ← looper left | 02:57 |
| ← robbyoconnor left | 02:58 |
| → robbyoconnor joined | 02:58 |
| ← JustinMac left | 02:59 |
| ← skorgon_1 left | 03:00 |
| ← konadr left | 03:01 |
| → skorgon_1 joined | 03:04 |
| ← maroloccio2 left | 03:05 |
| → dxdt joined | 03:05 |
| ← cads left | 03:05 |
| → johnkevi_ joined | 03:06 |
| ← johnkevinmbasco left | 03:06 |
| ← croaky left | 03:07 |
| ← graphitemaster left | 03:07 |
| → graphitemaster joined | 03:07 |
| → chamunks joined | 03:09 |
| ← skorgon_1 left | 03:09 |
| ← Skrypter left | 03:09 |
| → croaky joined | 03:10 |
| → Targen joined | 03:10 |
| → Hoksilato joined | 03:11 |
| ← JorDunn left | 03:13 |
| → skorgon_1 joined | 03:13 |
| ← hwrdprkns left | 03:13 |
| emmajane → [emmajane] | 03:14 |
| → Kayra joined | 03:15 |
| ← dyng left | 03:16 |
| → dyng joined | 03:16 |
| ← skorgon_1 left | 03:18 |
| ← dxdt left | 03:19 |
| ← Kayra left | 03:20 |
| ← m0viefreak left | 03:20 |
| → DolpheenDream_ joined | 03:20 |
| ← dyng left | 03:21 |
| ← sebastianmarkow left | 03:22 |
| ← Dougie187 left | 03:22 |
| → skorgon_1 joined | 03:23 |
| → sebastianmarkow joined | 03:24 |
| ← nw8l left | 03:24 |
| ← fire left | 03:25 |
| → jhulten joined | 03:25 |
| → pen joined | 03:26 |
| ← joelm left | 03:26 |
| → jerius_ joined | 03:28 |
| ← skorgon_1 left | 03:28 |
| → fire joined | 03:28 |
| ← weiyang left | 03:29 |
| ← mdiers left | 03:29 |
| ← ojacobson left | 03:29 |
| → mdiers joined | 03:30 |
| ← bwreilly left | 03:31 |
| → skorgon_1 joined | 03:32 |
| → Mars__ joined | 03:32 |
| ← freestyl3r left | 03:32 |
| ← sgambino left | 03:34 |
| → bl33 joined | 03:34 |
| → rryoumaa joined | 03:34 |
| → Kayra joined | 03:34 |
|
rryoumaa
| i have a local branch, which rebases on master. i'd like it to rebase on maint. is there a command to get rid of all the stuff from maint to master without getting rid of my changes? | 03:35 |
| → mitz joined | 03:36 |
| → h0bbit_ joined | 03:36 |
| ← skorgon_1 left | 03:37 |
| → edwardly joined | 03:37 |
|
SamB
| rryoumaa: I think you just need your basic "git rebase --onto=maint master" ? | 03:37 |
|
| and yes, you should totally be using magit maint | 03:38 |
| ← jerius_ left | 03:38 |
|
rryoumaa
| SamB: i am. i am considering org maint now. but you're saying my local changes which are currently grafted on master can be grafted onto maint instead via your magic command above? | 03:39 |
|
SamB
| should, yeah | 03:39 |
|
rryoumaa
| great, thanks | 03:39 |
| ← panpainter left | 03:39 |
|
SamB
| if it starts to go wrong you can use "git rebase --abort" | 03:39 |
| Lulzon → LulzonAway | 03:40 |
| → dinoangelov_ joined | 03:41 |
| → skorgon_1 joined | 03:41 |
|
rryoumaa
| that command looks like it would throw everything from maint to master onto master, but i will try it :) | 03:42 |
| ← LucasKA left | 03:44 |
| ← dinoangelov_ left | 03:45 |
| ← john2x left | 03:45 |
| ← angrytongan left | 03:45 |
| ← psyl0n left | 03:46 |
| → john2x joined | 03:46 |
| → Cubit joined | 03:46 |
| ← skorgon_1 left | 03:47 |
| → weiyang joined | 03:47 |
| ← Mars__ left | 03:47 |
| → dyng joined | 03:48 |
| → LucasKA joined | 03:48 |
| ← Cubit left | 03:49 |
|
nevyn
| rryoumaa: is maint a ancestor of master? | 03:49 |
| ← kukks left | 03:49 |
|
rryoumaa
| nevyn: if i understand git terminology well enough, then maint and master are ancestors of master | 03:50 |
| → Skrypter joined | 03:50 |
| ← Skrypter left | 03:50 |
|
rryoumaa
| i.e. maint gets merged into master | 03:50 |
|
nevyn
| ah then no. | 03:50 |
| → skorgon_1 joined | 03:50 |
| → iamjarvo joined | 03:50 |
| → Skrypter joined | 03:50 |
|
nevyn
| an ancestor would mean that maint is a commit in the history of master alerady | 03:50 |
| ← Skrypter left | 03:50 |
|
nevyn
| the rebase will be fine. | 03:51 |
| → Skrypter joined | 03:51 |
|
rryoumaa
| nevyn: thanks | 03:51 |
|
| noted | 03:51 |
| ← shruggar left | 03:51 |
| ← iamjarvo left | 03:52 |
| ← BlueOrg left | 03:52 |
| ← jhulten left | 03:52 |
|
rryoumaa
| after a pull, it worked. SamB nevyn thanks | 03:53 |
|
SamB
| no problem | 03:53 |
| ← dyng left | 03:54 |
| ← Orbitrix left | 03:54 |
|
rryoumaa
| hmm, actually it seems to have made no difference | 03:55 |
| → maroloccio joined | 03:55 |
| ← skorgon_1 left | 03:56 |
| ← mribeirodantas left | 03:57 |
|
rryoumaa
| sometimes i just want to point to my changes, select them, and say "ok, graft them onto maint now" | 03:57 |
| ← jkremser left | 03:57 |
| → Cache_Money joined | 03:58 |
| ← fire left | 03:58 |
|
Cache_Money
| I just restarted my Ubuntu VM (Win7 host) and now when I run "$ git branch" I get this error: "fatal: Failed to resolve HEAD as a valid ref." | 03:59 |
| ← ehmatthes left | 04:00 |
|
Cache_Money
| I just checked out a new branch (titled, 'dual-shot-coords') before restarting the VM. How would I go about fixing this? | 04:00 |
|
milki
| try checking out a branch again | 04:02 |
|
rryoumaa
| is there a way to do "rebase A..B onto C"? | 04:03 |
|
Cache_Money
| milki: I can successfully checkout master but get an error when checking out 'dual-shot-coords' | 04:03 |
|
milki
| rryoumaa: sounds like cherry-pick | 04:04 |
|
| Cache_Money: maybe that branch is now invalid then | 04:04 |
|
Cache_Money
| error^: "warning: ignoring broken ref refs/heads/dual-shot-coords." "error: pathspec 'dual-shot-coords' did not match any file(s) known to gi." | 04:04 |
|
milki
| ya... | 04:04 |
| ← dougsland left | 04:04 |
|
Cache_Money
| so just delete it and recreate it? | 04:04 |
| → dreiss joined | 04:05 |
| → dougsland joined | 04:05 |
| → yhager joined | 04:05 |
|
Cache_Money
| milki: If I try to delete it it throws an error (branch not found) but still shows up when I run "$ git branch"... odd | 04:06 |
| → jhulten joined | 04:07 |
|
milki
| you can probably jsut do a branch -f | 04:07 |
|
Cache_Money
| milki: I've never used branch -f before.. Is this correct? "$ git branch -f master dual-shot-coords"? | 04:10 |
| ← robbyoconnor left | 04:10 |
| → robbyoconnor joined | 04:11 |
| ← cmpera left | 04:13 |
| → phipes joined | 04:13 |
| ← LucasKA left | 04:13 |
| ← master_j left | 04:14 |
| ← dreiss left | 04:16 |
| ← JosephFerano left | 04:16 |
| → JosephFerano joined | 04:17 |
| ← Noldorin left | 04:17 |
| → arvind_khadri joined | 04:17 |
|
rryoumaa
| SamB: just want to confirm. you're saying that if i have 1 2 3=maint 4=master 5 6 7 8, and 5 6 7 8 are my changes, then your command will make it look like 1 2 5 6 7 8? | 04:18 |
| ← netcarver left | 04:19 |
|
rryoumaa
| 8=local | 04:19 |
|
| grr, let me do it right: | 04:19 |
|
| SamB: just want to confirm. you're saying that if i have 1 2 3=maint 4=master 5 6 7 8=local, and 5 6 7 8 are my changes, then your command will make it look like 1 2 3=maint 5 6 7 8=local? | 04:19 |
| → LuxuryMode joined | 04:20 |
|
SamB
| rryoumaa: should do | 04:20 |
| → mdhopkins joined | 04:20 |
|
SamB
| if it doesn't work right there's always the reflog ... | 04:20 |
| ← daito left | 04:20 |
|
rryoumaa
| and i do this when i am in local? | 04:20 |
|
SamB
| yeah | 04:21 |
| ← mr_red left | 04:22 |
| → kcj joined | 04:22 |
| → Orbitrix joined | 04:23 |
| ← Orbitrix left | 04:23 |
| → Orbitrix joined | 04:23 |
|
rryoumaa
| ok, i changed it so that i am auto-merging onto maint instead of master, and it is hitting me with a whole bunch of conflicts. i don't know why there would be any conflicts though, because my local chjanges don't touch any files that are conflicting. | 04:24 |
|
offby1
| auto-merging? Isn't that POISON? (Seriously, it sounds risky) | 04:24 |
|
rryoumaa
| (and i don't know which is <<<<<<< and which is >>>>>>>>) | 04:24 |
|
SamB
| !repro | 04:25 |
|
gitinfo
| Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting. | 04:25 |
|
rryoumaa
| offby1: i followed the normal instructions for auto-rebasing local onto master, so that when i pull i get my changes on top of master every time. that works well. but now i want to swtich to maint and do the same thing. | 04:25 |
| ← bodom left | 04:27 |
| → dreiss joined | 04:28 |
| → dyng joined | 04:28 |
|
offby1
| never heard of auto-rebasing, either | 04:29 |
| → mr_red joined | 04:30 |
| ← gdogrady left | 04:31 |
|
rryoumaa
| SamB: basically it is just http://sprunge.us/GTBK . forget what i said about changing the auto merge thing. here i am going with what i normally have (i.e. local always rebases onto master as always) and this is the result. | 04:31 |
| ← jhulten left | 04:31 |
|
rryoumaa
| offby1: it is in the org faq i think | 04:31 |
| ← jcvfen left | 04:32 |
| ← dyng left | 04:32 |
| ← Kayra left | 04:32 |
|
SamB
| rryoumaa: you probably don't want to do that after having rebased local from master --onto=maint ... | 04:33 |
|
| or, wait, you're not even doing a pull so why mention auto-rebase? | 04:33 |
|
rryoumaa
| right | 04:33 |
|
| so forget that part, unless it is relevant | 04:33 |
|
| (which i am too ignorant to determine) | 04:34 |
|
SamB
| I assume there's a difference in this file between master and maint | 04:34 |
|
rryoumaa
| ok, so why can't it just choose maint? | 04:34 |
|
| i want to discard everything having to do with master | 04:34 |
|
SamB
| your "ob-tangle: Silence byte-compiler" doesn't touch that file ? | 04:35 |
|
rryoumaa
| that is not mine | 04:35 |
|
| i made no such change | 04:35 |
|
SamB
| oh. | 04:35 |
|
| hmm. I guess this was not the right command :-( | 04:36 |
|
rryoumaa
| i figured this should work without any conflicts | 04:36 |
| → preflex_ joined | 04:36 |
| → acharlieh joined | 04:37 |
| ← preflex left | 04:37 |
| preflex_ → preflex | 04:37 |
|
rryoumaa
| SamB: dunno, i have 1 2 3=maint 4=master 5 6 7 8=local (where 4 merges maint into master) and i want 1 2 3=maint 5 6 7 8=local (where master has nothing to do with anything). | 04:37 |
| ← pen left | 04:38 |
|
SamB
| so, first "git rebase --abort" and then "git log --oneline --decorate HEAD master" and paste the interesting part? | 04:39 |
| ← Cache_Money left | 04:39 |
| → gdogrady joined | 04:39 |
| → Mars__ joined | 04:39 |
| → Cache_Money joined | 04:39 |
| → pheaver joined | 04:39 |
| → Cassiel joined | 04:39 |
| ← yhager left | 04:41 |
| ← petey_ left | 04:41 |
| → petey joined | 04:42 |
| → solrize joined | 04:43 |
|
solrize
| how do i list all the branches in a repo? git branch --list doesn't do it | 04:43 |
| → irqq joined | 04:45 |
| ← petey left | 04:46 |
|
solrize
| oh, --list -a | 04:46 |
|
| sigh | 04:46 |
|
offby1
| you can get all the refs with git for-each-ref, if that's interesting | 04:48 |
| ← tplaner left | 04:48 |
| → ekoekoekoeko joined | 04:48 |
| ← Xiti left | 04:49 |
| → rethus joined | 04:49 |
| → daito joined | 04:51 |
|
rryoumaa
| SamB: http://sprunge.us/jCWc | 04:51 |
| ← dreiss left | 04:51 |
| ← Orbitrix left | 04:52 |
|
Cache_Money
| $ git branch shows 2 branches (master, dual-shot-coords). WHen I run $ git branch -D dual-shot-coords it gives this error, "error: branch 'dual-shot-coords' not found" | 04:52 |
|
| How do I delete this branch? | 04:52 |
|
solrize
| offby1, thanks, i didn't know about that. i'm not sure if it's useful but i guess it's interesting. | 04:52 |
|
offby1
| eh | 04:53 |
|
| heh | 04:53 |
|
| that's my specialty | 04:53 |
|
SamB
| rryoumaa: ah | 04:53 |
|
| "master" is just stale | 04:54 |
|
| "git rebase --onto=origin/maint origin/master" would use the upstream tracking branches instead | 04:54 |
|
offby1
| *sigh* as usual I forgot to push at work. | 04:54 |
|
SamB
| offby1: this is why you run sshd and leave the system on | 04:55 |
|
offby1
| SamB: I do. But I gotta VPN in. And I'm too lazy to run the vpn client. | 04:55 |
|
SamB
| hehehe | 04:56 |
|
offby1
| somehow it feels ... onerous | 04:56 |
| → konadr joined | 04:57 |
| → saurabh joined | 04:57 |
| saurabh → Guest44485 | 04:57 |
| → ehmatthes joined | 04:57 |
|
rryoumaa
| SamB: will try tomorrow. thanks. then i presume before i do a pull i just change the auto rebase thing. | 04:58 |
|
SamB
| rryoumaa: yeah | 04:58 |
| ← perlstein left | 04:58 |
| → Orbitrix joined | 04:59 |
| ← Orbitrix left | 04:59 |
| ← jrobichaud left | 04:59 |
| ← daito left | 04:59 |
| → Orbitrix joined | 04:59 |
|
Cache_Money
| SamB: I have a branch that I can't delete (above). Do you know how I can get rid of it? | 04:59 |
| ← Orbitrix left | 04:59 |
|
SamB
| Cache_Money: no, I have no idea what's going on there | 05:01 |
|
Cache_Money
| haha | 05:01 |
|
SamB
| I had a buffer I couldn't kill in Emacs earlier | 05:01 |
|
Cache_Money
| okay, glad I'm not the only one | 05:01 |
| ← konadr left | 05:01 |
|
Cache_Money
| I'll throw my question up on SO | 05:01 |
| ← DolpheenDream_ left | 05:02 |
| ← ehmatthes left | 05:02 |
| ← ekoekoekoeko left | 05:03 |
|
| offby1 had a rash that wouldn't go away | 05:04 |
| ← gdogrady left | 05:05 |
|
Cache_Money
| SamB: I had to go into ./git/refs/heads/ and delete the file | 05:05 |
| → ekoekoekoeko joined | 05:07 |
| → ewnd9 joined | 05:08 |
| → fire joined | 05:08 |
| → Vakar joined | 05:09 |
| → LucasKA joined | 05:09 |
| ← irqq left | 05:09 |
| → Orbitrix joined | 05:09 |
| ← Orbitrix left | 05:09 |
| → Orbitrix joined | 05:10 |
| ← Orbitrix left | 05:10 |
| ← yacks left | 05:10 |
| → HicksD joined | 05:10 |
| → Orbitrix joined | 05:10 |
| ← HicksD_ left | 05:11 |
| ← nwertman left | 05:11 |
| → dreiss joined | 05:12 |
| ← croaky left | 05:12 |
| ← cilly left | 05:12 |
| → daito joined | 05:12 |
| ← maroloccio left | 05:13 |
| → dsdeiz joined | 05:13 |
| → cilly joined | 05:14 |
| ← kcj left | 05:14 |
| → rchavik joined | 05:14 |
| → eaj joined | 05:14 |
| ← LucasKA left | 05:15 |
| ← eaj left | 05:15 |
| → kcj joined | 05:16 |
| ← TLGreg left | 05:18 |
| ← dreiss left | 05:18 |
| ← Vakar left | 05:19 |
| → alezost joined | 05:20 |
| ← ariscop left | 05:21 |
| ← LuxuryMode left | 05:21 |
| ← ekoekoekoeko left | 05:21 |
| ← CheckDavid left | 05:22 |
| → john__ joined | 05:23 |
| → ketas joined | 05:23 |
| ← mr_red left | 05:24 |
| → gdogrady joined | 05:25 |
| → jerichodotm joined | 05:25 |
| → sgu joined | 05:25 |
|
jerichodotm
| does anyone know hwo to setup a debian watch file to scan a github repo if thre are no releases? | 05:26 |
|
sgu
| I set up global ignore files by `git config --global core.excludesfile '~/.gitignore'` . When I change the content of ~/.gitignore later. Do I need to rerun this command? | 05:26 |
| → cybersphinx joined | 05:26 |
|
SamB
| jerichodotm: it involves flaming upstream about tagging | 05:26 |
| → mr_red joined | 05:26 |
|
jerichodotm
| SamB, hmmm. if i gave you a repo could you give me an example? | 05:27 |
|
SamB
| jerichodotm: you open an issue and say "you should do release tags more often" | 05:27 |
| → echo-are` joined | 05:27 |
| → mutex_ joined | 05:28 |
| ← Mars__ left | 05:28 |
|
jerichodotm
| SamB, So, its not piossible if thre are no "releases"? | 05:28 |
| → HicksD_ joined | 05:28 |
| → zizzfizzix_ joined | 05:28 |
| ← zizzfizzix_ left | 05:28 |
| → zizzfizzix_ joined | 05:28 |
| → maroloccio joined | 05:28 |
| → jefferai_gone joined | 05:28 |
| ← the_cybersphinx left | 05:28 |
| ← jefferai left | 05:28 |
| → veebers_ joined | 05:28 |
| → de-Vri-es joined | 05:28 |
| ← echo-area left | 05:28 |
| ← veebers left | 05:28 |
| → preflex_ joined | 05:28 |
| → LucasKA joined | 05:29 |
|
SamB
| jerichodotm: it'd have no way of knowing that something more recent had been released | 05:29 |
|
| or, well, committed | 05:29 |
| ← mutex left | 05:29 |
| ← zizzfizzix left | 05:29 |
| ← preflex left | 05:29 |
| ← HicksD left | 05:29 |
| ← de-Vri-es_ left | 05:29 |
| ← rethus left | 05:29 |
| ← qsusOFFcs left | 05:29 |
| ← jave left | 05:29 |
| ← Pullphinger left | 05:29 |
| ← CalimeroTeknik left | 05:29 |
| ← EdGruberman left | 05:29 |
| ← preaction left | 05:29 |
| preflex_ → preflex | 05:29 |
| ← robbyoconnor left | 05:29 |
| → CalimeroTeknik joined | 05:29 |
| → jave joined | 05:29 |
|
jerichodotm
| SamB, because all thats avail is the master.zip, correct? | 05:30 |
| ← rryoumaa left | 05:30 |
| → EdGruberman joined | 05:30 |
| → qsusOFFcs joined | 05:30 |
| ← pheaver left | 05:30 |
| ← simesy left | 05:30 |
| ← Entomo left | 05:30 |
| ← cehteh left | 05:30 |
| ← joel_falcou left | 05:30 |
| → r0bby_ joined | 05:30 |
| → Vinnie_win_f joined | 05:30 |
| → cbreak|evil joined | 05:30 |
| → Dreamer3__ joined | 05:31 |
| → joel_falcou joined | 05:31 |
| → pheaver joined | 05:31 |
| → simesy joined | 05:31 |
|
SamB
| jerichodotm: well, even if it spoke git it'd have no idea what might be release-worthy ... | 05:31 |
| → Entomo joined | 05:31 |
| → Nugget_ joined | 05:31 |
| ← mdhopkins left | 05:31 |
| → schlumpi_ joined | 05:31 |
| → JrCs_ joined | 05:32 |
| → preaction joined | 05:32 |
|
jerichodotm
| SamB, Ok. I dont know much about git at this time. I need to have the develoepr create 'releases', correct? | 05:32 |
| → gypsymau1o joined | 05:32 |
|
jerichodotm
| jerichodotm, lets just assume we dont care about code quality at this time and just want the latest | 05:32 |
| → eletuchy_ joined | 05:33 |
| ← veebers_ left | 05:33 |
| → veebers joined | 05:33 |
|
SamB
| hrmm, uscan might not be for you ... | 05:34 |
| → kay_____1 joined | 05:34 |
|
SamB
| anyway, maybe ask in #debian-mentors on OFTC | 05:34 |
| → JPohlman1 joined | 05:34 |
| → crashev joined | 05:34 |
| → niax_ joined | 05:34 |
| → vals_ joined | 05:34 |
| → mackanfk1 joined | 05:34 |
| → przemkov1 joined | 05:34 |
| → Tuna-Fish2 joined | 05:34 |
| → ManiaArm1Yurt joined | 05:34 |
| → chris2_ joined | 05:34 |
| → BlaDe^_ joined | 05:34 |
| ← BlaDe^ left | 05:34 |
| → suy_ joined | 05:34 |
| → qknight_ joined | 05:34 |
| → d0liver__ joined | 05:34 |
| → dsop_ joined | 05:34 |
| → adhawkinz joined | 05:34 |
| → Gaga joined | 05:34 |
| → joshc_ joined | 05:35 |
| adhawkinz → adhawkins | 05:35 |
| → TheBrayn_ joined | 05:35 |
| → Doc-Sain1ly joined | 05:35 |
| ← adhawkins left | 05:35 |
| → adhawkins joined | 05:35 |
| ← preaction left | 05:36 |
| ← Dreamer3__ left | 05:36 |
| ← daito left | 05:36 |
| ← Cassiel left | 05:36 |
| ← edwardly left | 05:36 |
| ← hyperair left | 05:36 |
| ← harish left | 05:36 |
| ← nevyn left | 05:36 |
| ← brandonw1 left | 05:36 |
| ← saorge left | 05:36 |
| ← paulweb515 left | 05:36 |
| ← bbloom left | 05:36 |
| ← beyondcreed left | 05:36 |
| ← aberrant left | 05:36 |
| ← mattcen left | 05:36 |
| ← ejnahc left | 05:36 |
| ← el3ctron_ left | 05:36 |
| ← diget left | 05:36 |
| ← heroux left | 05:36 |
| ← FabTG left | 05:36 |
| ← nitrix left | 05:36 |
| ← haarg left | 05:36 |
| ← kirin` left | 05:36 |
| ← Plouj left | 05:36 |
| ← thegorn left | 05:36 |
| ← bambams left | 05:36 |
| ← boz_v1 left | 05:36 |
| ← cryptomnesia left | 05:36 |
| ← mateu left | 05:36 |
| ← d1b left | 05:36 |
| ← Hamled left | 05:36 |
| ← rainbyte left | 05:36 |
| ← steverandy left | 05:36 |
| ← howitdo left | 05:36 |
| ← akitada left | 05:36 |
| ← milki left | 05:36 |
| ← joar left | 05:36 |
| ← mnemoc left | 05:36 |
| ← z^z left | 05:36 |
| ← cite left | 05:36 |
| ← sente left | 05:36 |
| → leafwiz_ joined | 05:36 |
| → cite joined | 05:36 |
| → thegorn joined | 05:36 |
| → heroux joined | 05:36 |
| → Hamled joined | 05:36 |
| → el3ctron joined | 05:36 |
| → sente joined | 05:36 |
| → boz_v1 joined | 05:36 |
| → nitrix joined | 05:36 |
| → d1b joined | 05:36 |
| → cryptomnesia joined | 05:36 |
| → hyperair joined | 05:36 |
| → steverandy joined | 05:36 |
| → brandonw joined | 05:36 |
| → milki joined | 05:36 |
| → preaction joined | 05:36 |
| → rainbyte joined | 05:36 |
| → z^z joined | 05:36 |
| → kirin` joined | 05:36 |
| → FabTG joined | 05:36 |
| → BombAw joined | 05:36 |
| → daito joined | 05:36 |
| → howitdo joined | 05:36 |
| → harish joined | 05:36 |
| nitrix → Guest73217 | 05:36 |
| → akitada joined | 05:36 |
| → aberrant joined | 05:36 |
| → edwardly joined | 05:37 |
| ← akitada left | 05:37 |
| → akitada joined | 05:37 |
| ← howitdo left | 05:37 |
| → howitdo joined | 05:37 |
| ← akitada left | 05:37 |
| → akitada joined | 05:37 |
| → wizonesolutions_ joined | 05:37 |
| → cehteh joined | 05:37 |
| → paulweb515 joined | 05:37 |
| → ktosiek_ joined | 05:37 |
| ← paulweb515 left | 05:37 |
| → paulweb515 joined | 05:37 |
| ← edwardly left | 05:37 |
| → edwardly joined | 05:37 |
| ← eletuchy_ left | 05:38 |
| → phantomcircuit_ joined | 05:38 |
| → Cassiel joined | 05:38 |
| → ewet joined | 05:38 |
| → jon- joined | 05:39 |
| → mikaelj joined | 05:39 |
| → Dreamer3__ joined | 05:39 |
| → `Nothing4You joined | 05:39 |
| → alexwhitman_ joined | 05:39 |
| → Matrixiumn joined | 05:39 |
| ← reim left | 05:39 |
| ← RofricTheBearded left | 05:39 |
| ← Vinnie_win left | 05:39 |
| ← tango_ left | 05:39 |
| ← thelamest left | 05:39 |
| ← Tuna-Fish left | 05:39 |
| ← kevinfagan_ left | 05:39 |
| ← vpl_ left | 05:39 |
| ← BombStrike left | 05:39 |
| ← Nevik left | 05:39 |
| ← frew left | 05:39 |
| ← __class__ left | 05:39 |
| ← Turicas left | 05:39 |
| ← alexwhitman left | 05:39 |
| ← joshc left | 05:39 |
| ← lyang0 left | 05:39 |
| ← Nibato left | 05:39 |
| ← ndim left | 05:39 |
| ← Corey left | 05:39 |
| ← ValicekB left | 05:39 |
| ← Nothing4You left | 05:39 |
| ← obiwahn left | 05:39 |
| ← ManiaArmyYurt left | 05:39 |
| ← manitu left | 05:39 |
| ← JStoker left | 05:39 |
| ← EToS left | 05:39 |
| ← monokrome left | 05:39 |
| ← michaelmcmillan left | 05:39 |
| ← Caius left | 05:39 |
| ← leafwiz left | 05:39 |
| ← CaveJohnson left | 05:39 |
| ← wizonesolutions left | 05:39 |
| ← interru left | 05:39 |
| ← Fissure left | 05:39 |
| ← Dreamer3 left | 05:39 |
| ← tg left | 05:39 |
| ← tchan left | 05:39 |
| ← Stravy left | 05:39 |
| ← jon| left | 05:39 |
| ← ktosiek left | 05:39 |
| ← przemkovv left | 05:39 |
| ← mackanfkp left | 05:39 |
| ← Baluse left | 05:39 |
| ← ldlework left | 05:39 |
| ← Juri_Agarin left | 05:39 |
| ← mikaelj_ left | 05:39 |
| ← crashev_ left | 05:39 |
| ← GyrosGeier left | 05:39 |
| ← cbreak left | 05:39 |
| ← suy left | 05:39 |
| ← schlumpi left | 05:39 |
| ← qknight left | 05:39 |
| ← chris2 left | 05:39 |
| ← adhawkins-away left | 05:39 |
| ← tm512 left | 05:39 |
| ← mattp left | 05:39 |
| ← Nugget left | 05:39 |
| ← niax left | 05:39 |
| ← TheBrayn left | 05:39 |
| ← tsunamie left | 05:39 |
| ← dean|away left | 05:39 |
| ← Psi-Jack left | 05:39 |
| ← Evanlec left | 05:39 |
| ← Rix left | 05:39 |
| ← gypsymauro left | 05:39 |
| ← flexo left | 05:39 |
| ← dsop left | 05:39 |
| ← awakecoding left | 05:39 |
| ← JrCs left | 05:39 |
| ← Doc-Saintly left | 05:39 |
| ← d0liver left | 05:39 |
| ← koptein left | 05:39 |
| ← JPohlmann left | 05:39 |
| ← phantomcircuit left | 05:39 |
| ← esto left | 05:39 |
| ← kay______ left | 05:39 |
| ← jerichodotm left | 05:39 |
| BombAw → BombStrike | 05:39 |
| JrCs_ → JrCs | 05:39 |
| → esto- joined | 05:39 |
| → RofricTheBearded joined | 05:39 |
| echo-are` → echo-area | 05:40 |
| → Baluse joined | 05:40 |
| → Nevik joined | 05:40 |
| → jerichodotm joined | 05:40 |
| ← jerichodotm left | 05:40 |
| → jerichodotm joined | 05:40 |
| ← eletuchy left | 05:40 |
|
sgu
| Hi all: I set up global ignore files by `git config --global core.excludesfile '~/.gitignore'` . When I change the content of ~/.gitignore later. Do I need to rerun this command? | 05:40 |
| → mattcen joined | 05:40 |
| → ValicekB_ joined | 05:40 |
| ← ewet left | 05:40 |
| → _class_ joined | 05:40 |
| → ldlework joined | 05:40 |
| → joar joined | 05:40 |
| → flexo joined | 05:40 |
| → vpl joined | 05:40 |
| → tsunamie joined | 05:40 |
| → Stravy joined | 05:40 |
| → GyrosGeier joined | 05:40 |
| ← Guest73217 left | 05:40 |
| → Guest73217 joined | 05:40 |
| → JStoker joined | 05:40 |
| ← JStoker left | 05:40 |
| → JStoker joined | 05:40 |
| → Tommy[D] joined | 05:40 |
| → awakecoding joined | 05:40 |
| Guest73217 → nitrix | 05:40 |
| phantomcircuit_ → phantomcircuit | 05:40 |
| → Nibato joined | 05:40 |
| → saorge_ joined | 05:40 |
| → koptein joined | 05:41 |
| → ewet joined | 05:41 |
| → Plouj- joined | 05:41 |
| → nevyn joined | 05:41 |
| `Nothing4You → Nothing4You | 05:41 |
| → gkatsev joined | 05:41 |
| → rurufufuss_ joined | 05:41 |
| → Psi-Jack joined | 05:41 |
| → dinoangelov_ joined | 05:42 |
| ← gkatsev left | 05:42 |
| → interru joined | 05:42 |
| → ejnahc joined | 05:42 |
| → bambams joined | 05:42 |
| ← rurufufuss_ left | 05:42 |
| → haarg joined | 05:42 |
| → tg joined | 05:42 |
| → kevinfagan joined | 05:42 |
| ← rainbyte left | 05:43 |
| → dean joined | 05:43 |
| ← dsdeiz left | 05:43 |
| ← Tommy[D]_ left | 05:44 |
| → Than joined | 05:44 |
| _class_ → __class__ | 05:44 |
| → mnemoc joined | 05:44 |
| → Rix joined | 05:45 |
| → tchan joined | 05:45 |
| → lyang0 joined | 05:45 |
| → ndim joined | 05:45 |
| → manitu joined | 05:45 |
| → thelamest joined | 05:45 |
| → Turicas joined | 05:46 |
| → Caius joined | 05:46 |
| → obiwahn joined | 05:46 |
| → bbloom joined | 05:46 |
| → EToS joined | 05:46 |
| ← dinoangelov_ left | 05:46 |
| → Evanlec joined | 05:46 |
| Caius → Guest92966 | 05:47 |
|
EugeneKay
| No. | 05:47 |
| → macben joined | 05:47 |
| ← gdogrady left | 05:47 |
| → daito_ joined | 05:47 |
| → diget joined | 05:48 |
| → hahuang65 joined | 05:48 |
| → monokrome joined | 05:48 |
| → Fissure joined | 05:48 |
| → dragon3__ joined | 05:48 |
| → Gooder joined | 05:48 |
| → ktosiek joined | 05:48 |
| → michaelmcmillan joined | 05:49 |
| → esto joined | 05:49 |
| → mattp joined | 05:49 |
| → acharlie_ joined | 05:50 |
| → whatitdo joined | 05:50 |
| → Nugget joined | 05:51 |
| → echo-are` joined | 05:51 |
| → ewet_ joined | 05:51 |
| → dean|away joined | 05:51 |
| → m-o-s joined | 05:51 |
| ← hyperair left | 05:51 |
| → hyperair joined | 05:51 |
| → kevinfagan_ joined | 05:51 |
| → Doc-Saintly joined | 05:51 |
| → bambams_ joined | 05:52 |
| ← bambams_ left | 05:52 |
| → bambams_ joined | 05:52 |
| → pikarenx joined | 05:52 |
| ← cilly left | 05:52 |
| ← Than left | 05:52 |
| ← tg left | 05:52 |
| ← bambams left | 05:52 |
| ← kevinfagan left | 05:52 |
| ← dean left | 05:52 |
| ← ewet left | 05:52 |
| ← GyrosGeier left | 05:52 |
| ← mattcen left | 05:52 |
| ← Baluse left | 05:52 |
| ← esto- left | 05:52 |
| ← phantomcircuit left | 05:52 |
| ← ktosiek_ left | 05:52 |
| ← daito left | 05:52 |
| ← howitdo left | 05:52 |
| ← ValicekB_ left | 05:52 |
| ← Doc-Sain1ly left | 05:52 |
| ← mackanfk1 left | 05:52 |
| ← vals_ left | 05:52 |
| ← gypsymau1o left | 05:52 |
| ← Nugget_ left | 05:52 |
| ← qsusOFFcs left | 05:52 |
| ← jave left | 05:52 |
| ← echo-area left | 05:52 |
| ← maroloccio left | 05:52 |
| ← cybersphinx left | 05:52 |
| ← john__ left | 05:52 |
| ← acharlieh left | 05:52 |
| ← dougsland left | 05:52 |
| ← Skrypter left | 05:52 |
| ← weiyang left | 05:52 |
| ← h0bbit_ left | 05:52 |
| ← Gamecubic_ left | 05:52 |
| ← endiruna left | 05:52 |
| ← chrisss404 left | 05:52 |
| ← rasto left | 05:52 |
| ← dragon3_ left | 05:52 |
| ← GT4066 left | 05:52 |
| ← floatingpoint left | 05:52 |
| ← _Qman left | 05:52 |
| ← pikaren left | 05:52 |
| ← BillyJack left | 05:52 |
| ← Chaser left | 05:52 |
| ← blahdodo left | 05:52 |
| ← jxport left | 05:52 |
| dean|away → dean | 05:52 |
| → Xiti joined | 05:52 |
| → the_cybersphinx joined | 05:52 |
| → cillybabe joined | 05:52 |
| → phantomcircuit joined | 05:52 |
| → jave joined | 05:53 |
| → kini joined | 05:53 |
| → Skrypter joined | 05:53 |
| → weiyang joined | 05:53 |
| → BillyJack joined | 05:54 |
| → dougsland joined | 05:54 |
| → chrisss404 joined | 05:54 |
| → maroloccio joined | 05:55 |
| ← m-o-s left | 05:55 |
| ← aberrant left | 05:56 |
| → jxport joined | 05:57 |
| → hwrdprkns joined | 05:57 |
| → tg joined | 05:57 |
| → qsusOFFcs joined | 05:57 |
| → GyrosGeier joined | 05:57 |
| → mattcen joined | 05:57 |
| → Baluse joined | 05:57 |
| → mackanfk1 joined | 05:57 |
| → gypsymau1o joined | 05:57 |
| → h0bbit_ joined | 05:57 |
| → Gamecubic_ joined | 05:57 |
| → endiruna joined | 05:57 |
| → rasto joined | 05:57 |
| → _Qman joined | 05:57 |
| → Chaser joined | 05:57 |
| → blahdodo joined | 05:57 |
| → Kabaka joined | 05:57 |
| → ValicekB joined | 05:58 |
| tg → Guest44294 | 05:58 |
| → tango_ joined | 06:01 |
| → jizanthapus joined | 06:01 |
| → croaky joined | 06:02 |
| → yhager joined | 06:03 |
| ← ryez left | 06:04 |
| → nw8l joined | 06:04 |
| → GeertV joined | 06:04 |
| → xSmurf joined | 06:06 |
| → ariscop joined | 06:10 |
| bambams_ → bambams | 06:11 |
| ← nicedice left | 06:11 |
| → nicedice joined | 06:12 |
| → ahmedelgabri joined | 06:13 |
| ← ahmedelgabri left | 06:13 |
| → travisstaton joined | 06:13 |
| → ahmedelgabri joined | 06:13 |
| ← johnkevi_ left | 06:14 |
| ← fire left | 06:14 |
| → dev__ joined | 06:14 |
| → Vivekananda joined | 06:15 |
| → johnkevinmbasco joined | 06:17 |
| → dreiss joined | 06:17 |
| ← tpollard left | 06:17 |
| ← veebers left | 06:18 |
| ← jizanthapus left | 06:18 |
| → ArcTanSusan joined | 06:19 |
| ← netsroht left | 06:20 |
| ← dreiss left | 06:21 |
| → netsroht joined | 06:23 |
| ← sgu left | 06:23 |
| ← donmichelangelo left | 06:23 |
| → donmichelangelo joined | 06:23 |
| ← maroloccio left | 06:23 |
| → Kayra joined | 06:24 |
| → Mars__ joined | 06:28 |
| ← Kayra left | 06:28 |
| → frew joined | 06:30 |
| → kbart joined | 06:31 |
| ← pikarenx left | 06:32 |
| → pantsman joined | 06:32 |
| → pikaren joined | 06:32 |
| ← hwrdprkns left | 06:32 |
| ← Mars__ left | 06:33 |
| ← yhager left | 06:33 |
| → ThomasLocke joined | 06:37 |
| → dsdeiz joined | 06:38 |
| → yhager joined | 06:38 |
| ← the_cybersphinx left | 06:41 |
| → petey joined | 06:42 |
| → dyng joined | 06:42 |
| → bwreilly joined | 06:44 |
| ← daito_ left | 06:46 |
| ← pheaver left | 06:47 |
| ← petey left | 06:47 |
| → daito joined | 06:48 |
| → Hoksilato_ joined | 06:49 |
| ← ewet_ left | 06:50 |
| ← Hoksilato left | 06:50 |
| → jackneill joined | 06:51 |
| kay_____1 → kay_____ | 06:51 |
| kay_____ → kay______ | 06:51 |
| ← nw8l left | 06:55 |
| → matanya joined | 06:55 |
| ← dyng left | 06:55 |
| → h_kon joined | 06:55 |
| ← croaky left | 06:55 |
| → dyng joined | 06:56 |
| → stodan joined | 06:57 |
| ← pikaren left | 06:57 |
| → konadr joined | 06:57 |
| → perlstein joined | 06:58 |
| ← dyng left | 06:59 |
| → tobias__ joined | 06:59 |
| ← LucasKA left | 06:59 |
| ← pantsman left | 06:59 |
| → freimatz joined | 07:01 |
| → hoschi joined | 07:02 |
| ← konadr left | 07:02 |
| → dyng joined | 07:04 |
| → mishok13 joined | 07:05 |
| → jceb joined | 07:06 |
| → nilg joined | 07:08 |
| ← dyng left | 07:08 |
| ← SHyx0rmZ left | 07:09 |
| → lite_ joined | 07:09 |
| → dyng joined | 07:09 |
| → d33tah joined | 07:15 |
| ← acharlie_ left | 07:15 |
| → Kayra joined | 07:15 |
| ← jargon left | 07:15 |
| → fire joined | 07:18 |
| ← cagedwisdom left | 07:18 |
| → cagedwisdom joined | 07:20 |
| ← Kayra left | 07:20 |
| ← cagedwisdom left | 07:21 |
| ← travisstaton left | 07:22 |
| → cagedwisdom joined | 07:22 |
| → bitslayer joined | 07:23 |
| ← cagedwisdom left | 07:23 |
|
bitslayer
| I could use some help with git... | 07:24 |
| → ciampix joined | 07:24 |
| → mlechner joined | 07:26 |
| → revyd joined | 07:26 |
| → cbreak-work joined | 07:27 |
|
bitslayer
| anyone out there wanna help with a problem I'm having? | 07:27 |
| ← cbreak-work left | 07:28 |
| → cmpera joined | 07:28 |
| ← Layke left | 07:28 |
| → cbreak-work joined | 07:28 |
| → pen joined | 07:28 |
| ← kay______ left | 07:28 |
| → takamichi joined | 07:28 |
| → eletuchy joined | 07:29 |
| → Mars__ joined | 07:29 |
| → eijk_ joined | 07:30 |
| ← fire left | 07:31 |
|
milki
| bitslayer: !ask | 07:31 |
|
gitinfo
| bitslayer: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon. | 07:31 |
| → mateu joined | 07:31 |
| ← simpleminds left | 07:31 |
| ← shihan_ left | 07:31 |
| ← bwreilly left | 07:31 |
| ← LeeXiaolan left | 07:31 |
| ← mishok13 left | 07:32 |
| → cagedwisdom joined | 07:32 |
| → cagedwisdom_ joined | 07:32 |
| ← cagedwisdom_ left | 07:32 |
| ← cagedwisdom left | 07:32 |
| ← peper left | 07:32 |
| → cagedwisdom joined | 07:33 |
| ← Mars__ left | 07:34 |
| ← Hamled left | 07:34 |
| ← quotemstr left | 07:34 |
| → eijk joined | 07:34 |
| ← bitslayer left | 07:34 |
| ← eijk_ left | 07:34 |
| ← keeb left | 07:35 |
| → keeb joined | 07:35 |
| → shihan joined | 07:36 |
| → simpleminds joined | 07:36 |
| → Hamled joined | 07:36 |
| → holderbaum joined | 07:37 |
| → peper joined | 07:39 |
| ← obert_ left | 07:39 |
| → swaechter joined | 07:40 |
| → quotemstr joined | 07:40 |
| → Kicer86 joined | 07:40 |
| ← macben left | 07:42 |
| → dinoangelov_ joined | 07:42 |
| ← simesy left | 07:43 |
| → pagalbanda joined | 07:43 |
| ← pagalbanda left | 07:43 |
| bitkid_ → bitkid | 07:44 |
| ← solrize left | 07:44 |
| → kay______ joined | 07:46 |
| → dreiss joined | 07:46 |
| → macben joined | 07:47 |
| ← dinoangelov_ left | 07:47 |
| → arand joined | 07:49 |
| → FerreusR joined | 07:49 |
| → hits joined | 07:49 |
| ← hits left | 07:49 |
| → nnyk_ joined | 07:49 |
| → rendar joined | 07:50 |
| → m-o-s joined | 07:52 |
| → croaky joined | 07:52 |
| → MattMaker joined | 07:53 |
| → halu joined | 07:53 |
| → vurma joined | 07:54 |
| ← arand left | 07:55 |
| ← nilg left | 07:55 |
| → HelperW joined | 07:56 |
| → PeterBooker joined | 07:56 |
| ← m-o-s left | 07:57 |
| → mishok13 joined | 07:58 |
| → nilg joined | 07:58 |
| → MrQuist joined | 07:58 |
| → Anticom joined | 07:58 |
| → juril joined | 08:01 |
| ← harish left | 08:02 |
| ← matanya left | 08:03 |
| suy_ → suy | 08:03 |
| → matanya joined | 08:04 |
| ← el3ctron left | 08:04 |
| → bartzy joined | 08:04 |
| → marthinal joined | 08:06 |
| → tm512 joined | 08:07 |
| ← croaky left | 08:08 |
| ← ewnd9 left | 08:08 |
| → Timmy joined | 08:09 |
| → ewnd9 joined | 08:09 |
| → mrhooray joined | 08:09 |
| ← mrhooray left | 08:09 |
| → mrhooray joined | 08:10 |
| → papegaaij joined | 08:10 |
| ← mrhooray left | 08:10 |
| ← ewnd9 left | 08:11 |
| → mrhooray joined | 08:11 |
| niax_ → niax | 08:12 |
| → ewnd9 joined | 08:12 |
| → Yonkie joined | 08:13 |
| → noname001__ joined | 08:13 |
| ← Norm_ left | 08:15 |
| → Kayra joined | 08:15 |
| → harobed_ joined | 08:16 |
| ← harobed_ left | 08:16 |
| → beyondcreed joined | 08:16 |
| ← beyondcreed left | 08:16 |
| → beyondcreed joined | 08:16 |
| → harobed_ joined | 08:16 |
| ← macben left | 08:18 |
| → macben joined | 08:18 |
| ← Kayra left | 08:19 |
| ← daito left | 08:19 |
| → codehotter joined | 08:20 |
|
codehotter
| How do I find out which remote git push pushes to | 08:20 |
| ← dyng left | 08:21 |
|
jast
| depends on your configuration, most notably the value of push.default | 08:21 |
| → dyng joined | 08:21 |
| → alorence joined | 08:21 |
|
canton7
| codehotter, from man git-push: When the command line does not specify where to push with the <repository> argument, branch.*.remote configuration for the current branch is consulted to determine where to push. If the configuration is missing, it defaults to origin. | 08:21 |
|
gitinfo
| codehotter: the git-push manpage is available at http://jk.gs/git-push.html | 08:21 |
|
codehotter
| jast how do I query a configuration value? | 08:21 |
| → TomyWork joined | 08:22 |
|
jast
| 'git config <name>' | 08:22 |
| → hits joined | 08:22 |
| ← hits left | 08:22 |
| → jmcantrell joined | 08:22 |
|
canton7
| jast, does push.default affect which *remote* to push to? | 08:22 |
|
codehotter
| canton7 ! ah, I missed the part "if the configuration is missing, it defaults to origin" | 08:22 |
|
jast
| canton7: not sure... | 08:22 |
| ← mishok13 left | 08:22 |
| → jnavila joined | 08:22 |
|
jast
| well, it does in that if push.default is set to 'upstream' or similar, it doesn't push at all if there is no tracking config :) | 08:22 |
|
canton7
| I thought at first it would, then realised it only specifies the ref on the remote, not the remote itself | 08:22 |
|
| that's very true, however | 08:23 |
| ← dyng left | 08:23 |
|
codehotter
| git config push.default prints out nothing | 08:23 |
| → dyng joined | 08:23 |
| → shruggar joined | 08:23 |
|
jast
| currently the default is 'matching' | 08:23 |
|
canton7
| it defaults to 'matching', then (and will default to 'simple' in git 2.0) | 08:23 |
| → gua_ould joined | 08:23 |
| → Raging_Hog joined | 08:26 |
| ← Kabaka left | 08:27 |
| → harish joined | 08:28 |
|
| Nevik prefers it set to 'upstream' | 08:28 |
| → longbeach joined | 08:29 |
| → mishok13 joined | 08:29 |
| → aChatir joined | 08:30 |
| → Mars__ joined | 08:30 |
| ← macben left | 08:30 |
| ← aChatir left | 08:30 |
|
codehotter
| would this be a reliable way to get the remote "git push" would push to from bash, or is there a much easier way? | 08:31 |
|
| git config branch.$BRANCH.remote || git remote -v | sed -ne "s/^origin\t\(.*\) (push)/\1/p" | 08:31 |
| ← dreiss left | 08:32 |
| → Mars___ joined | 08:32 |
| ← Mars__ left | 08:32 |
| → solrize joined | 08:32 |
| → dreiss joined | 08:32 |
| → arizuka_ joined | 08:33 |
| ← arizuka left | 08:33 |
| ← GeertV left | 08:34 |
| ← dyng left | 08:34 |
| → GeertV joined | 08:34 |
| → dyng joined | 08:34 |
| ← Spyro left | 08:34 |
| → albel727 joined | 08:35 |
|
osse
| codehotter: git config branch.$branch.remote || git config remote.origin.pushurl || git config.remote.origin.url | 08:35 |
|
| but git config branch.$branch.remote gives only the name of a remote, not the url | 08:36 |
| → Spyro joined | 08:36 |
| ← Timmy left | 08:36 |
| → soee joined | 08:37 |
| → smef joined | 08:38 |
| → daito joined | 08:38 |
| ← harish left | 08:38 |
| → buzzybron joined | 08:39 |
| ← smef left | 08:39 |
| → smef joined | 08:39 |
| ← mdiers left | 08:40 |
| → lavong joined | 08:40 |
| → obert joined | 08:40 |
| → akiva joined | 08:40 |
| ← Goplat left | 08:41 |
| → rath joined | 08:42 |
| → simesy joined | 08:43 |
| ← beyondcreed left | 08:43 |
| ← daito left | 08:43 |
| → petey joined | 08:43 |
| → bitslayer joined | 08:44 |
|
bitslayer
| anyone out there? | 08:45 |
| gitinfo set mode: +v | 08:45 |
| → master_j joined | 08:45 |
|
bitslayer
| anyone out there? | 08:46 |
|
milki
| !ask | 08:46 |
|
gitinfo
| Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon. | 08:46 |
| ← dreiss left | 08:47 |
| ← arizuka_ left | 08:47 |
|
bitslayer
| when I do a git branch -a I get * angularjsdev, master, remotes/origin/angularjsdev, remotes/origin/master | 08:47 |
| ← Gamecubic_ left | 08:48 |
| ← simesy left | 08:48 |
|
bitslayer
| but my angularjsdev doesn't have whats up on the remote | 08:48 |
|
| i.e. the files don't match | 08:48 |
| ← petey left | 08:48 |
| → konadr joined | 08:48 |
|
bitslayer
| do I have a local branch that is separate from the remote branch? | 08:48 |
| → psoo joined | 08:49 |
| ← joaoh82 left | 08:50 |
| ← DrHouse|Yuno left | 08:50 |
| ← master_j left | 08:50 |
| → thierryp joined | 08:51 |
| ← Maxdamantus left | 08:52 |
|
osse
| it's alway seperate | 08:52 |
|
| gir status should tell you | 08:52 |
| → Maxdamantus joined | 08:53 |
| ← shruggar left | 08:53 |
| → arizuka joined | 08:53 |
| ← konadr left | 08:54 |
| → konadr joined | 08:54 |
| ← johnkevinmbasco left | 08:55 |
| ← nilg left | 08:55 |
| → LucasKA joined | 08:56 |
| → Devastator joined | 08:56 |
| ← alexwhitman_ left | 08:56 |
| → daito joined | 08:57 |
| → alexwhitman joined | 08:58 |
| → nilg joined | 08:58 |
|
| FiLoSsOfIe hello | 08:59 |
| → kesha joined | 09:00 |
| ← LucasKA left | 09:01 |
| ← daito left | 09:02 |
| ← DanielHollands left | 09:02 |
| → mustafavelioglu joined | 09:02 |
| → SpaghettiCat_ joined | 09:04 |
| ← HelperW left | 09:04 |
| → slyfox joined | 09:05 |
| ← slyfox left | 09:05 |
| → slyfox joined | 09:05 |
| ← bl33 left | 09:06 |
| → Kayra joined | 09:06 |
| → Sonderblade joined | 09:06 |
| ← Sonderblade left | 09:07 |
| ← jceb left | 09:07 |
| → Sonderblade joined | 09:07 |
| ← dyng left | 09:07 |
| → dyng joined | 09:07 |
| → LimeBlast joined | 09:07 |
| ← longbeach left | 09:08 |
| → harish joined | 09:08 |
| → pikaren joined | 09:08 |
| ← Mars___ left | 09:09 |
| ← asedeno left | 09:11 |
| → SonderbladeWork joined | 09:11 |
| ← SonderbladeWork left | 09:11 |
| ← akiva left | 09:11 |
| → SonderbladeWork joined | 09:12 |
| → Kabaka joined | 09:12 |
|
codehotter
| osse: thanks! So how's this? | 09:12 |
|
| REMOTE=$(git config branch.$BRANCH.remote); REPOURL=$(git config remote.${REMOTE:=origin}.pushu | 09:12 |
|
| rl || git config remote.$REMOTE.url); | 09:12 |
| Keridos_off → Keridos | 09:13 |
| → Silmarilion joined | 09:13 |
| ← mrhooray left | 09:13 |
| ← weiyang left | 09:14 |
| → croaky joined | 09:14 |
| ← MattMaker left | 09:14 |
| ← nnyk_ left | 09:14 |
| → MattMaker joined | 09:15 |
| ← SonderbladeWork left | 09:15 |
| → nnyk_ joined | 09:16 |
| ← ArcTanSusan left | 09:16 |
| ← MattMaker left | 09:16 |
| → MattMaker joined | 09:17 |
| ← marthinal left | 09:17 |
| → asedeno joined | 09:18 |
| ← JanC left | 09:19 |
| ← croaky left | 09:19 |
| → shruggar joined | 09:20 |
| → jceb joined | 09:21 |
| → MattMake_ joined | 09:23 |
| → macben joined | 09:24 |
| ← MattMaker left | 09:24 |
| → joaoh82 joined | 09:24 |
| → WaReZ joined | 09:25 |
|
SpaghettiCat_
| Hello, I can't understand this problem: git clone fails on cloning TO a NAS (NTFS), but clones fine to a local hard-drive (NTFS). Here is the error: http://pastie.org/private/leudedrrjiwiu9zfborssa Using git 1.8.5.2 on Cygwin. Any ideas are appreciated. | 09:26 |
| → m0ltar joined | 09:28 |
| ← Skrypter left | 09:28 |
|
moritz
| SpaghettiCat_: usually the problem with network file systems is that they don't support proper locking | 09:29 |
| → Skrypter joined | 09:29 |
| ← Skrypter left | 09:29 |
| ← joaoh82 left | 09:29 |
| ← MattMake_ left | 09:29 |
| → MattMaker joined | 09:30 |
|
moritz
| SpaghettiCat_: the way that problem is reported is less than awesome, though | 09:30 |
| → blinkdesign joined | 09:31 |
|
SpaghettiCat_
| moritz: Thanks for the help. I suppose I should just have the repo on the local drive. Network drives seemed to me so transparent until now :/ | 09:32 |
| → JanC joined | 09:32 |
|
moritz
| SpaghettiCat_: one of the many imperfect abstractions in the computing world | 09:33 |
| ← bitslayer left | 09:34 |
| → DoniRS joined | 09:37 |
| → LeeXiaolan joined | 09:38 |
| ← Kayra left | 09:38 |
| → daito joined | 09:39 |
| ← macben left | 09:39 |
| → marthinal joined | 09:40 |
| → vince_prignano joined | 09:40 |
| → macben joined | 09:41 |
| → dinoangelov_ joined | 09:43 |
| → jarr0dsz joined | 09:44 |
| → simesy joined | 09:44 |
| → khmarbaise joined | 09:44 |
| ← MrQuist left | 09:45 |
| → irqq joined | 09:45 |
| ← hyperair left | 09:46 |
| → ChrisAnn joined | 09:46 |
| → mikecmpbll joined | 09:46 |
| ← buzzybron left | 09:47 |
| ← dinoangelov_ left | 09:48 |
| → matteo joined | 09:48 |
| → Norm_ joined | 09:49 |
| ← simesy left | 09:49 |
| ← Kabaka left | 09:50 |
| ← kesha left | 09:51 |
| → bvi joined | 09:53 |
| ← LeeXiaolan left | 09:55 |
| → LucasKA joined | 09:55 |
| ← macben left | 09:55 |
| → macben joined | 09:56 |
| ← nnyk_ left | 09:57 |
| → subhojit777 joined | 09:57 |
| ← dragon3__ left | 09:57 |
| ← subhojit777 left | 09:57 |
| → subhojit777 joined | 09:58 |
| ← subhojit777 left | 09:58 |
| → subhojit777 joined | 09:58 |
| → jkremser joined | 09:59 |
| ← jkremser left | 09:59 |
| → jkremser joined | 09:59 |
| → pmoust joined | 09:59 |
| ← jceb left | 10:00 |
| ← LucasKA left | 10:00 |
| → alexO joined | 10:01 |
| ← smef left | 10:02 |
| → smef joined | 10:02 |
| → dinoangelov_ joined | 10:04 |
| → bl33 joined | 10:04 |
| → cff joined | 10:04 |
| ← dyng left | 10:05 |
| → dyng joined | 10:05 |
| → jooools joined | 10:06 |
| → arietis joined | 10:06 |
| ← dinoangelov_ left | 10:08 |
| → dinoangelov_ joined | 10:08 |
| → Kayra joined | 10:08 |
| ← MattMaker left | 10:08 |
| Guest92966 → Caius | 10:09 |
| ← Caius left | 10:09 |
| → Caius joined | 10:09 |
| → dyng_ joined | 10:09 |
| ← dyng left | 10:09 |
| ← dyng_ left | 10:11 |
| → joaoh82 joined | 10:11 |
| → dyng joined | 10:11 |
| ← echo-are` left | 10:12 |
| ← macben left | 10:12 |
| → macben joined | 10:12 |
| → jceb joined | 10:13 |
| → vtunka joined | 10:13 |
| → LeeXiaolan joined | 10:14 |
| → Mars__ joined | 10:15 |
| ← dyng left | 10:16 |
| ← SpaghettiCat_ left | 10:17 |
| ← dinoangelov_ left | 10:18 |
| → SpaghettiCat_ joined | 10:18 |
| → dinoangelov__ joined | 10:18 |
| ← SpaghettiCat_ left | 10:18 |
| ← ahmedelgabri left | 10:18 |
| ← khmarbaise left | 10:19 |
| ← Orbitrix left | 10:19 |
| → mdiers joined | 10:20 |
| ← endiruna left | 10:23 |
| → nipennem joined | 10:25 |
| ← nipennem left | 10:25 |
| → ahmedelgabri joined | 10:26 |
|
osse
| codehotter: looks good | 10:26 |
| chris2_ → chris2 | 10:26 |
| ← bandroidx left | 10:26 |
| ← perlstein left | 10:26 |
|
osse
| codehotter: though it's a bad habit to use uppercase variable names :) | 10:28 |
| → danicampa901 joined | 10:31 |
| ← dinoangelov__ left | 10:31 |
| → Macaveli joined | 10:31 |
| → bandroidx joined | 10:31 |
| ← Guest44294 left | 10:32 |
| → Guest44294 joined | 10:32 |
| Guest44294 → tg | 10:32 |
| ← arizuka left | 10:32 |
| ← h_kon left | 10:33 |
| → juliohm joined | 10:33 |
| ← Macaveli left | 10:34 |
| → arizuka joined | 10:34 |
| → h_kon joined | 10:34 |
| ← h_kon left | 10:34 |
| → Macaveli joined | 10:34 |
| ← r0bby_ left | 10:36 |
| → jgoss joined | 10:36 |
| ← arizuka left | 10:36 |
| ← m0ltar left | 10:37 |
| ← macben left | 10:38 |
| → gain joined | 10:38 |
| ← mitz left | 10:38 |
| ← nilg left | 10:39 |
| → Skrypter joined | 10:40 |
| ← luc_ left | 10:41 |
| → jargon joined | 10:41 |
| → zapb joined | 10:43 |
| ← takamichi left | 10:43 |
| → dyng joined | 10:44 |
| → petey joined | 10:44 |
| ← Skrypter left | 10:45 |
| → tma996 joined | 10:46 |
| ← lavong left | 10:48 |
| ← gain left | 10:48 |
| ← yhager left | 10:48 |
| → takamichi joined | 10:48 |
| → rafeca joined | 10:48 |
| ← petey left | 10:49 |
| → HicksD joined | 10:49 |
| ← phipes left | 10:49 |
| → psyl0n joined | 10:51 |
| ← Hoksilato_ left | 10:51 |
| ← HicksD_ left | 10:51 |
| ← GeertV left | 10:52 |
| → leandrosansilva joined | 10:52 |
| → cjsarette joined | 10:53 |
| ← dropdrive left | 10:54 |
| → mitz joined | 10:55 |
| → dropdrive joined | 10:55 |
| → m0ltar joined | 10:55 |
| ← Macaveli left | 10:55 |
| → LucasKA joined | 10:56 |
| → thevishy joined | 10:57 |
| → h_kon joined | 10:58 |
| → Macaveli joined | 10:59 |
| ← harobed_ left | 10:59 |
| ← LucasKA left | 11:02 |
| ← jackneill left | 11:03 |
| → reg_reg joined | 11:03 |
| → marhaban joined | 11:03 |
| ← reg_reg left | 11:04 |
| ← Anticom left | 11:05 |
| → Anticom joined | 11:07 |
| ← cmpera left | 11:07 |
| → SWakey joined | 11:07 |
| → Sly1986 joined | 11:08 |
| ← psyl0n left | 11:12 |
| ← eletuchy left | 11:12 |
| ← vince_prignano left | 11:12 |
| ← Khisanth left | 11:13 |
| → eletuchy joined | 11:13 |
| → psyl0n joined | 11:13 |
| ← marhaban left | 11:14 |
| → beautifulmind joined | 11:14 |
| → Timmy joined | 11:15 |
| → Orbitrix joined | 11:16 |
| → eletuchy_ joined | 11:16 |
| ← Orbitrix left | 11:16 |
| ← eletuchy left | 11:16 |
| → Orbitrix joined | 11:16 |
| ← daito left | 11:16 |
| → RaceCondition joined | 11:19 |
| ← Kayra left | 11:25 |
| ← Timmy left | 11:26 |
| → Khisanth joined | 11:27 |
| ← Orbitrix left | 11:29 |
| → HelperW joined | 11:30 |
| → the_cybersphinx joined | 11:31 |
| → leandrosansilva_ joined | 11:32 |
| ← mustafavelioglu left | 11:32 |
| ← leandrosansilva left | 11:32 |
| → mlimaloureiro joined | 11:33 |
| → Kayra joined | 11:37 |
| ← dyng left | 11:38 |
| → davividal joined | 11:39 |
| → dyng joined | 11:39 |
| → vairi joined | 11:39 |
| → mustafavelioglu joined | 11:40 |
| ← dyng left | 11:41 |
| → dyng joined | 11:41 |
|
codehotter
| hi, if I want to get a single branch from upstream from a large repo, and then don't care about the history of that copy (to further save space) but then I still want to be able to update that branch from upstream and download only the deltas | 11:43 |
|
| what should I do? | 11:43 |
| → MaximB joined | 11:43 |
|
MaximB
| when I do git remote set-url origin http://stash-admin@x.x.x.x:7990/scm/git_test/git_test.git ;I get fatal: No such remote 'origin' | 11:44 |
| → Corey joined | 11:44 |
|
codehotter
| MaximB: maybe git remote add origin? | 11:45 |
| → macben joined | 11:45 |
|
MaximB
| codehotter: yes, there is also this command, but for some reason also the command I just used was specified | 11:46 |
| ← mikecmpbll left | 11:46 |
| ← mustafavelioglu left | 11:46 |
| → mikecmpbll joined | 11:46 |
| ← mlimaloureiro left | 11:47 |
| → mvelioglu joined | 11:47 |
|
MaximB
| codehotter: so this command git remote add origin http://stash-admin@x.x.x.x:7990/scm/git_test/git_test.git will add the specified server as master? | 11:47 |
| ← guide left | 11:47 |
| ← crater2160 left | 11:47 |
| → simesy joined | 11:47 |
| → qwertz_ joined | 11:48 |
| → skorgon_1 joined | 11:48 |
| → lavong joined | 11:50 |
| → marhaban joined | 11:50 |
| ← SWakey left | 11:50 |
| ← alexO left | 11:51 |
| ← simesy left | 11:52 |
| ← Mangellan2497 left | 11:53 |
|
codehotter
| MaximB: what do you mean by 'master'? | 11:54 |
| → Mangellan2497 joined | 11:54 |
|
MaximB
| nvm I think I managed to do it | 11:54 |
| → vince_prignano joined | 11:55 |
| → GeertV joined | 11:56 |
| → Guest93929 joined | 11:56 |
| ← FerreusR left | 11:56 |
| → arand joined | 11:57 |
| → angelsl joined | 11:57 |
| ← Mangellan2497 left | 11:58 |
| → LucasKA joined | 11:59 |
| → Mangellan2497 joined | 11:59 |
| ← leandrosansilva_ left | 12:01 |
| → leandrosansilva joined | 12:01 |
| → Nizumzen joined | 12:01 |
| ← arand left | 12:02 |
| ← paulweb515 left | 12:02 |
| ← ToBeFree left | 12:03 |
| ← LucasKA left | 12:04 |
| ← shruggar left | 12:04 |
| → eaj joined | 12:04 |
| → cmpera joined | 12:05 |
| ← ggherdov left | 12:06 |
| → ggherdov joined | 12:06 |
| ← ggherdov left | 12:06 |
| → ggherdov joined | 12:06 |
| ← Mangellan2497 left | 12:06 |
| ← takamichi left | 12:11 |
| → kill-9_ joined | 12:11 |
| Keridos → Keridos_off | 12:11 |
| ← przemkov1 left | 12:11 |
| → FerreusR joined | 12:12 |
| → daito joined | 12:12 |
| ← Guest44485 left | 12:14 |
| → kriks joined | 12:14 |
| → dinoangelov joined | 12:14 |
| → doev joined | 12:14 |
| ← irqq left | 12:14 |
| → irqq joined | 12:15 |
| → zhost joined | 12:15 |
| ← daito left | 12:17 |
| ← arietis left | 12:18 |
| ← vairi left | 12:18 |
| → quackgyver joined | 12:18 |
| → przemkovv joined | 12:20 |
| ← dinoangelov left | 12:22 |
| → takamichi joined | 12:23 |
| → gdogrady joined | 12:24 |
| → xlinkz0 joined | 12:25 |
| → perlstein joined | 12:26 |
| ← badewwr left | 12:26 |
| ← ConstantineXVI left | 12:27 |
| ← ciampix left | 12:28 |
| → bitkiller_ joined | 12:28 |
| ← danicampa901 left | 12:29 |
| → johnkevinmbasco joined | 12:29 |
| ← ws2k3 left | 12:29 |
| → thiago joined | 12:30 |
| ← przemkovv left | 12:33 |
| → cmpera_ joined | 12:33 |
| ← cmpera left | 12:34 |
| cmpera_ → cmpera | 12:34 |
| → ConstantineXVI joined | 12:35 |
| → przemkovv joined | 12:35 |
| → hyperair joined | 12:37 |
| ← h0bbit_ left | 12:39 |
| ← hyperair left | 12:43 |
| → ni__ joined | 12:43 |
| ← zapb left | 12:44 |
| → Mangellan2497 joined | 12:45 |
| ← jerichodotm left | 12:45 |
| ← thierryp left | 12:45 |
| → fire joined | 12:45 |
| → thierryp joined | 12:46 |
| ← macben left | 12:46 |
| ← ewnd9 left | 12:47 |
| → freestyl3r joined | 12:48 |
| → hudku joined | 12:48 |
| ← przemkovv left | 12:52 |
| → carbon1 joined | 12:52 |
| → renatow joined | 12:52 |
| → badessdf joined | 12:54 |
| → xadd joined | 12:54 |
| → przemkovv joined | 12:54 |
| → hits joined | 12:54 |
|
codehotter
| if I cloned a single branch, how do I clone another branch into that repository? | 12:54 |
| ← jayrobot left | 12:55 |
| ← hits left | 12:55 |
| ← hudku left | 12:56 |
| ← pmoust left | 12:56 |
| → fanf2 joined | 12:56 |
| → noecc joined | 12:56 |
| → hudku joined | 12:56 |
| → cannonball joined | 12:57 |
| → Kabaka joined | 12:57 |
| → msafi joined | 12:59 |
| ← gdogrady left | 12:59 |
|
jast
| codehotter: git clones all branches by default but doesn't make them all visible in the normal list. you can just 'git checkout <name of branch>' to make it show up | 12:59 |
|
msafi
| Can I download a specific directory from a repository hosted on, for example, GitHub? | 12:59 |
|
jast
| 'git branch -r' to see what got copied during clone (with an 'origin/' prefix) | 12:59 |
| → gdogrady joined | 12:59 |
| ← rfoust left | 12:59 |
| → LucasKA joined | 12:59 |
|
msafi
| Can I at least download a specific branch? | 13:01 |
| → arietis joined | 13:02 |
|
jast
| msafi: yes... https://help.github.com/articles/downloading-files-from-the-command-line | 13:02 |
|
| I'm not sure whether downloading subdirs is supported... if it is, it doesn't seem to be documented | 13:02 |
| → Orbitrix joined | 13:03 |
|
jast
| the git way of doing it is disabled on github's servers | 13:03 |
| ← Orbitrix left | 13:03 |
| → Orbitrix joined | 13:03 |
|
bremner
| what's the git way of doing it? git archive? | 13:03 |
|
jast
| yeah | 13:03 |
| ← halu left | 13:04 |
| ← LucasKA left | 13:04 |
| ← blotchy left | 13:04 |
| ← renatow left | 13:05 |
| ← carbon1 left | 13:05 |
| ← dyng left | 13:06 |
| → dyng joined | 13:07 |
|
codehotter
| jast: git branch -r only shows the branch I specified with my original single-branch clone (as expected) | 13:07 |
|
| jast: how do I get one additional branch? | 13:07 |
| ← ni__ left | 13:08 |
| → anli__ joined | 13:08 |
|
anli__
| I want to apply the changes of a certain commit without creating a commit, how do I do that with tortoisegit? | 13:09 |
| → mdhopkins joined | 13:09 |
| → MattMaker joined | 13:09 |
| ← MaximB left | 13:09 |
| → msafi1 joined | 13:09 |
|
codehotter
| Is it possible to make a shallow fetch just like you can make a shallow clone? | 13:10 |
|
| (or does that question not make sense?) | 13:10 |
|
moritz
| it doesn't make too much sense | 13:10 |
|
| a clone starts the life of a repo; there you can decide to not fetch the inital history | 13:11 |
| → smashwilson joined | 13:11 |
|
moritz
| but once you have a repo, you already have that decision made | 13:11 |
| ← dyng left | 13:11 |
| ← msafi left | 13:11 |
|
codehotter
| OK, I want to make a clone without the initial history, of only a single branch. And later, once that repo exists, I want to add a second branch to that repo, also without initial history. | 13:11 |
|
| how can I do this? | 13:11 |
| ← angelsl left | 13:12 |
| → quetz joined | 13:12 |
|
codehotter
| I did git clone --depth 1 --branch branch | 13:12 |
|
| how to I get branch branch2 into that same repo? | 13:12 |
|
anli__
| Was my previous posting visible? I am not sure nickserv was letting it through | 13:12 |
|
codehotter
| git 1.7.10 atm but willing to upgrade | 13:12 |
| ← arietis left | 13:13 |
|
moritz
| codehotter: I don't have much experience with shallow clones, so I don't know, but my guess is 'not possible' | 13:13 |
|
codehotter
| anli__: your question does not make sense to me. What does it mean to 'apply the changes' of a commit? Do you want your working copy to have the changes? | 13:13 |
|
moritz
| anli__: yes, it was visible | 13:13 |
|
anli__
| codehotter: yes, moritz: thx | 13:13 |
|
moritz
| anli__: you can cherry-pick it, and then git reset HEAD^ | 13:13 |
|
anli__
| And then I want the working copy to get changes of another commit after the first one | 13:13 |
|
| So I must have a commit in between then? | 13:14 |
|
codehotter
| moritz: what would I do if I cloned a single branch if it wasn't a shallow clone? How would I add the other branch? | 13:14 |
|
moritz
| anli__: the git reset kills the commit | 13:14 |
|
anli__
| But keeps the changes then? | 13:14 |
|
moritz
| yes | 13:14 |
|
anli__
| cool | 13:14 |
| → shruggar joined | 13:15 |
| ← Kayra left | 13:15 |
|
anli__
| And I will get a dumb end then that will magically dissapear when cleaning? | 13:15 |
| → Kayra joined | 13:15 |
|
moritz
| anli__: and it sounds like you want to re-invent squashing of commits | 13:16 |
|
| moritz doesn't know what a "dumb end" is | 13:16 |
|
anli__
| No, I only want to reinvent "apply this and that commit" | 13:16 |
|
moritz
| that's git cherry-pick | 13:16 |
|
anli__
| One that is not connected | 13:16 |
|
| ...without getting new commits | 13:16 |
| ← Kayra left | 13:16 |
| → niatish joined | 13:16 |
|
moritz
| but why? in the end you'll want to have commits, no? | 13:17 |
| → mlimaloureiro joined | 13:17 |
|
moritz
| I mean, that's the whole point of using a version control system :-) | 13:17 |
|
anli__
| But maybe I want to make a big commit out of them | 13:17 |
| → HelperW_ joined | 13:17 |
|
moritz
| that's what squashing is | 13:17 |
|
anli__
| Oh, ok | 13:17 |
|
moritz
| combining several commits into one | 13:17 |
|
| which you seem to be wanting to re-invent :-) | 13:17 |
| → ewet joined | 13:17 |
| ← HelperW left | 13:17 |
|
anli__
| I dont want to modify commits actually | 13:18 |
| ← ewet left | 13:18 |
|
anli__
| And making one commit out of two is modification, I assume | 13:18 |
|
moritz
| yes, it is | 13:18 |
|
pikaren
| how often do i need to commit | 13:18 |
| → Kayra joined | 13:18 |
| ← Kayra left | 13:18 |
|
moritz
| so is cherry-picking (it modifies the parent, thus the sha1) | 13:18 |
|
| well, creates a modified copy | 13:18 |
|
anli__
| pikaren: every time you have done something working that you can put a name on :) | 13:19 |
| → ewet joined | 13:19 |
|
moritz
| anli__: https://help.github.com/articles/interactive-rebase might be of interest | 13:19 |
|
anli__
| ok | 13:19 |
| ← ewet left | 13:19 |
| → ewet joined | 13:20 |
| ← jarr0dsz left | 13:20 |
| ← ewet left | 13:20 |
| → Kayra joined | 13:21 |
|
anli__
| When I edit a conflict in tortoisegit, the scrolling will reset to topmost, why? | 13:21 |
| → ewet joined | 13:21 |
|
moritz
| dunno, ask the tortoise devs :-) | 13:22 |
| ← ewet left | 13:22 |
| → ewet joined | 13:22 |
|
anli__
| I thought maybe one or two of them are in here | 13:22 |
| → h0bbit_ joined | 13:22 |
| ← regreddit left | 13:23 |
| ← mvelioglu left | 13:23 |
| ← psoo left | 13:23 |
| → psoo joined | 13:23 |
| → mvelioglu joined | 13:23 |
| ← mlimaloureiro left | 13:24 |
| → r0bby_ joined | 13:25 |
| ← joaoh82 left | 13:25 |
| ← HelperW_ left | 13:26 |
| → notjohn joined | 13:26 |
| → HelperW_ joined | 13:26 |
| → harobed joined | 13:27 |
| → ewnd9 joined | 13:29 |
| → rfoust joined | 13:29 |
| → dinoangelov joined | 13:29 |
| r0bby_ → robbyoconnor | 13:29 |
| ← notjohn left | 13:29 |
|
anli__
| If I cherry pick and get conflicts, will a click on abort take me to the state before the cherry pick? | 13:30 |
|
| A click of "abort" in the dialog where I resolve conflicts, that is | 13:30 |
| ← mdhopkins left | 13:31 |
| → notjohn joined | 13:31 |
| ← ahmedelgabri left | 13:31 |
| → decotii joined | 13:31 |
| → wakeup joined | 13:32 |
|
wakeup
| Hi | 13:32 |
|
dr_lepper
| anli__: probably yes | 13:32 |
|
| anli__: !gui | 13:32 |
|
gitinfo
| anli__: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed. | 13:32 |
|
wakeup
| I want git to set correct mtimes for checked out files. E.g. the | 13:32 |
|
| dates when the files actually were modified. | 13:32 |
|
| Any chance I can get what I want? | 13:33 |
|
ewet
| is this http://pastie.org/8609896 a good example for the rebase/merge controversy? | 13:33 |
| → macben joined | 13:33 |
| → sgambino joined | 13:33 |
| → msafi joined | 13:33 |
|
msafi
| How can I move a directory from one branch to another? | 13:34 |
|
dr_lepper
| wakeup: not with git itself, but there are third-party scripts that do something like that | 13:34 |
| ← Entomo left | 13:34 |
|
wakeup
| dr_lepper: which, and what does somethinbg like that mean? | 13:34 |
|
| Imho this should be the default behaviour. | 13:34 |
| ← hudku left | 13:35 |
|
dr_lepper
| wakeup: just google around | 13:35 |
| → razzle joined | 13:35 |
|
dr_lepper
| git does not do it | 13:35 |
| ← msafi1 left | 13:35 |
|
dr_lepper
| ewet: it looks like it's extremely workflow-dependent | 13:36 |
| → hyperair joined | 13:37 |
|
dr_lepper
| most workflows do not allow commits which break tests | 13:37 |
|
ewet
| dr_lepper: absolutely | 13:37 |
|
wakeup
| bullshit workflow then lol | 13:37 |
|
ewet
| well the commit would actuallly have happened already | 13:37 |
|
| and test would have been fine | 13:38 |
|
| only after the rebase things would break, wouldn't they? | 13:38 |
|
dr_lepper
| the commit message "test OK" is meaningless in such workflows, because all commits are "test OK"-commits | 13:38 |
| ← macben left | 13:39 |
|
ewet
| dr_lepper: yeah, but that's just to explain things ... | 13:39 |
|
| it doesn't make any difference | 13:40 |
| → diegoviola joined | 13:40 |
| ← marhaban left | 13:40 |
| [emmajane] → emmajane | 13:40 |
| → looper joined | 13:40 |
| → breakingthings joined | 13:41 |
| → ToBeFree joined | 13:43 |
|
ewet
| I just needed a commit message that would become wrong | 13:44 |
| → Roch_ joined | 13:44 |
|
dr_lepper
| then don't describe the state, describe the changes | 13:46 |
| ← ewet left | 13:46 |
| ← thrakcattack left | 13:46 |
| → macben joined | 13:46 |
| ← mikecmpbll left | 13:46 |
| ← macben left | 13:47 |
| → ewet joined | 13:47 |
| → thrakcattack joined | 13:48 |
| ← mvelioglu left | 13:48 |
| ← ewet left | 13:48 |
| → tmcmahon joined | 13:48 |
| ← amcsi_work left | 13:48 |
| → amcsi_work joined | 13:49 |
| → ewet joined | 13:49 |
| → psoo_ joined | 13:49 |
| ← ewet left | 13:50 |
| ← vince_prignano left | 13:50 |
| → macben joined | 13:51 |
| → IrishPrime joined | 13:51 |
| → ewet joined | 13:51 |
| ← ewet left | 13:51 |
| → amortimer_mbp joined | 13:52 |
| ← psoo left | 13:52 |
| ← thiago left | 13:52 |
| → ewet joined | 13:52 |
| → shinnya joined | 13:52 |
| ← tmcmahon left | 13:52 |
| ← ewet left | 13:52 |
| ← h0bbit_ left | 13:53 |
| → ahmedelgabri joined | 13:53 |
| → ewet joined | 13:54 |
| → jerius joined | 13:54 |
| ← subhojit777 left | 13:55 |
| → joaoh82 joined | 13:56 |
| ← ItSANgo left | 13:57 |
| ← robbyoconnor left | 13:57 |
| → ws2k3 joined | 13:58 |
| ← ws2k3 left | 13:58 |
| → ws2k3 joined | 13:58 |
| ← Mars__ left | 13:58 |
| ← gdogrady left | 13:59 |
| → Mars__ joined | 13:59 |
| → ni__ joined | 13:59 |
| → floatingpoint joined | 14:00 |
| → LucasKA joined | 14:00 |
|
ewet
| cleaned it up a little http://pastie.org/8609963 | 14:00 |
| ← joaoh82 left | 14:01 |
| ← jsilver left | 14:01 |
| → thiago joined | 14:02 |
| → hellopat joined | 14:02 |
| ← razzle left | 14:03 |
| → paulweb515 joined | 14:04 |
| → DaisyTheCow joined | 14:04 |
| ← Mars__ left | 14:04 |
| ← paulweb515 left | 14:04 |
| → paulweb515 joined | 14:04 |
| ← LucasKA left | 14:04 |
| → Destos joined | 14:05 |
| → mvelioglu joined | 14:06 |
| ← ahmedelgabri left | 14:09 |
| → FortySix2 joined | 14:09 |
| ← FortySix2 left | 14:10 |
| → b3tamax joined | 14:11 |
| → FortySix2 joined | 14:12 |
| ← Destos left | 14:13 |
| ← vtunka left | 14:14 |
| → Norm__ joined | 14:14 |
| ← Norm__ left | 14:15 |
| → gfontenot joined | 14:16 |
| → ItSANgo joined | 14:16 |
| ← tma996 left | 14:18 |
| ← bandroidx left | 14:18 |
| ← Nibato left | 14:18 |
| → tma996 joined | 14:19 |
| → hs366 joined | 14:19 |
| → geekbri joined | 14:20 |
| → bandroidx joined | 14:21 |
|
cff
| Why does Github recommend core.autocrlf true on Windows? https://help.github.com/articles/dealing-with-line-endings#global-setting | 14:21 |
|
| and input on OS X and Linux ? | 14:21 |
| → nilg joined | 14:21 |
| ← jerius left | 14:22 |
| → phile joined | 14:22 |
|
cff
| that means that on OS X and Linux the line ending won't be changed by Git? | 14:22 |
| → Barringer joined | 14:22 |
|
cff
| i.e. the files are checked out as is | 14:22 |
| ← tobias__ left | 14:23 |
| ← juliohm left | 14:23 |
| ← tma996 left | 14:23 |
| ← mdiers left | 14:25 |
|
jast
| personally I think the best way to deal with line ending conversion is the one outlined in !crlf | 14:26 |
|
gitinfo
| to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/ | 14:26 |
| ← Silmarilion left | 14:26 |
| → angelsl joined | 14:26 |
| ← thiago left | 14:26 |
| → Dougie187 joined | 14:27 |
| → jerichodotm joined | 14:28 |
| ← jerichodotm left | 14:28 |
| → jerichodotm joined | 14:28 |
| ← xadd left | 14:28 |
| → tma996 joined | 14:29 |
| ← Macaveli left | 14:29 |
| → crater2150 joined | 14:29 |
|
cff
| so what value should core.eol have? | 14:29 |
|
| or it's set automatically ? | 14:29 |
|
jast
| each build of git should have a proper default | 14:30 |
|
| the only exception is cygwin (which is on windows but pretends to be unixy, so it uses LF) | 14:30 |
| ← Raging_Hog left | 14:31 |
| ← kbart left | 14:31 |
| → vince_prignano joined | 14:31 |
| ← vince_prignano left | 14:32 |
|
zumba_addict
| so folks, we made a separate branch that we are treating as master. We called it bug-fixes. We don't want to directly push to this branch. We will create our own local-fixes branch, have the other devs review the code, then merge to bug-fixes when 5 devs approve code. If let's say I will be making a new local-fix branch, how do I make sure that I only pull from the most recent bug-fixes remote branch? | 14:32 |
| ← rchavik left | 14:33 |
| ← bgerber left | 14:33 |
| → guide joined | 14:33 |
| → Macaveli joined | 14:33 |
| ← GeertV left | 14:35 |
| → GeertV joined | 14:35 |
| ← beautifulmind left | 14:37 |
| ← soee left | 14:37 |
| → bgerber joined | 14:37 |
| → daivyk joined | 14:38 |
| joshc_ → joshc | 14:38 |
| → gancl joined | 14:39 |
| ← GeertV left | 14:40 |
| → Destos joined | 14:40 |
| ← tma996 left | 14:40 |
| ← Kayra left | 14:40 |
| ← Barringer left | 14:41 |
| → pixelgremlins joined | 14:41 |
| → ahmedelgabri joined | 14:41 |
| → arietis joined | 14:41 |
| ← macben left | 14:43 |
| → marhaban joined | 14:43 |
| → Advocation joined | 14:44 |
| → murosai joined | 14:44 |
| → maveneag_ joined | 14:44 |
| ← maveneag_ left | 14:44 |
|
murosai
| hey, how can i add all files recursively to index that end with .py? | 14:44 |
|
grawity
| `git add "**/*.py"` if your git version is recent enough | 14:45 |
|
| otherwise, `shopt -s globstar; git add **/*.py` if you use bash | 14:45 |
| → Noldorin joined | 14:45 |
| → macben joined | 14:45 |
|
grawity
| (not sure what the zsh equivalent is) | 14:45 |
|
murosai
| yup it worked | 14:45 |
|
grawity
| otherwise, `find -name "*.py" -exec git add {} +` | 14:46 |
| ← ni__ left | 14:46 |
| → AaronMT joined | 14:47 |
| → tma996 joined | 14:47 |
| → WAAQMXZ joined | 14:48 |
| → Actreka joined | 14:48 |
| ← arietis left | 14:49 |
| ← wakeup left | 14:49 |
|
| FiLoSsOfIe ce fac puturosiiiiii ? | 14:49 |
| → soee joined | 14:49 |
|
Actreka
| I was renaming every file in my git-repo however I deleted the files then recreated them (with the new name). Now I can't see the full blame or log. Is there anything I can do to get it back? | 14:50 |
| → petey joined | 14:50 |
| → zorzar joined | 14:50 |
| ← psyl0n left | 14:50 |
| → aleng_ joined | 14:51 |
| karupanerura → zz_karupanerura | 14:51 |
| ← FerreusR left | 14:52 |
| → FerreusR joined | 14:52 |
| → Kayra joined | 14:53 |
| ← aleng_ left | 14:53 |
| ← papegaaij left | 14:53 |
| → msm joined | 14:53 |
| → ni__ joined | 14:55 |
| ← kcj left | 14:56 |
| → joaoh82 joined | 14:57 |
|
grawity
| `git blame` follows renames by default, for `git log` use the --follow option | 14:58 |
|
Actreka
| grawity: The problem is that it doesn't because it was technically not a rename, but a delete and creation | 14:59 |
|
grawity
| Actreka: that's exactly what a rename is in Git | 14:59 |
|
| `git mv` does nothing more. | 14:59 |
| ← h_kon left | 14:59 |
| ← donmichelangelo left | 15:00 |
| → donmichelangelo joined | 15:00 |
| → LucasKA joined | 15:01 |
| ← Luke-Jr left | 15:01 |
| ← matanya left | 15:01 |
| ← soee left | 15:01 |
|
Actreka
| grawity: Well, let me explain. This was a while ago and I was not yet used to git. So i deleted all files, then commited, added the renamed files and commited. | 15:01 |
| ← joaoh82 left | 15:01 |
|
grawity
| so it might be that rename-following breaks because there's a commit that lacks those files completely | 15:02 |
| → Luke-Jr joined | 15:02 |
| → Nibato joined | 15:03 |
| ← Luke-Jr left | 15:03 |
| → Luke-Jr joined | 15:03 |
|
Actreka
| Yep, do you know of any way to fix this? | 15:04 |
| ← Kayra left | 15:04 |
| → cjwilburn joined | 15:04 |
| ← nilg left | 15:04 |
| ← LucasKA left | 15:05 |
| 23LAAS91H → adam12 | 15:05 |
| → CheckDavid joined | 15:05 |
| → bhldev__ joined | 15:06 |
| ← bhldev_ left | 15:07 |
| → Kayra joined | 15:07 |
| ← psoo_ left | 15:07 |
| → acharlieh joined | 15:07 |
| → shawndumas joined | 15:08 |
| → mdhopkins joined | 15:08 |
| → dobalina joined | 15:08 |
| → jarr0dsz joined | 15:09 |
| ← Psi-Jack left | 15:10 |
| ← jarr0dsz left | 15:10 |
|
cff
| Is anyone using Waf build system in a large project? | 15:12 |
| ← stodan left | 15:12 |
| → goTAN joined | 15:12 |
| → joaoh82 joined | 15:13 |
| ← looper left | 15:13 |
| → NBeeuwsaert_ joined | 15:13 |
| → ojacobson joined | 15:15 |
| → mklappstuhl joined | 15:15 |
| ← NBeeuwsaert left | 15:16 |
| ← floatingpoint left | 15:16 |
| → bamj0rb joined | 15:16 |
| gitinfo set mode: +v | 15:17 |
| → JakePee joined | 15:17 |
| → gain joined | 15:20 |
| ← johnkevinmbasco left | 15:20 |
| → becks__ joined | 15:23 |
| → mikecmpbll joined | 15:24 |
| → TRomeo joined | 15:25 |
| ← TomyWork left | 15:25 |
| → tang^ joined | 15:25 |
| → TomyWork joined | 15:26 |
| → infynyxx joined | 15:27 |
| → m-o-s joined | 15:27 |
| → h0bbit_ joined | 15:27 |
| → maroloccio joined | 15:28 |
| → LuxuryMode joined | 15:28 |
| → m-o-s_ joined | 15:28 |
| ← Macaveli left | 15:29 |
| → mizu_no_oto joined | 15:30 |
| → nw8l joined | 15:30 |
| → ekoekoekoeko joined | 15:30 |
| ← mklappstuhl left | 15:30 |
| ← petey left | 15:32 |
| ← arvind_khadri left | 15:32 |
| ← john2x left | 15:32 |
| → koda joined | 15:32 |
| → petey joined | 15:32 |
|
grawity
| well, Samba uses Waf | 15:32 |
| ← m-o-s left | 15:32 |
|
grawity
| and the project isn't exactly small | 15:32 |
| → psyl0n joined | 15:34 |
|
thevishy
| Waf is a version control? | 15:34 |
|
| oh its a deployment tool | 15:35 |
|
| build tool* | 15:35 |
| → tplaner joined | 15:35 |
| FiLoSsOfIe → duc | 15:36 |
| duc → LoRdToLsToI | 15:36 |
| → vtunka joined | 15:37 |
| ← petey left | 15:37 |
| ← kermit left | 15:39 |
| ← pen left | 15:40 |
| ← cjsarette left | 15:41 |
| → hits joined | 15:41 |
| → zapb joined | 15:42 |
| ← hits left | 15:43 |
| → petey joined | 15:44 |
| ← Norm_ left | 15:44 |
| → mudmaste_ joined | 15:44 |
|
Nevik
| <thevishy> Waf is a version control? <--- best question | 15:44 |
| ← tplaner left | 15:45 |
| → tplaner joined | 15:45 |
| ← jceb left | 15:45 |
|
Nevik
| i vote "wtf is version control [asked in #git]" to be the question of the year | 15:45 |
| ← strictlyb left | 15:45 |
| → strictlyb joined | 15:45 |
| ← notjohn left | 15:46 |
| ← dobalina left | 15:46 |
| → dobalina joined | 15:46 |
| → cjsarette joined | 15:47 |
| → jonatasnona joined | 15:47 |
|
thevishy
| :-> | 15:48 |
| ← jonatasnona left | 15:48 |
| → jonatasnona joined | 15:48 |
| ← mudmaster left | 15:48 |
| ← takamichi left | 15:48 |
| ← petey left | 15:50 |
| → petey joined | 15:50 |
| → takamichi joined | 15:51 |
| ← petey left | 15:51 |
| → petey joined | 15:51 |
| → dfanjul joined | 15:51 |
| → Timmy joined | 15:51 |
| ← thierryp left | 15:52 |
|
offby1
| "f***ing version control ... how does it work" | 15:53 |
|
Nevik
| offby1: "how does it work" is a more legit question than "what is a version control", for this channel at least :P | 15:54 |
|
BinGOs
| not to be conflated with vermin control | 15:55 |
|
Nevik
| lulz | 15:55 |
| ← jargon left | 15:56 |
|
PerlJam
| "control" is probably too strong of a word anyway. It's more like herding cats than driving a train. | 15:56 |
| → aberrant joined | 15:56 |
| → leandrosansilva_ joined | 15:57 |
| ← leandrosansilva left | 15:57 |
| ← rasto left | 15:57 |
| → jcvfen joined | 15:57 |
| ← nw8l left | 15:59 |
| ← shawndumas left | 15:59 |
| → shawndumas joined | 16:00 |
|
tang^
| feels like driving a train, given all these "train tracks" git log shows for all these merges | 16:00 |
| → dxdt joined | 16:00 |
| ← M00sL0gB0t left | 16:01 |
| → M00sL0gB0t joined | 16:01 |
| → LucasKA joined | 16:01 |
| → Error404NotFound joined | 16:01 |
| → shwaiil joined | 16:02 |
|
shwaiil
| Hi | 16:02 |
| → kevwil joined | 16:02 |
| ← ilteris left | 16:02 |
| ← h0bbit_ left | 16:03 |
| ← Anticom left | 16:03 |
| → bwreilly joined | 16:03 |
|
shwaiil
| Q: I've setup a remote repository (using --bare). My local environment now is pushing this to ssh://mydomain.com/var/www/foo, I didn't specified a username to access ssh, forgot, and it seems to work. How is this possible ? Thanks! | 16:03 |
| ← DaisyTheCow left | 16:03 |
| ← m-o-s_ left | 16:04 |
|
ojacobson
| shwaiil: same way that 'ssh mydomain.com' works without specifying a username | 16:04 |
|
| ssh(1) assumes you meant to use $USER as your username if you don't specify, either in the SSH address or in your ssh config | 16:04 |
| ← dougsland left | 16:04 |
|
shwaiil
| ojacobson: thanks for looking! oh didn't knew that, why is that ? | 16:04 |
|
grawity
| for convenience, probably | 16:05 |
|
ojacobson
| (and, of course, you can specify a username to use for mydomain.com in your SSH config, at which point you don't need to specify it in the SSH command or, for git, in the URL) | 16:05 |
| ← swaechter left | 16:06 |
| ← ni__ left | 16:06 |
| ← LucasKA left | 16:06 |
| → dort joined | 16:06 |
| ← RaceCondition left | 16:08 |
| → FortySix_ joined | 16:08 |
| ← juril left | 16:08 |
| ← thevishy left | 16:08 |
| → RaceCondition joined | 16:09 |
| ← ThomasLocke left | 16:09 |
| ← FortySix2 left | 16:10 |
| ← breakingthings left | 16:11 |
| → breakingthings joined | 16:11 |
| ← jooools left | 16:12 |
| → lavaman joined | 16:12 |
| ← infynyxx left | 16:12 |
| ← cbreak-work left | 16:12 |
| ← koda left | 16:12 |
| ← paulweb515 left | 16:12 |
| → jooools joined | 16:13 |
| ← hyperair left | 16:14 |
| ← ewet left | 16:15 |
| → jjr joined | 16:16 |
| → senj joined | 16:16 |
| ← jjr left | 16:17 |
| ← macben left | 16:18 |
| → koda joined | 16:18 |
| → macben joined | 16:19 |
| → ngladitz joined | 16:19 |
| → whiskers75_ joined | 16:19 |
| ← whiskers75 left | 16:19 |
| whiskers75_ → whiskers75 | 16:19 |
| whiskers75 → Guest69945 | 16:20 |
| → dougsland joined | 16:20 |
| ← Error404NotFound left | 16:20 |
| ← dougsland left | 16:20 |
| → dougsland joined | 16:20 |
| ← rouf_ left | 16:20 |
| → gdogrady joined | 16:21 |
| → master_j joined | 16:21 |
| ← Guest69945 left | 16:21 |
| → beyondcreed joined | 16:21 |
| ← zapb left | 16:22 |
| → whiskers75_ joined | 16:22 |
| whiskers75_ → whiskers75 | 16:23 |
| ← mlechner left | 16:23 |
| ← msm left | 16:24 |
| → St_Marx joined | 16:25 |
| ← St_Marx left | 16:25 |
| → axl_ joined | 16:25 |
| → St_Marx joined | 16:26 |
| → joelm joined | 16:27 |
| ← petey left | 16:27 |
| → h0bbit_ joined | 16:28 |
| ← whiskers75 left | 16:28 |
| ← Advocation left | 16:28 |
| → whiskers75 joined | 16:28 |
| → Advocation joined | 16:29 |
| → johnmilton joined | 16:29 |
| → kodab joined | 16:30 |
| ← pikaren left | 16:30 |
| ← HelperW_ left | 16:30 |
| → petey joined | 16:30 |
| → HelperW_ joined | 16:31 |
| ← jnavila left | 16:31 |
| → maestrojed joined | 16:32 |
| ← dobalina left | 16:32 |
| → shadowvice joined | 16:32 |
| ← bvi left | 16:32 |
| ← harobed left | 16:33 |
| → ehmatthes joined | 16:33 |
| ← goTAN left | 16:33 |
| ← gua_ould left | 16:34 |
| ← koda left | 16:34 |
| ← kodab left | 16:35 |
| ← HelperW_ left | 16:35 |
| → bitslayer joined | 16:35 |
| → infynyxx_ joined | 16:35 |
| → zapb joined | 16:35 |
| ← FerreusR left | 16:35 |
| → FerreusR joined | 16:36 |
| → primitive joined | 16:37 |
| ← DoniRS left | 16:38 |
| → DolpheenDream_ joined | 16:38 |
| ← macben left | 16:39 |
| ← Nizumzen left | 16:39 |
| → macben joined | 16:39 |
| ← takamichi left | 16:39 |
| ← lite_ left | 16:40 |
| ← MattMaker left | 16:41 |
| → JDT joined | 16:41 |
| ← cagedwisdom left | 16:41 |
| → takamichi joined | 16:42 |
| ← macben left | 16:42 |
| → macben joined | 16:42 |
| ← YoungFrog left | 16:43 |
| → maroloccio2 joined | 16:43 |
| ← Timmy left | 16:44 |
| ← ekoekoekoeko left | 16:45 |
| ← rath left | 16:45 |
| ← maroloccio left | 16:46 |
| → deepwater joined | 16:46 |
| ← irqq left | 16:46 |
| → ekoekoekoeko joined | 16:46 |
| ← macben left | 16:47 |
| → ColKurtz joined | 16:47 |
| ← ColKurtz left | 16:47 |
| ← deepwater left | 16:47 |
| → ColKurtz joined | 16:48 |
| ← ColKurtz left | 16:48 |
| ← mvelioglu left | 16:48 |
| ← JEEB left | 16:48 |
| → zackiv31 joined | 16:48 |
| → yhager joined | 16:48 |
| → ColKurtz joined | 16:48 |
| ← ColKurtz left | 16:49 |
| → ColKurtz joined | 16:49 |
| ← ColKurtz left | 16:49 |
| → ColKurtz joined | 16:50 |
| ← ColKurtz left | 16:50 |
| ← JDT left | 16:51 |
| → m0viefreak joined | 16:51 |
| ← Sonderblade left | 16:52 |
| ← zackiv31 left | 16:53 |
| ← whiskers75 left | 16:53 |
| ← senj left | 16:53 |
| → ColKurtz joined | 16:53 |
| ← ColKurtz left | 16:53 |
| → jackneill joined | 16:54 |
| ← bwreilly left | 16:54 |
| ← shinnya left | 16:54 |
| ← jdav_gone left | 16:54 |
| ← Luke-Jr left | 16:54 |
| → ColKurtz joined | 16:54 |
| ← ColKurtz left | 16:54 |
| ← vtunka left | 16:55 |
| → ColKurtz joined | 16:55 |
| → senj joined | 16:55 |
| ← noname001__ left | 16:55 |
| → hyperair joined | 16:55 |
| ← psyl0n left | 16:55 |
| → whiskers75 joined | 16:56 |
| ← Kayra left | 16:57 |
| → SocalNick joined | 16:57 |
| → Timmy joined | 16:57 |
| ← RofricTheBearded left | 16:57 |
| ← ehmatthes left | 16:57 |
| → thierryp joined | 16:58 |
| → vtunka joined | 16:58 |
| ← JakePee left | 16:58 |
| → zackiv31 joined | 16:58 |
| ← TRomeo left | 16:59 |
|
shwaiil
| Q: About http://gitolite.com/deploy.html, what exactly is happening here ( GIT_WORK_TREE=/deploy/dir git checkout -f master ) ? I've read a few times and the reason is to reset the state ?!? | 16:59 |
| ← maroloccio2 left | 16:59 |
| ← dort left | 17:00 |
| → ni__ joined | 17:00 |
| ← diegoviola left | 17:00 |
| → Splenetic joined | 17:01 |
| → JakePee joined | 17:01 |
| ← nemesit|znc left | 17:02 |
| → LucasKA joined | 17:02 |
| ← ni__ left | 17:03 |
| → ni__ joined | 17:03 |
| ← shawndumas left | 17:03 |
| → btree joined | 17:03 |
| ← yhager left | 17:04 |
| → paulweb515 joined | 17:04 |
| → Kayra joined | 17:05 |
| → codezomb joined | 17:05 |
| ← blinkdesign left | 17:05 |
| → shawndumas joined | 17:05 |
| ← takamichi left | 17:06 |
| ← roland___ left | 17:06 |
|
ldlework
| If my local branch is ahead of the origin's branch, how can I see what changes would be pushed? | 17:07 |
| ← LucasKA left | 17:07 |
| → hwrdprkns joined | 17:07 |
| → King_Hual joined | 17:07 |
| ← tma996 left | 17:07 |
|
luto
| ldlework: !lol is nice for that | 17:07 |
|
gitinfo
| ldlework: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 17:07 |
|
grawity
| git fetch origin && git log --oneline @{upstream}..HEAD (or origin/master..master for example) | 17:07 |
|
luto
| and that fetch thingy to update your remote branches. right. | 17:08 |
|
osse
| ldlework: the range origin/branch..branch is the commits that would be pushed | 17:08 |
| → kermit joined | 17:08 |
|
osse
| luto: so git log origin/branch..branch for example | 17:08 |
|
| oops | 17:08 |
|
| wrong guy | 17:08 |
|
luto
| osse: I know how to do that, thank you :) | 17:08 |
|
| ;) | 17:08 |
| ← zackiv31 left | 17:08 |
| ← m0ltar left | 17:09 |
| ← rafeca left | 17:10 |
| ← leandrosansilva_ left | 17:10 |
| → FatDarrel joined | 17:10 |
| → leandrosansilva joined | 17:10 |
| ← lavong left | 17:11 |
| → pheaver joined | 17:12 |
| ← Advocation left | 17:12 |
| ← cjsarette left | 17:12 |
| ← mitz left | 17:13 |
| → cjsarette joined | 17:15 |
| → Advocation joined | 17:15 |
| ← rurufufuss left | 17:15 |
| → osmosis joined | 17:15 |
| → rednaks joined | 17:16 |
| → darnir joined | 17:16 |
| ← infynyxx_ left | 17:16 |
| ← darnir left | 17:17 |
| → darnir joined | 17:17 |
| → Skrypter joined | 17:18 |
|
bamj0rb
| shwaiil: GIT_WORK_TREE is an environment variable that overrides the working tree location. Checkout copies the trees and blobs out of the repository and writes them to the working directory as a file system structure. The -f flag tells it to forcibly overwrite changed files (instead of refusing to work). | 17:18 |
| → zackiv31 joined | 17:18 |
| ← darnir left | 17:18 |
| → bwreilly joined | 17:18 |
| → darnir joined | 17:18 |
|
breakingthings
| I have a file with changes that have not been committed and I want to blame the file but without the changes in the working directory (to see when the change I'm fixing happened). Is there an easy way to do this other than stashing those changes | 17:19 |
| → yhager joined | 17:19 |
|
ojacobson
| 'git blame HEAD -- <paths>' | 17:20 |
| → imachuchu joined | 17:20 |
| → JEEB joined | 17:20 |
| → maroloccio2 joined | 17:21 |
|
breakingthings
| thanks | 17:21 |
| → croaky joined | 17:22 |
| → jefferai joined | 17:22 |
| ChanServ set mode: +o | 17:23 |
| ← senj left | 17:23 |
| → suy_ joined | 17:23 |
| → livingstn joined | 17:23 |
| ← CalimeroTeknik left | 17:23 |
| EugeneKay changed the topic to: Welcome to #git, the place for git help and blood sausage | Current stable version: 1.8.5.2 | Start here: http://jk.gs/git | Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice | Keep good care of your git-shell and your inner snail will thank you | 17:23 |
| EugeneKay set mode: +v | 17:23 |
| EugeneKay set mode: -o | 17:23 |
| → jargan joined | 17:23 |
| → looper joined | 17:23 |
| ← suy left | 17:24 |
| ← jefferai_gone left | 17:24 |
| ← jast left | 17:24 |
| jargan → jast | 17:24 |
| → mar77i joined | 17:24 |
| ← mikecmpbll left | 17:24 |
| ← obiwahn left | 17:24 |
| → mikecmpbll joined | 17:24 |
| ← eaj left | 17:26 |
|
mar77i
| hm. there is core.whitespace tabwidth=<n> in the manpage, although all online sources suggest use of setting core.pager to less -x <n>. is this the suggested way to do this or can tabwidth be used for this? | 17:26 |
| → mitz joined | 17:26 |
| → obiwahn joined | 17:26 |
| → cdleonard1 joined | 17:27 |
| → PLejeck joined | 17:27 |
| → eaj joined | 17:27 |
|
mar77i
| to answer my question right away, core.whitespace seems to concern post-processing at commits, right? | 17:27 |
| ← bitslayer left | 17:27 |
| ← konadr left | 17:28 |
| ← msafi left | 17:28 |
| → CalimeroTeknik joined | 17:29 |
| ← CheckDavid left | 17:29 |
| → akiva joined | 17:29 |
| ← mizu_no_oto left | 17:30 |
| → Sp4rKy_ joined | 17:30 |
| → msafi joined | 17:30 |
| → jdav_gone joined | 17:30 |
| → syst3mw0rm_ joined | 17:30 |
| ← donmichelangelo left | 17:30 |
|
canton7
| mar77i, core.whitespace affects colored 'git diff' output and 'git apply' operation | 17:30 |
|
| (as stated by man git-config) | 17:30 |
| ← bartek left | 17:30 |
| → donmichelangelo joined | 17:30 |
| → bartek joined | 17:31 |
| → infynyxx joined | 17:31 |
| ← bartek left | 17:31 |
| → bartek joined | 17:31 |
| ← FerreusR left | 17:31 |
|
ojacobson
| mar77i: it's worth noting that (a) there's no widespread convention for passing whitespace settings to external tools (like pagers), and (b) external tools are not expected to look at git-config values themselves | 17:31 |
| → daito joined | 17:32 |
| ← PLejeck left | 17:32 |
| → PLejeck joined | 17:32 |
| ← gdogrady left | 17:32 |
| ← mikecmpbll left | 17:32 |
| ← tang^ left | 17:33 |
| ← Actreka left | 17:33 |
| ← eaj left | 17:33 |
| → tang^ joined | 17:33 |
| ← ekoekoekoeko left | 17:34 |
| ← Xiti left | 17:34 |
| ← cdleonard left | 17:34 |
| ← nuck left | 17:34 |
| ← russ__ left | 17:34 |
| ← D4N3 left | 17:34 |
| ← Sp4rKy left | 17:34 |
| ← Aaeriele left | 17:34 |
| ← syst3mw0rm left | 17:34 |
| ← DrZaius_ left | 17:34 |
| ← whoami left | 17:34 |
| ← BeerSerc left | 17:34 |
| ← stkrzysiak left | 17:34 |
| → Silmarilion joined | 17:34 |
| ← wkn_Mako left | 17:34 |
| → Xiti joined | 17:34 |
| → whoami joined | 17:34 |
| ← Timmy left | 17:35 |
| ← c0ded left | 17:35 |
| → stkrzysiak joined | 17:35 |
| → russ__ joined | 17:35 |
| → psyl0n joined | 17:35 |
| PLejeck → nuck | 17:35 |
| ← freimatz left | 17:35 |
| ← GameGamer43 left | 17:35 |
| → GameGamer43_ joined | 17:35 |
|
gitinfo
| the git-config manpage is available at http://jk.gs/git-config.html | 17:35 |
|
ojacobson
| gitinfo's having a rough day :) | 17:36 |
| ← unkmar_ left | 17:36 |
| ← shruggar left | 17:36 |
| ← cjsarette left | 17:36 |
| ← daito left | 17:36 |
| ← alorence left | 17:37 |
| → cjsarette joined | 17:37 |
| → c0ded joined | 17:38 |
| → vince_prignano joined | 17:38 |
| → ekoekoekoeko joined | 17:39 |
| → Nizumzen joined | 17:40 |
| GameGamer43_ → GameGamer43 | 17:40 |
| → boombatower joined | 17:41 |
| → VictorCL joined | 17:41 |
| → joelm_ joined | 17:42 |
| → Aaeriele joined | 17:42 |
| ← bitkiller_ left | 17:42 |
| ← VictorCL left | 17:43 |
| → DrZaius_ joined | 17:43 |
| → JosephFerano_ joined | 17:43 |
| → mudmaster joined | 17:43 |
| → gr_wity joined | 17:43 |
| → becks___ joined | 17:43 |
| → bitkiller_ joined | 17:43 |
| → bwreilly_ joined | 17:43 |
| → kapowaz_ joined | 17:43 |
| → alezost` joined | 17:43 |
| ← grawity left | 17:43 |
| gr_wity → grawity | 17:43 |
| → hjp_beta__ joined | 17:44 |
| → dwmw2_go` joined | 17:44 |
| → PebkacJones joined | 17:44 |
|
PebkacJones
| hello, gits | 17:45 |
| → FortySix2 joined | 17:45 |
| → FatDarrel_ joined | 17:45 |
| → konadr joined | 17:46 |
| → mitz_ joined | 17:46 |
| → adambrenecki_ joined | 17:46 |
| ← maroloccio2 left | 17:46 |
| ← smef left | 17:46 |
| → WillPittenger joined | 17:46 |
| → mikaelj_ joined | 17:46 |
| ← kevwil left | 17:46 |
| → dsop joined | 17:46 |
| → stealthii_ joined | 17:47 |
| ← PebkacJones left | 17:47 |
|
EugeneKay
| You're a git | 17:47 |
| → harobed_ joined | 17:47 |
| → ryanakca_ joined | 17:47 |
| ← harobed_ left | 17:47 |
| ← RaceCondition left | 17:47 |
| → Forkk13 joined | 17:47 |
| → wcpan_ joined | 17:47 |
| → nickoe__ joined | 17:47 |
| → edin- joined | 17:47 |
| → titusjose__ joined | 17:47 |
| → harobed_ joined | 17:48 |
| → ELLIOTTCABLE_ joined | 17:48 |
|
Nevik
| gitty in here, i'nt it | 17:48 |
| ← harobed_ left | 17:48 |
|
WillPittenger
| I'm trying to clone a URL from a private GitHub project. But the URL given by GitHub, [email@hidden.address] isn't working. Putty pops up with an error. | 17:48 |
| → krkini joined | 17:48 |
| → _Parnic joined | 17:48 |
|
WillPittenger
| Disconnected: No supported authentication methods available. | 17:48 |
|
| B:\>git clone -v --progress --recursive "git@github.com:doctorleff/u3e.git" b:\tempCloning into 'b:\temp'...fatal: Could not read from remote repository. | 17:48 |
|
zumba_addict
| hey folks, i just finished running git pull from the remote main-bug-fixes-branch. I have the latest codes now. When I create a new local branch, does it mean that the code will be the same as main-bug-fixes-branch? I'm confused because my brain is telling me that when I create a new branch, it will be the same as master and not main-bug-fixes-branch. | 17:48 |
| → mvelioglu joined | 17:48 |
|
WillPittenger
| That's what shows up on the command line. | 17:48 |
| → WhereIsMySpoon joined | 17:49 |
|
m0viefreak
| WillPittenger: do you have ssh access to that repo? | 17:49 |
| → dfarler_ joined | 17:49 |
| → tobias__ joined | 17:49 |
|
WillPittenger
| I'm a project member. I don't know about the rest. | 17:49 |
|
WhereIsMySpoon
| Hi, in git extensions it gives you a nice ui of the stuff that you changed since your last commit on the branch you're on. How do I do this via git on the cmd line? | 17:49 |
| ← bwreilly_ left | 17:49 |
|
zumba_addict
| main-bug-fixes-branch is another separate branch that is being used on another dev server. | 17:49 |
|
EugeneKay
| WillPittenger - you need to set up a SSH key with your Github account.... | 17:49 |
|
zumba_addict
| what are your thoughts folks? | 17:49 |
| → shihan_ joined | 17:50 |
| ← hahuang65 left | 17:50 |
|
WhereIsMySpoon
| also why is #git the place for blood sausage? O.o | 17:50 |
|
EugeneKay
| WillPittenger - and your client(putty on windows) may need to have the key loaded into memory if it's passphrase protected(Pageant) | 17:50 |
| → ddv_ joined | 17:50 |
| → akitada_ joined | 17:50 |
|
EugeneKay
| Or, use a https:// URL | 17:50 |
| → harobed_ joined | 17:50 |
| ← konadr left | 17:50 |
| → ngladitz_ joined | 17:50 |
| ← harobed_ left | 17:50 |
| → dytrivedi_ joined | 17:50 |
| ← cjsarette left | 17:50 |
| ← shihan left | 17:50 |
| ← kapowaz left | 17:50 |
| ← netiul left | 17:50 |
| ← hjp_beta_ left | 17:50 |
| ← steverandy left | 17:50 |
| ← JosephFerano left | 17:50 |
| JosephFerano_ → JosephFerano | 17:50 |
| ← dwmw2_gone left | 17:50 |
| ← dytrivedi left | 17:50 |
| ← knownasilya left | 17:50 |
| ← anarchih left | 17:50 |
| ← troyt left | 17:50 |
| ← offbyone left | 17:50 |
| ← bwreilly left | 17:50 |
| ← tapout left | 17:50 |
| ← Parnic left | 17:50 |
| ← Novacha left | 17:50 |
| ← thunderbolt left | 17:50 |
| ← GameGamer43 left | 17:50 |
| → zapb_ joined | 17:50 |
| ← zapb left | 17:50 |
| ← joelm left | 17:50 |
| ← St_Marx left | 17:50 |
| ← mudmaste_ left | 17:50 |
| ← mikaelj left | 17:50 |
| ← dmarr left | 17:50 |
| ← Kyle left | 17:50 |
| ← c0ded left | 17:50 |
| ← mitz left | 17:50 |
| ← FatDarrel left | 17:50 |
| ← paulweb515 left | 17:50 |
| ← ngladitz left | 17:50 |
| ← FortySix_ left | 17:50 |
| ← solrize left | 17:50 |
| FatDarrel_ → FatDarrel | 17:50 |
| ← simpleminds left | 17:50 |
| ← kini left | 17:50 |
| ← akitada left | 17:50 |
| ← dsop_ left | 17:50 |
| ← alezost left | 17:50 |
| ← salamanderrake left | 17:50 |
| ← cwillu_at_work left | 17:50 |
| ← DANtheBEASTman left | 17:50 |
| ← gnarf left | 17:50 |
| ← rastus_vernon left | 17:50 |
| ← Edgan left | 17:50 |
| ← aspiers left | 17:50 |
| ← bedouin left | 17:50 |
| ← Celelibi left | 17:50 |
| ← neozonz left | 17:51 |
|
WillPittenger
| I get this when I do that: | 17:51 |
| ← ozymandias left | 17:51 |
| ← ryanakca left | 17:51 |
| ← Kamilion left | 17:51 |
| ← emmajane left | 17:51 |
| ← whaley left | 17:51 |
| ← ConstantineXVI left | 17:51 |
| ← adambrenecki left | 17:51 |
| ← dfarler left | 17:51 |
| ← Forkk left | 17:51 |
| dfarler_ → dfarler | 17:51 |
| ← Mez left | 17:51 |
| ← stealthii left | 17:51 |
| ← nickoe left | 17:51 |
| ← crane left | 17:51 |
| ← titusjose_ left | 17:51 |
| ← ddv left | 17:51 |
| ← jgornick left | 17:51 |
| ← ELLIOTTCABLE left | 17:51 |
| ← edin left | 17:51 |
| ← atrus left | 17:51 |
| ← wcpan left | 17:51 |
| ← dan64 left | 17:51 |
| ← becks__ left | 17:51 |
| → thunderbolt__ joined | 17:51 |
| → dmarr joined | 17:51 |
| → simpleminds joined | 17:51 |
| → Guest41679 joined | 17:51 |
| ← Guest41679 left | 17:51 |
| → Guest41679 joined | 17:51 |
| → ozymandias joined | 17:51 |
| → whaley joined | 17:51 |
| → Celelibi joined | 17:51 |
| → GameGamer43_ joined | 17:51 |
| kapowaz_ → kapowaz | 17:51 |
| ← GameGamer43_ left | 17:51 |
| → GameGamer43_ joined | 17:51 |
|
WillPittenger
| B:\>git clone -v --progress --recursive "https://github.com/doctorleff/u3e.git" | 17:51 |
| alezost` → alezost | 17:51 |
|
WillPittenger
| b:\temp | 17:51 |
|
| Cloning into 'b:\temp'... | 17:51 |
|
| fatal: could not read Username for 'https://github.com': No such file or directory | 17:51 |
| → DANtheBEASTman joined | 17:51 |
| dytrivedi_ → dytrivedi | 17:51 |
| → Novacha joined | 17:51 |
| strictlyb → sb | 17:51 |
| → Edgan joined | 17:51 |
| → aspiers_ joined | 17:51 |
|
m0viefreak
| you can't use https with private repos i think | 17:51 |
| → Kyle joined | 17:51 |
| mutex_ → mutex | 17:51 |
| → paulweb515 joined | 17:51 |
| titusjose__ → titusjose_ | 17:51 |
| → jgornick joined | 17:51 |
|
EugeneKay
| You sure can; just need to specify user@ | 17:51 |
|
grawity
| you can, as long as you authenticate | 17:51 |
| ddv_ → ddv | 17:51 |
| → salamanderrake joined | 17:51 |
| → solrize joined | 17:51 |
| Kyle → Guest21287 | 17:51 |
| → bubbleheadinc joined | 17:51 |
|
EugeneKay
| man git-clone for how to set up the URL spec | 17:51 |
| → neozonz joined | 17:51 |
| → cwillu_at_work joined | 17:51 |
| ← ozymandias left | 17:51 |
| → ozymandias joined | 17:51 |
| ← paulweb515 left | 17:52 |
| → paulweb515 joined | 17:52 |
| → gnarf joined | 17:52 |
| ← Novacha left | 17:52 |
| → Novacha joined | 17:52 |
| → netiul joined | 17:52 |
| ← solrize left | 17:52 |
| → solrize joined | 17:52 |
| ← neozonz left | 17:52 |
| → neozonz joined | 17:52 |
| ← neozonz left | 17:52 |
| → neozonz joined | 17:52 |
| stealthii_ → stealthii | 17:52 |
|
WillPittenger
| EugeneKay: There is no man on Windows. | 17:52 |
| ← msafi left | 17:52 |
| adambrenecki_ → adambrenecki | 17:52 |
| → steverandy joined | 17:52 |
| → Gamecubic joined | 17:52 |
|
EugeneKay
| Normally gitinfo provides links | 17:52 |
| ← netiul left | 17:52 |
| → netiul joined | 17:52 |
| ← netiul left | 17:52 |
| → netiul joined | 17:52 |
| → atrus joined | 17:52 |
|
| EugeneKay pokes it with a stick | 17:52 |
| → Mez joined | 17:52 |
| → knownasilya joined | 17:52 |
| → crane joined | 17:52 |
| ELLIOTTCABLE_ → ELLIOTTCABLE | 17:52 |
| → anarchih joined | 17:52 |
| → c0ded joined | 17:52 |
| akitada_ → akitada | 17:52 |
|
bremner
| WillPittenger: not even in git bash | 17:52 |
| → dan64 joined | 17:52 |
|
bremner
| ? | 17:52 |
| → bedouin joined | 17:52 |
| → St_Marx joined | 17:52 |
| ← Gamecubic left | 17:52 |
|
WhereIsMySpoon
| bremner: not in mine | 17:52 |
| ← c0ded left | 17:52 |
| → c0ded joined | 17:52 |
| ← Mez left | 17:53 |
| → Mez joined | 17:53 |
|
bremner
| you need the man pages. it's not negotiable. | 17:53 |
|
WhereIsMySpoon
| theyr eonline anyway | 17:53 |
|
bremner
| sure. | 17:53 |
|
Nevik
| git for windows provides man pages in html format | 17:53 |
| → cjsarette joined | 17:53 |
|
Nevik
| running git --help command or git command --help launches them | 17:53 |
| → Gamecubic joined | 17:53 |
|
WillPittenger
| bremner: git help <command> opens webpages that look like man. | 17:53 |
|
gitinfo
| the git-clone manpage is available at http://jk.gs/git-clone.html | 17:53 |
|
osse
| On linux git help <command> launches man git-command :) | 17:53 |
|
Nevik
| git for windows does not bring textmode manpages | 17:53 |
|
bremner
| then you have man pages. H.A.N.D. | 17:53 |
| → [emmajane] joined | 17:53 |
| ← jerichodotm left | 17:54 |
|
EugeneKay
| There it is. !botsnack | 17:54 |
|
gitinfo
| Om nom nom | 17:54 |
| → jerichodotm joined | 17:54 |
|
WhereIsMySpoon
| anyone got anything for my q? | 17:54 |
| → koda joined | 17:54 |
| → CocoStorm joined | 17:54 |
| ← jerichodotm left | 17:54 |
| → jerichodotm joined | 17:54 |
| → vals_ joined | 17:54 |
|
WhereIsMySpoon
| i said it above but lots of people suddenly reconnected lol >.< | 17:54 |
|
CocoStorm
| how do I delete a contributor from my repo? | 17:55 |
| → hobodave joined | 17:55 |
|
EugeneKay
| Either !rewrite them out of history by hiding the !sausage or..... don't. | 17:55 |
|
gitinfo
| [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum | 17:55 |
|
| [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect | 17:55 |
| → ConstantineXVI joined | 17:55 |
| ← tango_ left | 17:55 |
| → a-l-e joined | 17:55 |
|
xrq
| WhereIsMySpoon: what exactly does it show you? | 17:55 |
| ← Kayra left | 17:55 |
|
moritz
| CocoStorm: what exactly do you want to do? Remove access for a user? | 17:55 |
| → tapout joined | 17:56 |
| vals_ → tango_ | 17:56 |
| → Kamilion joined | 17:56 |
| → troyt joined | 17:56 |
|
CocoStorm
| moritz, yeah, so said person can no longer see my code | 17:56 |
|
bremner
| I bet 5 cents he means from github | 17:56 |
|
CocoStorm
| haha | 17:56 |
|
| yes.. | 17:56 |
|
xrq
| WhereIsMySpoon: it doesn't show you something like git log --oneline --graph --decorate --all, does it? | 17:56 |
|
CocoStorm
| from a private repo | 17:56 |
| → harobed_ joined | 17:56 |
| → WhereIsMySpoon__ joined | 17:56 |
| ← harobed_ left | 17:56 |
|
moritz
| CocoStorm: where are you hosting that repo? github? | 17:56 |
|
WhereIsMySpoon__
| xrq: i dont know what to do to get it to show the changed files since last commit | 17:56 |
|
CocoStorm
| moritz, yes | 17:56 |
|
xrq
| WhereIsMySpoon__: git diff --names-only | 17:56 |
| ← WhereIsMySpoon left | 17:57 |
| WhereIsMySpoon__ → WhereIsMySpoon | 17:57 |
| ← WhereIsMySpoon left | 17:57 |
| → WhereIsMySpoon joined | 17:57 |
| ← WhereIsMySpoon left | 17:57 |
| → WhereIsMySpoon joined | 17:57 |
| → jnavila joined | 17:57 |
| → harobed_ joined | 17:57 |
| ← Sly1986 left | 17:57 |
| ← harobed_ left | 17:57 |
|
moritz
| CocoStorm: Settings (on the right) -> Collaborators | 17:57 |
|
EugeneKay
| Oh, well that's easy. Go into the settings icon and remove them from the Contributors page | 17:57 |
|
xrq
| *name-only | 17:57 |
|
WhereIsMySpoon
| xrq: error: invalid options --names-only | 17:57 |
|
| ah | 17:57 |
|
EugeneKay
| Same place you added them | 17:57 |
|
moritz
| CocoStorm: each contributor has a read (remove) link | 17:58 |
| → harobed_ joined | 17:58 |
| ← harobed_ left | 17:58 |
|
WhereIsMySpoon
| xrq: that doesnt seem to be obeying my gitignore | 17:58 |
|
| xrq: ie it lists .obj files amongst others when .obj is in my .gitignore | 17:58 |
| → harobed_ joined | 17:58 |
|
CocoStorm
| ahh I see moritz it's quite hard to find :P | 17:59 |
| ← harobed_ left | 17:59 |
|
CocoStorm
| heh found it in the end thanks! | 17:59 |
|
WhereIsMySpoon
| !sausage | 17:59 |
|
gitinfo
| [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect | 17:59 |
| → harobed_ joined | 17:59 |
| ← marhaban left | 17:59 |
| ← harobed_ left | 18:00 |
|
zumba_addict
| anyone please? | 18:00 |
| → Bass10 joined | 18:00 |
| → harobed_ joined | 18:00 |
| ← b3tamax left | 18:00 |
| ← harobed_ left | 18:00 |
|
WhereIsMySpoon
| xrq: how can I make it take into account my gitignore?.. | 18:01 |
|
xrq
| WhereIsMySpoon: sounds like a good bug to file | 18:01 |
| ← koda left | 18:01 |
| → FerreusR joined | 18:01 |
|
zumba_addict
| or does git refers to the current branch as the source when you make a new local branch? | 18:01 |
| → harobed_ joined | 18:01 |
| ← harobed_ left | 18:01 |
| → dreiss joined | 18:01 |
|
moritz
| zumba_addict: it does | 18:01 |
|
| zumba_addict: unless you explicitly give it another base | 18:02 |
|
zumba_addict
| ok | 18:02 |
|
| i wasn't aware of that. I thought it will always refer to master | 18:02 |
| nickoe__ → nickoe | 18:02 |
| → corni joined | 18:02 |
| → matanya joined | 18:02 |
| ← CocoStorm left | 18:02 |
|
zumba_addict
| currently, I'm on main-bug-fixes-branch branch. That means, when I create a new local branch, the code willb e the same as main-bug-fixes-branch. Correct? | 18:02 |
|
osse
| zumba_addict: by default yes. but you can explicitly name a commit to start the new branch on if you wish | 18:03 |
| → LucasKA joined | 18:03 |
|
WhereIsMySpoon
| xrq: id rather assert that it isnt my own idiocy making it happen by me not setting up soimething rather than automatically saying its a bug | 18:03 |
| → hobodave_ joined | 18:03 |
|
zumba_addict
| got it osse. Another question | 18:03 |
| ← FortySix2 left | 18:04 |
| → koda joined | 18:04 |
| ← ColKurtz left | 18:04 |
| → sami_ joined | 18:04 |
|
zumba_addict
| I did a git pull on main-bug-fixes-branch. I have an existing local branch called css-bug-fix which I created yesterday. How do I update my css-bug-fix so that it can have the new changes that my main-bug-fixes-branch received few mins ago? | 18:05 |
| ← dxdt left | 18:05 |
| → gdogrady joined | 18:05 |
|
osse
| zumba_addict: git checkout css-bug-fix; git merge main-bux-fixes-branch | 18:05 |
| ← ahmedelgabri left | 18:06 |
| ← FerreusR left | 18:06 |
|
zumba_addict
| cool | 18:06 |
|
| doing it now | 18:06 |
| ← dinoangelov left | 18:06 |
| → harobed_ joined | 18:06 |
| ← harobed_ left | 18:06 |
| petey → petey_ | 18:06 |
|
zumba_addict
| our, I have conflicts | 18:06 |
|
| ouch | 18:07 |
| ← ChrisAnn left | 18:07 |
| → harobed_ joined | 18:07 |
|
moritz
| !eek | 18:07 |
|
gitinfo
| [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! | 18:07 |
| → maroloccio joined | 18:07 |
|
zumba_addict
| ok | 18:07 |
| ← harobed_ left | 18:07 |
| → ChrisAnn joined | 18:07 |
| aspiers_ → aspiers | 18:07 |
| → harobed_ joined | 18:08 |
| ← LucasKA left | 18:08 |
| ← harobed_ left | 18:08 |
| → dprophit joined | 18:09 |
| → Mez_ joined | 18:09 |
| → harobed_ joined | 18:09 |
|
zumba_addict
| that means I'll have to check the codes from <<<<<<<< until >>>>>>>> | 18:09 |
| ← harobed_ left | 18:09 |
| ← WhereIsMySpoon left | 18:09 |
| ← tapout left | 18:09 |
| ← jgornick left | 18:09 |
| ← Edgan left | 18:09 |
| ← Guest41679 left | 18:09 |
| ← ConstantineXVI left | 18:09 |
| ← Kamilion left | 18:09 |
| ← troyt left | 18:09 |
| ← [emmajane] left | 18:09 |
| ← salamanderrake left | 18:09 |
| ← Novacha left | 18:09 |
| ← ozymandias left | 18:09 |
| ← hobodave left | 18:09 |
| ← St_Marx left | 18:09 |
| ← dan64 left | 18:09 |
| ← c0ded left | 18:09 |
| ← solrize left | 18:09 |
| ← atrus left | 18:09 |
| ← cwillu_at_work left | 18:09 |
| ← gnarf left | 18:09 |
| ← DANtheBEASTman left | 18:09 |
| ← GameGamer43_ left | 18:09 |
| ← Guest21287 left | 18:09 |
| ← whaley left | 18:09 |
| ← dmarr left | 18:09 |
| ← simpleminds left | 18:09 |
| ← Mez left | 18:09 |
| ← Celelibi left | 18:09 |
| → Edgan joined | 18:09 |
| → dan64 joined | 18:09 |
| → Novacha joined | 18:09 |
| → GameGamer43_ joined | 18:09 |
| → ozymandias joined | 18:09 |
| → Guest41679 joined | 18:09 |
| → DANtheBEASTman joined | 18:10 |
|
zumba_addict
| I'm assuming mine is <<<<<<<<HEAD | 18:10 |
| ← ekoekoekoeko left | 18:10 |
| → jgornick joined | 18:10 |
| → Celelibi joined | 18:10 |
| → solrize joined | 18:10 |
| → [emmajane] joined | 18:10 |
| → cwillu_at_work joined | 18:10 |
| → salamanderrake joined | 18:10 |
| ← ozymandias left | 18:11 |
| → ozymandias joined | 18:11 |
| ← shwaiil left | 18:11 |
| ← solrize left | 18:11 |
| → solrize joined | 18:11 |
| → gnarf joined | 18:11 |
| ← psyl0n left | 18:11 |
| → ekoekoekoeko joined | 18:11 |
| → simpleminds joined | 18:11 |
| → ColKurtz joined | 18:11 |
| ← gdogrady left | 18:11 |
| ← Novacha left | 18:11 |
| → Novacha joined | 18:11 |
| → Norm_ joined | 18:11 |
| → whaley joined | 18:11 |
| → atrus joined | 18:11 |
| → tapout joined | 18:11 |
| → ConstantineXVI joined | 18:11 |
| → Kamilion joined | 18:11 |
| → dmarr joined | 18:11 |
| → troyt joined | 18:11 |
| → Kyle- joined | 18:11 |
| → c0ded joined | 18:11 |
| ← [emmajane] left | 18:11 |
| ← koda left | 18:12 |
| ← h0bbit_ left | 18:12 |
| → harobed_ joined | 18:12 |
| ← harobed_ left | 18:12 |
|
Edgan
| Is there any way to have git not change files on conflict, by default? I don't like that the default is leave me in a broken state on conflict. | 18:13 |
| → harobed_ joined | 18:14 |
| ← petey_ left | 18:14 |
| → St_Marx joined | 18:14 |
| ← harobed_ left | 18:14 |
| → petey_ joined | 18:14 |
| → harobed_ joined | 18:15 |
| ← harobed_ left | 18:15 |
| → harobed_ joined | 18:16 |
| ← harobed_ left | 18:16 |
| → [emmajane] joined | 18:16 |
|
jrnieder
| Edgan: which version of the file do you want to show up on conflict? | 18:16 |
|
grawity
| I think the problem is that it has to start doing the actual merge until it can find out that a file conflicts | 18:16 |
| → harobed_ joined | 18:17 |
| ← chrisss404 left | 18:17 |
|
grawity
| though, `git pull --ff-only` *may* be somewhat useful | 18:17 |
|
jrnieder
| ah, a sort of "merge --dry-run" before the real merge. yeah, that would be nice | 18:17 |
| ← harobed_ left | 18:17 |
|
grawity
| (but that rejects all merges, not merely conflicting ones) | 18:17 |
|
jrnieder
| charon wrote an index-only merge that might be a nice building block | 18:17 |
| → harobed_ joined | 18:17 |
| ← harobed_ left | 18:17 |
|
jrnieder
| http://thread.gmane.org/gmane.comp.version-control.git/229787 | 18:18 |
| → harobed_ joined | 18:19 |
|
Edgan
| jrnieder: What ever there was before. From what I just read I want git merge --abort on "automatic" | 18:19 |
| ← harobed_ left | 18:19 |
| ← petey_ left | 18:19 |
|
jrnieder
| ok, sounds like you want what grawity is describing | 18:19 |
| ← maroloccio left | 18:19 |
| ← geomyidae left | 18:19 |
| → harobed_ joined | 18:19 |
| ← harobed_ left | 18:19 |
| → mklappstuhl joined | 18:20 |
| → DrShoggoth joined | 18:20 |
|
Edgan
| yeah --ff-only sounds useful | 18:20 |
| → koda joined | 18:20 |
| → VictorCL joined | 18:20 |
| → harobed_ joined | 18:20 |
| ← harobed_ left | 18:20 |
| ← Targen left | 18:20 |
|
Edgan
| grawity: jrnieder: thanks | 18:21 |
|
grawity
| yeah, if you're doing it from any kind of a "deploy" script, --ff-only is basically a requirement | 18:21 |
| → danman joined | 18:21 |
| → mrhooray joined | 18:21 |
|
grawity
| since you usually wouldn't want any merge to happen at all | 18:21 |
| ← ekoekoekoeko left | 18:21 |
| → harobed_ joined | 18:21 |
| ← harobed_ left | 18:21 |
| → irqq joined | 18:21 |
| ← xlinkz0 left | 18:22 |
| ← SocalNick left | 18:22 |
| → harobed_ joined | 18:22 |
| ← Nizumzen left | 18:22 |
| ← harobed_ left | 18:22 |
| → geomyidae joined | 18:23 |
| → thevishy joined | 18:23 |
| → harobed_ joined | 18:23 |
| ← harobed_ left | 18:23 |
| ← keeb left | 18:24 |
| → harobed_ joined | 18:24 |
| ← harobed_ left | 18:24 |
| ← Advocation left | 18:24 |
| → SocalNick joined | 18:24 |
| → FerreusR joined | 18:25 |
| → mizu_no_oto joined | 18:25 |
| → CheckDavid joined | 18:25 |
| → hahuang65 joined | 18:25 |
| ← doev left | 18:26 |
| → kodab joined | 18:26 |
| → harobed_ joined | 18:27 |
| → doev joined | 18:27 |
| ← harobed_ left | 18:27 |
| → Mars___ joined | 18:28 |
| → leeN joined | 18:28 |
| → Timmy joined | 18:28 |
| ← koda left | 18:29 |
| ← geomyidae left | 18:29 |
| ← Baluse left | 18:30 |
| → kukks joined | 18:31 |
|
zumba_addict
| i've fixed the conflicts by editing them in vi. When i run git merge source-branch, it's saying "merge is not possible because you have unmerged files" I don't see the conflict files anymore. Am I missing a command? | 18:31 |
|
jrnieder
| zumba_addict: 'git status' | 18:32 |
|
zumba_addict
| i see the files I modified | 18:32 |
|
| do I have to commit them? | 18:32 |
|
jrnieder
| yup | 18:32 |
|
zumba_addict
| cool | 18:32 |
| → b3tamax joined | 18:32 |
|
bremner
| you have to add them | 18:32 |
|
zumba_addict
| didn't know that :) | 18:32 |
|
| will do | 18:32 |
| → mrhanky joined | 18:32 |
|
bremner
| and commit them too, sorry. Brain vacation. | 18:33 |
| ← sami_ left | 18:33 |
|
zumba_addict
| perfect, it's good now. Merged :D | 18:33 |
|
| thanks folks | 18:33 |
|
mrhanky
| do unix sym-links in a git repo work under windows? | 18:33 |
| → geomyidae joined | 18:33 |
| → harobed_ joined | 18:34 |
| ← rednaks left | 18:34 |
| ← geomyidae left | 18:34 |
|
mrhanky
| example: <repo>/foo.ext to <repo>/bar/foo.ext | 18:34 |
|
jrnieder
| mrhanky: I think it tries to gracefully degrade | 18:34 |
|
grawity
| barely – msysgit will check out them as regular files, IIRC (it doesn't know how to create Windows symlinks yet) | 18:34 |
|
mrhanky
| degrade? | 18:34 |
|
grawity
| meanwhile, Cygwin git will create Cygwin-compatible symlinks which don't work with native Win32 programs | 18:34 |
|
jrnieder
| what grawity said | 18:34 |
|
| Windows symlinks = reparse points? | 18:35 |
|
mrhanky
| so git on windows will copy the linked file to destination? | 18:35 |
|
grawity
| jrnieder: a type of reparse points, yes | 18:35 |
|
jrnieder
| mrhanky: try it? :) | 18:35 |
|
WillPittenger
| Problem and conflict fixed. Thanks guys. | 18:36 |
| ← WillPittenger left | 18:36 |
|
m0viefreak
| http://cygwin.com/cygwin-ug-net/using-cygwinenv.html | 18:36 |
|
| winsymlinks:native uses NTFS reparse points | 18:36 |
|
jrnieder
| mrhanky: I think it will just create a text file naming the symlink target | 18:36 |
|
mrhanky
| i dont have a windows system jrnieder :) | 18:36 |
|
grawity
| jrnieder: right (which is how symlinks are stored internally too) | 18:36 |
|
| it's a bit unfortunate that CreateSymbolicLink() requires privileges :( | 18:36 |
| ← pheaver left | 18:36 |
| → aChatir joined | 18:37 |
| ← przemoc left | 18:39 |
| → petey_ joined | 18:39 |
| ← cjsarette left | 18:40 |
| ← aChatir left | 18:40 |
| → przemoc joined | 18:40 |
| → geomyidae joined | 18:40 |
| → cjsarette joined | 18:40 |
| ← tirengarfio left | 18:42 |
| → jhulten joined | 18:43 |
| ← mf_ left | 18:44 |
| → msafi joined | 18:44 |
| ← vurma left | 18:44 |
| ← Gamecubic left | 18:44 |
| → aard_ joined | 18:44 |
|
tang^
| jrnieder: windows junctions are roughly equivalent to symlinks | 18:44 |
| → mf_ joined | 18:44 |
| → Gamecubic joined | 18:44 |
| mf_ → Guest31032 | 18:45 |
| ← fire left | 18:45 |
| ← mr_red left | 18:45 |
|
grawity
| not quite the same thing though – and Windows *does* have symlinks as of Vista | 18:46 |
| → mr_red joined | 18:46 |
| ← msafi left | 18:47 |
| ← kodab left | 18:47 |
| ← VictorCL left | 18:47 |
| ← DrShoggoth left | 18:47 |
| ← matanya left | 18:47 |
| ← a-l-e left | 18:47 |
| ← paulweb515 left | 18:47 |
| ← bitkiller_ left | 18:47 |
| ← russ__ left | 18:47 |
| ← donmichelangelo left | 18:47 |
| ← obiwahn left | 18:47 |
| ← osmosis left | 18:47 |
| ← codezomb left | 18:47 |
| ← whiskers75 left | 18:47 |
| ← maestrojed left | 18:47 |
| ← jooools left | 18:47 |
| ← hays_ left | 18:47 |
| ← SamB left | 18:47 |
| ← Onoz left | 18:47 |
| ← Schrostfutz left | 18:47 |
| → Schrostfutz joined | 18:47 |
| → donmichelangelo joined | 18:47 |
| → whiskers75 joined | 18:47 |
| → Onoz joined | 18:47 |
| → msafi joined | 18:47 |
| → russ__ joined | 18:47 |
| → kodab joined | 18:47 |
| → bitkiller_ joined | 18:48 |
| → VictorCL joined | 18:48 |
| → sq-one joined | 18:48 |
| → osmosis joined | 18:48 |
| → paulweb515 joined | 18:48 |
| → maestrojed joined | 18:48 |
| → jooools joined | 18:48 |
| → obiwahn joined | 18:48 |
| → DrShoggoth joined | 18:48 |
| → SamB joined | 18:48 |
| → a-l-e joined | 18:48 |
| → gdogrady joined | 18:49 |
| ← yhager left | 18:49 |
| ← cjwilburn left | 18:49 |
| → matanya joined | 18:49 |
| ← ColKurtz left | 18:49 |
| → LBV_User joined | 18:49 |
| → FortySix2 joined | 18:50 |
| → ncd|leeN joined | 18:50 |
| → Gamecubic_ joined | 18:50 |
| ← mrhooray left | 18:51 |
| → mr_red- joined | 18:52 |
| ← danman left | 18:52 |
| ← joelm_ left | 18:52 |
| ← mr_red left | 18:52 |
| mr_red- → mr_red | 18:52 |
| → aard__ joined | 18:52 |
| → joelm joined | 18:52 |
| dean → dean|away | 18:52 |
| → valgrind joined | 18:52 |
| → LucasKA joined | 18:52 |
| → ColKurtz joined | 18:53 |
| → tirengarfio joined | 18:54 |
| ← ewnd9 left | 18:54 |
| ← harobed_ left | 18:54 |
| → dxdt joined | 18:54 |
| → Baluse joined | 18:55 |
| → Hydrant joined | 18:56 |
| → ColoradoPods joined | 18:57 |
|
ColoradoPods
| I see the calender. But Steve just tweeted that recording starts in 5 minutes | 18:57 |
| → psyl0n joined | 18:57 |
| ← LucasKA left | 18:57 |
|
Hydrant
| hi all, I'm slowly switching to git from svn.... I have a repo that I need to extensively change, and based on notes from a video I should do "git checkout -b topic-name master" and then I just do whatever I want... my understanding is that I can also examine where I branched from (look at files I deleted in the branch)... is that correct? | 18:58 |
| ← ncd|leeN left | 19:00 |
| → GameGamer43__ joined | 19:00 |
| → zhenjunyao joined | 19:00 |
| → Freeman42 joined | 19:00 |
|
grawity
| Hydrant: you could use `git show master:path/to/file`, or various invocations of `git diff` to compare the versions in master & working tree, or master & current branch | 19:01 |
| → Celelibi_ joined | 19:01 |
| ← GameGamer43_ left | 19:01 |
| ← Edgan left | 19:01 |
| ← ConstantineXVI left | 19:01 |
| ← troyt left | 19:01 |
| ← jgornick left | 19:01 |
| ← Novacha left | 19:01 |
| ← [emmajane] left | 19:01 |
| ← St_Marx left | 19:01 |
| ← Guest41679 left | 19:01 |
| ← dmarr left | 19:01 |
| ← salamanderrake left | 19:01 |
| ← DANtheBEASTman left | 19:01 |
| ← dan64 left | 19:01 |
| ← DrShoggoth left | 19:01 |
| ← Onoz left | 19:01 |
| ← Gamecubic left | 19:01 |
| ← aard_ left | 19:01 |
| ← geomyidae left | 19:01 |
| ← leeN left | 19:01 |
| ← whaley left | 19:01 |
| ← Kamilion left | 19:01 |
| ← c0ded left | 19:01 |
| ← simpleminds left | 19:01 |
| ← tapout left | 19:01 |
| ← solrize left | 19:01 |
| ← atrus left | 19:01 |
| ← Celelibi left | 19:01 |
| ← Kyle- left | 19:01 |
| ← gnarf left | 19:01 |
| ← cwillu_at_work left | 19:01 |
| ← ozymandias left | 19:01 |
| → croaky_ joined | 19:01 |
|
grawity
| (or, if you need to do this very often during the "extensive changes", you could clone the repository a second time, and check out master there) | 19:01 |
|
Hydrant
| grawity: when I do "git checkout topic-name" I can switch around branches, and have changes flow back and forth under? | 19:02 |
| → panpainter joined | 19:02 |
|
Hydrant
| normally with svn I do two checkouts, but I'm trying to learn the git ways | 19:02 |
| → DrShoggoth joined | 19:02 |
|
Hydrant
| I basically need to rewrite a bunch of code but I need to see the old stuff for reference | 19:02 |
|
grawity
| both ways would work | 19:03 |
| ← Timmy left | 19:03 |
|
Hydrant
| when I do git checkout master... does this change the "view" of the files back to what is from the repo? | 19:03 |
| → musicmatze joined | 19:03 |
| → ncthom91 joined | 19:03 |
| ← croaky left | 19:03 |
|
grawity
| well, yes | 19:03 |
| ← FortySix2 left | 19:04 |
| → Timmy joined | 19:04 |
|
grawity
| I think `git checkout foo` is similar to `svn switch ^/branches/foo` | 19:04 |
|
moritz
| it changes the working copy to branch master. | 19:04 |
| ← musicmatze left | 19:04 |
|
canton7
| !float | 19:04 |
|
gitinfo
| If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution. | 19:04 |
| → FortySix2 joined | 19:04 |
| → mar77i_ joined | 19:04 |
| ← mklappstuhl left | 19:04 |
|
Hydrant
| so it seems like I should just have two checkouts for this type of thing | 19:05 |
| ← b3tamax left | 19:05 |
| → eaj joined | 19:05 |
| → ConstantineXVI joined | 19:05 |
|
PerlJam
| Hydrant: s/checkout/clone/ I think you mean. If so, that's an option | 19:05 |
|
grawity
| if you need to compare the files often, then maybe yes | 19:05 |
| ← jason237 left | 19:05 |
|
Hydrant
| okay thanks for the help, trying to get used to git ;-) | 19:06 |
| → jason237 joined | 19:06 |
| ← mizu_no_oto left | 19:06 |
| → cwillu_at_work joined | 19:06 |
| → salamanderrake joined | 19:06 |
| → Kyle joined | 19:06 |
| → leeN joined | 19:06 |
| → emmajane joined | 19:06 |
| → Guest41679 joined | 19:06 |
| → gnarf joined | 19:06 |
| → atrus joined | 19:06 |
| → St_Marx joined | 19:06 |
| → Onoz joined | 19:06 |
| → c0ded joined | 19:06 |
| → ozymandias joined | 19:06 |
| → whaley joined | 19:06 |
| → simpleminds joined | 19:06 |
| → solrize joined | 19:06 |
| → DANtheBEASTman joined | 19:06 |
| → dan64 joined | 19:06 |
| → halu joined | 19:06 |
| → jgornick joined | 19:06 |
| → dmarr joined | 19:06 |
| → Novacha joined | 19:06 |
| → Edgan joined | 19:06 |
| → sahil__ joined | 19:06 |
| ← valgrind left | 19:06 |
| → croaky joined | 19:06 |
| ← c0ded left | 19:06 |
| ← DANtheBEASTman left | 19:06 |
| ← Onoz left | 19:06 |
| ← halu left | 19:06 |
| ← Kyle left | 19:06 |
| → DANtheBEASTman joined | 19:06 |
| → Onoz joined | 19:06 |
| → Kyle joined | 19:06 |
| ← mar77i left | 19:07 |
| ← Novacha left | 19:07 |
| → Novacha joined | 19:07 |
| ← ozymandias left | 19:07 |
| → ozymandias joined | 19:07 |
| → c0ded joined | 19:07 |
| → b3tamax joined | 19:07 |
| elastic_dog → elasticdog | 19:07 |
| ← przemoc left | 19:07 |
| ← c0ded left | 19:07 |
| → c0ded joined | 19:07 |
| ← vtunka left | 19:07 |
| → przemoc joined | 19:07 |
| dan64 → Guest95439 | 19:07 |
| gnarf → Guest12060 | 19:07 |
| Kyle → Guest16277 | 19:07 |
| ← przemoc left | 19:07 |
| → przemoc joined | 19:07 |
| → tapout joined | 19:07 |
| ← VictorCL left | 19:07 |
| → Kamilion joined | 19:07 |
| → troyt joined | 19:07 |
| ← croaky_ left | 19:07 |
| → halu joined | 19:07 |
|
imachuchu
| Hydrant: I always use difftool (which allows you to diff your current file with a version in a different commit) or you could look into git-fs which is a fuse interface for your git repo | 19:08 |
| → geomyidae joined | 19:08 |
| → valgrind joined | 19:08 |
| → mfulz joined | 19:09 |
| → xlinkz0 joined | 19:10 |
| ← darnir left | 19:10 |
|
Hydrant
| imachuchu: thx | 19:11 |
|
grawity
| git-fs is probably a little too much... unless you're used to having branches and tags as directories, I guess :D | 19:11 |
|
luto
| grawity: noooooo >.< | 19:12 |
| ← jason237 left | 19:12 |
|
luto
| grawity: please never ever use git and that fact in the same sentence lol | 19:12 |
|
catsup
| is there a convenient way to check whether git-checkout would treat an argument as a file or as a branch? | 19:12 |
| ← Guest16277 left | 19:13 |
| → Guest16277 joined | 19:13 |
| Guest16277 → Kyle | 19:13 |
|
luto
| parse-ref? | 19:13 |
| ← przemoc left | 19:13 |
|
jrnieder
| catsup: just always include the disambiguating '--'? | 19:13 |
| ← Mars___ left | 19:13 |
| ← gdogrady left | 19:14 |
|
catsup
| jrnieder: that won't work for my application | 19:14 |
|
grawity
| what is your application, then? | 19:14 |
|
jrnieder
| then luto is right, modulo spelling :) | 19:14 |
|
| catsup: http://thread.gmane.org/gmane.comp.version-control.git/238853/focus=238958 may also be relevant to your interests | 19:14 |
|
luto
| ref-parse? | 19:14 |
|
catsup
| git-rev-parse ? | 19:14 |
|
jrnieder
| rev-parse | 19:14 |
|
luto
| oh. | 19:14 |
|
zumba_addict
| is there a command which will show the files I have commited? | 19:14 |
|
luto
| sorry :) | 19:15 |
|
| zumba_addict: the files you have commited? | 19:15 |
|
| zumba_addict: git log maybe? | 19:15 |
|
zumba_addict
| yup | 19:15 |
|
| k | 19:15 |
|
catsup
| grawity: wrapping git-checkout with user-supplied arguments | 19:15 |
|
zumba_addict
| not the one i push | 19:15 |
|
jrnieder
| catsup: um :) | 19:16 |
|
luto
| I don't really understand you, sorry.. | 19:16 |
|
jrnieder
| catsup: can you say more about the application? | 19:16 |
|
catsup
| it's just a git wrapper | 19:16 |
| → przemoc joined | 19:16 |
|
jrnieder
| that's a big "just" :) | 19:16 |
|
zumba_addict
| btw, how do I rename my local branch? I have not pushed it yet | 19:17 |
|
ojacobson
| catsup: can you say what it is about your application that makes explicit disambiguation impossible? | 19:17 |
|
jrnieder
| makes me worry that I'm going to break your code some day by introducing a new commandline argument or something | 19:17 |
|
ojacobson
| zumba_addict: man git-branch | 19:17 |
|
gitinfo
| zumba_addict: the git-branch manpage is available at http://jk.gs/git-branch.html | 19:17 |
|
catsup
| ojacobson: the user might not supply -- | 19:17 |
|
ojacobson
| catsup: that's true; why is that a problem? | 19:17 |
|
bamj0rb
| catsup: That is the user's responsibility. | 19:17 |
|
ojacobson
| catsup: remember, we can't see over your shoulder and have _no idea_ what the interface to your wrapper looks like. | 19:17 |
|
jrnieder
| what does the wrapper do? is it something that hooks could take care of, if only there were more hooks? | 19:18 |
|
catsup
| ojacobson: that's ok, you don't have to write it | 19:18 |
| ← TomyWork left | 19:18 |
| ← joaoh82 left | 19:18 |
| → rafaqueque joined | 19:18 |
|
zumba_addict
| there are two, -m and -M | 19:18 |
|
bamj0rb
| Your wrapper should document the same rule. Or else, do its own option parsing and pass that along in a way that Git will understand unambiguously. | 19:18 |
|
jrnieder
| ah, I might not have understood what wrapper means | 19:18 |
| ← doev left | 19:18 |
| → pbrobst joined | 19:18 |
| → shruggar joined | 19:19 |
| → mizu_no_oto joined | 19:19 |
|
jrnieder
| is it a replacement for 'git checkout' where users would expect to be able to pass arbitrary git-checkout arguments to it? | 19:19 |
|
| or something else? | 19:19 |
|
catsup
| jrnieder: yes | 19:19 |
|
| i could actually do a hook for this particular one, but other things i'm wrapping don't have the required hooks | 19:20 |
| → Advocation joined | 19:20 |
|
jrnieder
| git maintainers really really want to make sure the hooks people need exist | 19:20 |
|
| it makes their life down the line easier | 19:20 |
|
catsup
| hm | 19:20 |
| → pr0ton joined | 19:21 |
| qsusOFFcs → qsuscs | 19:22 |
| → robbyoconnor joined | 19:23 |
| ← msafi left | 19:23 |
| → pantsman joined | 19:23 |
| → LucasKA joined | 19:23 |
| ← GameGamer43__ left | 19:24 |
| → D4N3 joined | 19:24 |
| ← PeterBooker left | 19:24 |
| ← w0ng left | 19:25 |
| → GameGamer43 joined | 19:25 |
| → cjwilbur_ joined | 19:25 |
| → pinage404 joined | 19:25 |
| → singingwolfboy joined | 19:26 |
| ← SocalNick left | 19:26 |
| ← tirengarfio left | 19:26 |
|
singingwolfboy
| is there a command I can run to non-interactively squash all commits between two sha1 hashes that I specify? | 19:26 |
| → SocalNick joined | 19:27 |
| → mar77i joined | 19:28 |
| ← mar77i_ left | 19:28 |
| ← LucasKA left | 19:28 |
| → tirengarfio joined | 19:28 |
| ← SocalNick left | 19:28 |
| → SocalNick joined | 19:29 |
| ← panpainter left | 19:29 |
| ← Timmy left | 19:30 |
| ← sahil__ left | 19:31 |
| → Mars___ joined | 19:31 |
| → w0ng joined | 19:32 |
| → longbeach joined | 19:32 |
|
_ikke_
| Do you want to alter history, or want to create a squash-merge? | 19:32 |
|
singingwolfboy
| _ikke_: what exactly is a squash-merge? | 19:33 |
|
_ikke_
| singingwolfboy: Basically, it merges two branches, but doesn't create a merge commit, just a regular commit | 19:34 |
|
singingwolfboy
| _ikke_: ah. No, I want to alter history | 19:35 |
| ← Mars___ left | 19:35 |
| ← kukks left | 19:35 |
| ← w0ng left | 19:35 |
| ← Guest93929 left | 19:35 |
| ← irqq left | 19:36 |
| ← tirengarfio left | 19:36 |
| → w0ng joined | 19:36 |
|
_ikke_
| afaik, there is not non-interactive way to do that. | 19:37 |
|
| s/not/no/ | 19:37 |
| → rpg joined | 19:37 |
| → veebers joined | 19:37 |
| → petey__ joined | 19:38 |
| → mar77i_ joined | 19:38 |
| → geekbri_ joined | 19:38 |
| ← eaj left | 19:39 |
|
bamj0rb
| You can set the editor to something that will automagically edit the file for you. | 19:40 |
|
| Sometime I do EDITOR='sed ...' git ... | 19:40 |
| → kukks joined | 19:40 |
| ← kukks left | 19:40 |
| → kukks joined | 19:40 |
| ← petey__ left | 19:40 |
| → petey__ joined | 19:41 |
|
_ikke_
| right | 19:41 |
| ← petey_ left | 19:41 |
| ← shawndumas left | 19:41 |
| ← mar77i left | 19:41 |
|
bamj0rb
| Perhaps something like: EDITOR='sed -e 2,$s/^pick/squash/' git rebase -i <sha1> | 19:41 |
| ← blahdodo left | 19:42 |
|
bamj0rb
| That's more for fun than profit. | 19:42 |
| ← geekbri left | 19:42 |
| cbreak|evil → cbreak | 19:43 |
| ← Silmarilion left | 19:43 |
| → nilg joined | 19:44 |
|
canton7
| most decent editors allow you to edit multiple lines at once | 19:45 |
| → tirengarfio joined | 19:45 |
|
_ikke_
| :%s/pick/squash/ | 19:46 |
|
| But that's still interactive | 19:46 |
|
moritz
| and you can'T squash the very first line | 19:47 |
| ← dev__ left | 19:47 |
| ← Advocation left | 19:47 |
|
moritz
| I wonder if making an appropraite branch and merging it with --squash is easier to automate | 19:47 |
|
canton7
| if you know in advance which commits will be squashed, commit --squash and and rebase --autosquash, or whatever the flag is | 19:47 |
| ← angelsl left | 19:48 |
| → joaoh82 joined | 19:49 |
| → panpainter joined | 19:52 |
| ← panpainter left | 19:53 |
| → BSaboia joined | 19:53 |
| ← joaoh82 left | 19:53 |
| → LucasKA joined | 19:53 |
| → panpainter joined | 19:53 |
| → mar77i joined | 19:53 |
| ← panpainter left | 19:54 |
| → dmsuperm1n joined | 19:54 |
|
dmsuperm1n
| If I have a branch (dev) that somebody else has branched locally, and I rename dev (locally and on github) will there be problems for them when they go to pull? | 19:55 |
| ← mar77i_ left | 19:55 |
| dmsuperm1n → dmsuperman | 19:56 |
| ← dmsuperman left | 19:56 |
| → dmsuperman joined | 19:56 |
| ← kodab left | 19:56 |
| Guest31032 → mf_ | 19:57 |
| → konadr joined | 19:58 |
|
canton7
| dmsuperman, if they haven't pushed it anywhere, typically tracking into won't be set up, so 'git pull' (with no other arguments) wouldn't work anyway | 19:59 |
|
| if they checkout dev and 'git pull', that'll fail though ;) | 19:59 |
| → bwreilly joined | 19:59 |
|
dmsuperman
| Right, presumably they wouldn't notice a difference until they go to merge in which case they'll just have to merge to/from the new branch | 19:59 |
|
| ok cool | 19:59 |
| ← matteo left | 20:00 |
|
canton7
| also, note that remote-tracking branches for branches which have since been deleted remotely aren't pruned until you 'git fetch --prune' | 20:00 |
|
dmsuperman
| the other thing is will a git pull for a branch deleted on remote (where the default behavior is pull all) -- ah yep | 20:00 |
| → mvelioglu_ joined | 20:00 |
|
canton7
| (so origin/dev will hang around for ages in their repo) | 20:00 |
| → shawndumas joined | 20:00 |
| → FortySix_ joined | 20:00 |
| ← hs366 left | 20:01 |
| ← mvelioglu left | 20:01 |
| → angelsl joined | 20:02 |
| ← FortySix2 left | 20:02 |
|
dmsuperman
| thanks much canton7 for clearing that up | 20:02 |
| ← DrShoggoth left | 20:02 |
| ← pbrobst left | 20:02 |
| → Targen joined | 20:03 |
| → FortySix2 joined | 20:03 |
| ← konadr left | 20:03 |
|
canton7
| no problem | 20:03 |
| ← dxdt left | 20:03 |
|
canton7
| not sure what you mean by 'where the default behaviour is pull all', though... | 20:04 |
| ← singingwolfboy left | 20:04 |
| ← FortySix2 left | 20:04 |
| → DrShoggoth joined | 20:04 |
| ← veebers left | 20:06 |
| ← FortySix_ left | 20:06 |
| ← petey__ left | 20:07 |
| ← thierryp left | 20:07 |
| → sohail joined | 20:07 |
| → dglambert joined | 20:07 |
| → petey_ joined | 20:07 |
|
sohail
| hey guys, anyone know if there is a way to merge certain directories only? | 20:08 |
| → Houte joined | 20:08 |
|
Nugget
| make a diff of just the files/directories you want to merge and then apply that with patch | 20:08 |
|
sohail
| Nugget, when I merge fully later on, will that give conflicts? | 20:09 |
| ← joki left | 20:09 |
|
Houte
| How do I remove a file from the coming commits. I physically removed gameHandler.java. Now it will still be in the repo unless I remove it somehow from git. how do I do that? | 20:09 |
|
Nugget
| no, because the files will be the same | 20:09 |
|
sohail
| right | 20:09 |
| → rjc joined | 20:09 |
|
Nugget
| the downside is that you'll lose any interesting commit logs and development history, since it'll just be one big commit | 20:09 |
|
sohail
| thanks Nugget | 20:09 |
| → m0ltar joined | 20:10 |
| → petey__ joined | 20:11 |
| ← angelsl left | 20:11 |
| → Advocation joined | 20:11 |
| ← petey_ left | 20:11 |
| → el3ctron_ joined | 20:12 |
| → syl joined | 20:13 |
| ← hwrdprkns left | 20:13 |
| ← tirengarfio left | 20:13 |
|
syl
| !list | 20:13 |
|
gitinfo
| [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist | 20:13 |
| ← syl left | 20:13 |
| ← thevishy left | 20:14 |
| → joki joined | 20:14 |
| ← cmpera left | 20:15 |
| → thierryp joined | 20:16 |
| ← m0ltar left | 20:18 |
| ← ColoradoPods left | 20:18 |
| → koda joined | 20:19 |
| ← nilg left | 20:19 |
| → eaj joined | 20:20 |
| → tirengarfio joined | 20:21 |
| → m0ltar joined | 20:21 |
| → veebers joined | 20:22 |
| → thevishy joined | 20:23 |
| ← LuxuryMode left | 20:23 |
| ← thierryp left | 20:23 |
| → msafi joined | 20:23 |
| ← kukks left | 20:25 |
| ← m0ltar left | 20:25 |
|
codehotter
| how do I check whether I'm ahead of master or not in a bash script? | 20:26 |
| → dxdt joined | 20:26 |
|
codehotter
| I mean of origin/master | 20:26 |
| → mklappstuhl joined | 20:27 |
|
Houte
| How do I remove a file from the coming commits. I physically removed gameHandler.java. Now it will still be in the repo unless I remove it somehow from git. how do I do that? | 20:27 |
|
cjh`
| codehotter: maybe `git log HEAD..origin/master`, probably a nicer way though. | 20:27 |
|
unsignedint
| git rm ? | 20:27 |
|
ojacobson
| codehotter: you probably mean "ahead of upstream" | 20:27 |
|
| in which case 'git rev-list --count @{upstream}..HEAD' or similar, depending on use case | 20:28 |
|
| reversing the range gets you the 'behind' count | 20:28 |
|
| (note that both counts can be non-zero at the same time) | 20:28 |
|
cjh`
| heh awesome | 20:28 |
| → diegoviola joined | 20:29 |
|
codehotter
| ojacobson: what is @{upstream}? | 20:30 |
|
ojacobson
| codehotter: man gitrevisions | 20:30 |
|
gitinfo
| codehotter: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html | 20:30 |
| ← eaj left | 20:31 |
|
davividal
| hi. On SVN I can checkout my entire repository with branches. If I want to work on branch foo, I can cd into it and work in parallel with branch bar. Is there a way to do something similar on git? I mean: one clone and work on different directories, without git checkout foo|bar ? | 20:31 |
|
ojacobson
| "mostly" No, git only maintains one work tree. | 20:32 |
|
PerlJam
| davividal: you can always have multiple clones | 20:32 |
|
ojacobson
| It's possible (albiet awkward) to set up secondary work trees; there's a contrib script that does this | 20:32 |
|
| but a second clone is less work and easier to reason about | 20:32 |
| → danicampa901 joined | 20:32 |
|
cjh`
| there is git-new-workdir, haven't used it myself though. | 20:32 |
|
davividal
| "ideally" would be 'one clone to rule them all', but it won't be a real issue to clone N times. | 20:33 |
| ← gfontenot left | 20:33 |
|
codehotter
| refers to the branch that the branch specified by branchname is set to build on top of <-- what does this mean? Is there another man page I can read that would give me an understanding of what "set to build on top of" means? | 20:33 |
| → hobodave joined | 20:34 |
|
ojacobson
| codehotter: it's the branch listed in 'git branch -vv' as the upstream branch, in [square brackets] | 20:34 |
| → carbon joined | 20:34 |
| → Mars joined | 20:34 |
| → gfontenot joined | 20:35 |
|
ojacobson
| man git-branch, man git-pull both cover what "upstream" means and how it's specified | 20:35 |
|
gitinfo
| the git-branch manpage is available at http://jk.gs/git-branch.html | 20:35 |
|
| the git-pull manpage is available at http://jk.gs/git-pull.html | 20:35 |
|
ojacobson
| tl,dr branches aren't necessarily based on origin/master | 20:35 |
| Mars → Guest80823 | 20:35 |
| → jason237 joined | 20:35 |
| ← hobodave_ left | 20:35 |
| → hwrdprkns joined | 20:35 |
| ← carbon left | 20:36 |
|
codehotter
| ojacobson: I'm trying to detect from the batch script, whether the developer has made any changes since he last ran "git push" | 20:36 |
|
ojacobson
| oof | 20:36 |
|
| there are some unfounded assumptions there, too :) | 20:36 |
|
codehotter
| uh oh | 20:36 |
|
ojacobson
| by default (there's a config setting for this) unqualified 'git push' pushes more than just the current branch | 20:36 |
| → dort joined | 20:36 |
| ← jackneill left | 20:36 |
|
codehotter
| well yes, I mean in the current branch | 20:36 |
| ← ni__ left | 20:36 |
|
codehotter
| I mean if the current branch has changed since it was last pushed | 20:36 |
|
ojacobson
| and the current branch might not be a local copy of the upstream branch -- consider eg. feature branches, which should always have an upstream but should always be ahead of upstream if any work has been done | 20:36 |
| → Luke-Jr joined | 20:37 |
|
ojacobson
| the upstream of a feature branch should be the branch the feature will land on, not the server's copy of the feature branch, generally | 20:37 |
| → pbrobst joined | 20:37 |
|
ojacobson
| (it's really a matter of workflow and policy, not technology, but still) | 20:37 |
|
codehotter
| so lets say a developer has a feature branch, which he pushes to his own repo, and where upstream can then pull from | 20:37 |
| → niels__ joined | 20:37 |
| → dfanjul_ joined | 20:37 |
|
ojacobson
| yes | 20:37 |
|
| the feature branch's @{upstream} is probably origin/master or similar | 20:37 |
|
codehotter
| I dont care whether upstream has changed, but I want to know if the developer has made any local changes since he last pushed to his own repo | 20:37 |
|
davividal
| git internals: what happens when I git checkout branch-foo from master? It deletes my files from master and 'copies' from branch-foo? | 20:37 |
| ← vince_prignano left | 20:37 |
|
ojacobson
| _right now_ you can't easily know both | 20:37 |
| ← dfanjul left | 20:38 |
|
ojacobson
| I've heard rumblings that publish information might be added to git-config one day so that you *can* tell whether a local branch is behind its published copy, separate from its upstream | 20:38 |
|
niels__
| say a have a develop branch based on master, develop is 100+ commits ahead of master, i don't want anything to do with master, i basically want to have a new master based on develop. how do i do that? | 20:38 |
|
ojacobson
| but nothing concrete | 20:38 |
| → Landshark753 joined | 20:38 |
| → RaceCondition joined | 20:38 |
|
codehotter
| ojacobson: so, in short, you can't easily tell whether git push has been run or not? | 20:39 |
|
PerlJam
| davividal: it makes sure that your working dir contains everything from branch-foo (it may also contain other things however) | 20:39 |
|
ojacobson
| codehotter: not without additional workflow-specific information, no | 20:39 |
|
PerlJam
| davividal: so ... kinda what you said except for the "deletes my files' part | 20:39 |
| ← frogonwheels left | 20:40 |
|
ojacobson
| for example, I push branches to a remote named 'owen' but the upstream of most of my branches is 'origin/master' | 20:40 |
|
codehotter
| ojacobson: that's the workflow we have too | 20:40 |
|
| I want to know if 'owen' is up to date, or if local is ahead of 'owen' | 20:40 |
| ← cjsarette left | 20:40 |
|
ojacobson
| you can tell if a local branch is behind its published copy, but only if you know the name of the remote to look at and know that I use the same names locally and on my remote | 20:40 |
|
| git doesn't know anything about that and doesn't enforce any of it :) | 20:40 |
| ← pbrobst left | 20:40 |
|
codehotter
| well I can programmatically detect where git push would push to, if you ran it | 20:40 |
|
davividal
| PerlJam: yeah, but on branch-foo I deleted some lines from README.txt (compared to master). What would happen? What should I read (apart from source code)? | 20:40 |
|
ojacobson
| can you? | 20:40 |
| → HeN_ joined | 20:41 |
|
codehotter
| well if you ran it without arugments at least | 20:41 |
|
ojacobson
| Because in my case it's usually 'nowhere' because of how I have push.default set. | 20:41 |
|
| My local branch name is almost never equal to its upstream branch's name, so push bails out because push.default is set to simple. | 20:41 |
| → pheaver joined | 20:41 |
| ← ColKurtz left | 20:41 |
| → Kayra joined | 20:41 |
|
codehotter
| OK, well I know our developers have git push automatically push to their own repos for all their branches. Does this information help? | 20:41 |
|
ojacobson
| The _default_ configuration is that it will name-match all local branches to branches on the upstream remote of the current branch, and push _all_ of those. | 20:41 |
|
| (Yes, this default is mildly crazy.) | 20:42 |
| HeN_ → HeN | 20:42 |
| → FortySix2 joined | 20:43 |
|
codehotter
| in other words they'd have (I think) origin set to their own repo and an additional remote upstream set to upstream | 20:43 |
| → cjsarette joined | 20:43 |
|
ojacobson
| anyways, if you're willing to make some workflow-specific assumptions in your script, yes, you can check the thing you want to check | 20:43 |
| ← sohail left | 20:43 |
|
ojacobson
| but expecting us to know all of the edge cases in your workflow is, uh, unrealistic :) git's too flexible for that. | 20:43 |
| ← cillybabe left | 20:43 |
|
codehotter
| ojacobson: I realize that now. Thank you for explaining. You've given me a lot of ideas about different possible workflows too | 20:43 |
|
ojacobson
| You'd be better helped by a stronger understanding of git's underlying theory, so that you can determine how the states you care about will be represented in git | 20:43 |
| ← Guest80823 left | 20:44 |
| → nZac joined | 20:44 |
|
codehotter
| Does a workflow make sense where 'git push' automatically pushes to your own private repo, but 'git status' shows whether you are ahead/behind of upstream? Is that where you set origin to your own repo and configure your branches as tracking upstream? | 20:45 |
| → pbrobst joined | 20:45 |
| ← zhenjunyao left | 20:45 |
| → rpg_ joined | 20:45 |
| ← rpg left | 20:46 |
| ← pheaver left | 20:47 |
|
ojacobson
| I've got 'git publish' set up as an alias for exactly that | 20:47 |
|
| https://github.com/ojacobson/git-aliases/ | 20:47 |
| ← croaky left | 20:48 |
| ← shawndumas left | 20:49 |
|
adam_
| I have a situation at work. Specifically regarding submodules. | 20:49 |
|
| I'm an advocate of using them because they allow you to have source control of the library you are using | 20:49 |
| → shawndumas joined | 20:49 |
|
adam_
| we're a .net shop for the most part but moving into other areas like node.js and golang | 20:49 |
| → joaoh82 joined | 20:50 |
| → panpainter joined | 20:50 |
| → cilly joined | 20:50 |
| ← koda left | 20:50 |
|
ojacobson
| The right way to do dependency management in node.js is probably npm, not submodules | 20:51 |
|
| even for "in house" dependencies | 20:51 |
|
| I assume golang has something simil;ar | 20:51 |
|
adam_
| some have the idea that replacing the use of submodules for reusing our own libraries with a package manager is a good idea | 20:51 |
| ← DrShoggoth left | 20:51 |
|
adam_
| that's fine for interpreted languages | 20:51 |
| ← bartzy left | 20:51 |
|
adam_
| C# is compiled and as such, if you use a package manager, you can't step into the code | 20:51 |
|
ojacobson
| package/dependency managers know about things like transitive dependencies; git does not | 20:51 |
| → abbycabs joined | 20:51 |
| ← abbycabs left | 20:52 |
|
adam_
| my stance is that it introduces friction as you have to go and explicitly get the library source and set it up to debug | 20:52 |
| → abbycabs joined | 20:52 |
|
adam_
| please explain how transitive dependencies are not taken care of by submodules | 20:52 |
| ← Turicas left | 20:52 |
| → konadr joined | 20:53 |
|
ojacobson
| If you include a third-party library using a submodule, you have to convince them to follow your submodule convention for their own dependencies, or manage their dependencies yourself | 20:53 |
| ← jason237 left | 20:53 |
|
adam_
| further, we'll have to have a separate package manager per technology: nuget for C#, npm for node, and something else for golang - I think it has it's own | 20:53 |
|
ojacobson
| (most libraries for most languages do _not_ use submodules, so this is an uphill battle) | 20:54 |
|
| Yes, that's fairly normal now, sadly | 20:54 |
|
| I'd rather that the various lang folks had spent their effort making distro/native packaging work better for their cases, but we have what we have | 20:54 |
| ← joaoh82 left | 20:54 |
| dglambert → DGLAMBERT | 20:54 |
|
ojacobson
| pip, npm, maven, cabal, gems, &c &c &c | 20:54 |
| DGLAMBERT → dglambert | 20:54 |
|
adam_
| submodules have been working well for us since 2010 | 20:54 |
| → croaky joined | 20:54 |
| → konadr1 joined | 20:55 |
|
adam_
| so I'm not about to introduce something that will not allow the developers to step into code of the library they are using (in-house lib) | 20:55 |
| ← konadr left | 20:55 |
| → Nizumzen joined | 20:55 |
|
ojacobson
| That seems like such an obvious flaw that I find it hard to believe that you're right (except possibly by default) | 20:56 |
| → m8 joined | 20:56 |
|
adam_
| ? | 20:56 |
|
ojacobson
| Stepping into compiled code from packages is a solved problem for most compiled languages, even C | 20:56 |
|
adam_
| it requires us to have 2 builds now.. one with symbols and one without. | 20:56 |
|
ojacobson
| Does nuget perhaps keep sources/debug symbols separate from the compiled binaries? Maven does this (-sources.jar) | 20:56 |
|
adam_
| stuff that gets pushed to production has to have a different compilation | 20:57 |
|
codehotter
| next question: can I check if there are changes that have not been commited yet? | 20:57 |
|
adam_
| this has not been without sideeffects in .net | 20:57 |
|
ojacobson
| Why? Is there a problem with having debug symbols in production? :) | 20:57 |
|
adam_
| yes. PCI complian shop | 20:57 |
|
ojacobson
| PCI does not make any statements about debug symbols. | 20:57 |
|
codehotter
| PCI mandates that you do not have debug symbols in production? Or pci mandates compile options that you do not want to use in test? | 20:57 |
|
ojacobson
| (If it did, it would also be nearly impossible to use interpreted languages in PCI-compliant contexts, since source is strictly more informative than debug symbols.) | 20:58 |
| → harobed joined | 20:58 |
|
ojacobson
| codehotter: of course you can. | 20:58 |
|
adam_
| I think PCI implies make it as hard as possible for a hacker that got in if it's a card holder env | 20:58 |
|
codehotter
| ojacobson: how? | 20:58 |
|
ojacobson
| adam_: anyways, as you can tell, I think that using submodules to manage dependencies is not worth the theoretical simplicity | 20:58 |
| ← petey__ left | 20:58 |
|
guardian
| why are there git commands implemented as shell scripts that don't use git-rev-parse? because they existed before git-rev-parse and its parseopt mode? | 20:58 |
|
codehotter
| ojacobson: I mean from a bash script. Obviously a user can get with git status | 20:58 |
| ← daivyk left | 20:59 |
|
ojacobson
| codehotter: so why can't your script? Hint: man git-status | 20:59 |
|
gitinfo
| codehotter: the git-status manpage is available at http://jk.gs/git-status.html | 20:59 |
| → pheaver joined | 20:59 |
|
adam_
| the other problem with not using submodules is that we now have to host nuget for just dependency management | 20:59 |
|
| or open up to microsoft | 20:59 |
| ← konadr1 left | 20:59 |
|
ojacobson
| From my own PCI experiences, I would have thought you'd have to do that either way, in the process of satisfying requirements around reproducibility and handoff. | 21:00 |
| ← quetz left | 21:00 |
| → alpha123 joined | 21:01 |
| ← a-l-e left | 21:01 |
|
adam_
| anyway, I still don't get your transitive argument. I'm strictly talking about using in-house libraries which we want to change quite frequently. | 21:01 |
| ← Hydrant left | 21:01 |
|
adam_
| going through a package management publishing workflow only adds friction | 21:02 |
| ← msafi left | 21:02 |
| ← beyondcreed left | 21:02 |
| → simesy joined | 21:02 |
|
adam_
| so why would you not use submodules? | 21:02 |
|
codehotter
| ojacobson: I can use LOCALCHANGES=$(git status -s) and then test if this is empty or not. Thanks. | 21:02 |
| → ColKurtz joined | 21:02 |
| ← ColKurtz left | 21:02 |
| → petey__ joined | 21:02 |
|
codehotter
| I do try to read the manpages before I ask the question, but when I get pointed at the same manpage again, I always see things I didn't the first time | 21:02 |
|
ojacobson
| adam_: One, transitive dependencies; I don't feel like working around each developer's personal preferences on how to express their own deps as submodules (or to not do so) | 21:02 |
|
| Two, I don't feel like rebuilding/repackaging everyone else's code | 21:03 |
| → ColKurtz joined | 21:03 |
| ← ColKurtz left | 21:03 |
|
ojacobson
| especially in the presence of special-snowflake build processes (which are pretty widespread even in Python) | 21:03 |
| ← Advocation left | 21:03 |
|
adam_
| those are 0 friction | 21:03 |
|
ojacobson
| Lucky you. | 21:03 |
| ← Mangellan2497 left | 21:03 |
|
ojacobson
| May that remain true for you. | 21:03 |
|
adam_
| since 2010 it has | 21:03 |
| → ColKurtz joined | 21:03 |
|
ojacobson
| It's never been true for me or anyone else I know; anecdote is not data, but that's an experience I'll bank on :) | 21:04 |
| ← ncthom91 left | 21:04 |
|
ojacobson
| 2010 isn't very long. | 21:04 |
|
adam_
| it will be 4 years strong this summer | 21:04 |
|
ojacobson
| Three, the submodule interface is awful | 21:04 |
|
adam_
| we have 80 repos | 21:04 |
| ← cilly left | 21:04 |
| ← LBV_User left | 21:04 |
|
adam_
| so part of why I'm asking is that I do not want to break what isn't broken | 21:04 |
| → Advocation joined | 21:05 |
|
ojacobson
| Rather than defending the existing system, why not make the people proposing package management justify the change? | 21:05 |
|
| You're more likely to be convinced, that way. | 21:05 |
|
adam_
| I agree that the submodule interface is pretty bad | 21:05 |
| ← panpainter left | 21:05 |
|
ojacobson
| (Or not, as the case may be.) | 21:05 |
| → tpollard joined | 21:05 |
| → panpainter joined | 21:05 |
|
ojacobson
| If you're moving into node, point one will bite you pretty hard though | 21:05 |
|
| Node packages *pervasively* require other node packages | 21:06 |
| → cilly joined | 21:06 |
| → mar77i_ joined | 21:06 |
|
adam_
| that's fine for 3rd party | 21:06 |
|
ojacobson
| 'npm install karma' installs ... /counts/ | 21:06 |
|
adam_
| I don't things its fine for inhouse | 21:06 |
|
| it's not a big shop | 21:06 |
|
cbreak
| why do people hate submodules so much? | 21:06 |
| ← mar77i left | 21:07 |
|
adam_
| about 25 devs colocated so if there's an issue, it gets resolved very quickly | 21:07 |
|
cbreak
| they are excellent for what they are intended | 21:07 |
|
adam_
| usually it's lack of knowledge | 21:07 |
|
| and lack of using the command line in the first place | 21:07 |
| → ls___ joined | 21:07 |
|
cbreak
| I'd guess it's the cause of most of the problems in this channel: Tool Abuse | 21:07 |
|
adam_
| ... especially in .net circles | 21:07 |
| mar77i_ → mar77i | 21:07 |
|
adam_
| yes, we have 1 abuse of submodules | 21:07 |
|
cbreak
| like abusing submodules to split a repository you actually develop on. | 21:08 |
|
| or that guy yesterday who wanted a recursive submodule... | 21:08 |
|
adam_
| we use common code that should be running as a service, as a library | 21:08 |
|
milki
| its submodules all the way down? | 21:08 |
|
adam_
| we have 3 levels at some point | 21:08 |
|
| this is where they are abused | 21:08 |
|
| normally it's only 2 levels | 21:09 |
| → koda joined | 21:09 |
|
adam_
| this is fine as we usually do work on both levels, so submodules do add the sanity check just to see where you are before you commit to using a particular version of the shared code | 21:10 |
| ← simesy left | 21:10 |
|
adam_
| adding a package manager like nuget makes it hard to work on both at the same time | 21:10 |
| → mdhopkin_ joined | 21:10 |
| ← Nizumzen left | 21:10 |
| ← cilly left | 21:11 |
|
milki
| package managers should not be used during development o.O | 21:11 |
|
adam_
| ? | 21:11 |
| → cilly joined | 21:11 |
|
adam_
| well, this is what they are advocating | 21:11 |
|
milki
| thats...interesting | 21:11 |
|
adam_
| for in-house, currently worked on libraries | 21:11 |
|
milki
| how do they intend to put package managers into the developer workflow? | 21:12 |
|
ls___
| Perhaps somebody knows how to merge, a single file from sha1 sum? | 21:12 |
|
cbreak
| ls___: nope. | 21:12 |
|
| ls___: you can get the file though and merge it yourself | 21:12 |
| ← infynyxx left | 21:12 |
|
cbreak
| ls___: or you can use git checkout -p commithash -- file | 21:13 |
|
ojacobson
| ls___: git is built around the premise that you merge whole lines of history, not single files or single changes | 21:13 |
|
cbreak
| make sure that you have no uncommitted changes in the working dir | 21:13 |
|
| also, this will not be a merge | 21:13 |
|
| it'll just give you the changes | 21:13 |
|
ojacobson
| but given a line of history that includes changes to a file, git can help you build a second line of changes that _only_ includes changes to that file | 21:13 |
| ← da5id left | 21:14 |
|
cbreak
| that's kind of cheating though. | 21:14 |
| ← Guest12060 left | 21:14 |
| → Guest12060 joined | 21:14 |
| Guest12060 → gnarf | 21:14 |
| ← axl_ left | 21:14 |
|
milki
| cheating is fun | 21:14 |
|
Nevik
| milki: simple: "Guys, this is Sam. Sam will be your package manager. Whenever you build, you tell Sam. He'll be here and take care of you." | 21:14 |
|
ls___
| `Right, I'm trying to understand a simple workflow | 21:14 |
|
| The git scm book has been helpfull at the same time. | 21:14 |
|
milki
| sam: f this. *flips tables* _all_ the tables | 21:15 |
|
Nevik
| lulz | 21:15 |
|
| that escalated quickly | 21:15 |
|
cbreak
| yeah, who needs package managers? | 21:15 |
|
| I just use cmake to find the deps, and list the dependencies in the readme file. | 21:15 |
|
milki
| how does cmake do that? | 21:15 |
|
cbreak
| find scripts. | 21:15 |
|
Nevik
| cmagic! | 21:15 |
|
cbreak
| it has a pkgconfig backend too | 21:16 |
| ← pantsman left | 21:16 |
|
milki
| shiny | 21:16 |
|
cbreak
| on windows it doesn't work too well | 21:16 |
|
| you have to set env vars usually | 21:16 |
|
| but that's because that platform doesn't even have a standard lib location... | 21:16 |
|
| on OS X it finds libraries in /usr/lib, /usr/local/lib and so on quite automatically | 21:17 |
|
adam_
| So the thing that is bothering me about introducing a package manager and dropping submodules as the way to manage the dependency is that extra friction when you want to work on both pieces of code at the same time | 21:17 |
|
ls___
| ... automagically | 21:17 |
| ← jooools left | 21:17 |
|
adam_
| even if you're not, it's faster to find a bug and send the potential fix/do the fix and pass off to the team that owns that library | 21:17 |
| ← mizu_no_oto left | 21:18 |
|
milki
| adam_: i dont expect package managers to be used during the development process, only testing/staging/deployment | 21:18 |
|
adam_
| I see a lot of steps being added to do the same thing with a package manager playing a safety net in the middle, effectively turning the library that your dev team wrote into a black box | 21:18 |
|
| milki: even then, why bother? | 21:19 |
| ← hoschi left | 21:19 |
|
milki
| because its an existing infrastructure that works for the target OS | 21:20 |
|
adam_
| just compile it with the top level code | 21:20 |
|
milki
| if you build one yourself, then it doesnt matter as long as you automate the process | 21:20 |
| ← cwillu_at_work left | 21:20 |
| → pantsman joined | 21:20 |
| ← pantsman left | 21:20 |
| → pantsman joined | 21:20 |
|
adam_
| yes, the build server does that | 21:20 |
| → cwillu_at_work joined | 21:20 |
|
milki
| do you use the build server in testing/staging/deployment now? | 21:20 |
|
adam_
| so when you ship the top level code, you ship the libs it depended upon | 21:20 |
|
| we use teamcity to build the artefacts | 21:21 |
|
milki
| do you use the build server in testing/staging/deployment now? | 21:21 |
|
adam_
| the artefacts get a final runthrough our test suite and then those same artefacts get deployed if the tests pass | 21:21 |
|
ojacobson
| Hmm, what does '120000' mean in the flags column of git ls-tree? | 21:22 |
|
adam_
| the build server is in the dev environment | 21:22 |
|
milki
| then, it doesnt seem like theres a general need to change your system | 21:22 |
|
adam_
| the artefacts get shipped to production and/or staging | 21:22 |
|
milki
| you should have them argue their viewpoints | 21:22 |
|
adam_
| that's what I thought | 21:22 |
| ← calcifea left | 21:22 |
|
adam_
| they are.. it's about control | 21:22 |
| ← b3tamax left | 21:22 |
|
adam_
| they don't want some other dev messing with their library | 21:23 |
|
milki
| then they have other problems to deal with | 21:23 |
|
adam_
| they can reject others' chanes | 21:23 |
|
| exactly | 21:23 |
|
| those are way worse problems | 21:23 |
|
ojacobson
| The ability to reject changes is fundamental to having working code review | 21:23 |
|
milki
| control is usually a bad thing | 21:23 |
|
ojacobson
| it's also fundamental to broken social ecosystems | 21:23 |
|
| take your pick :) | 21:23 |
|
grawity
| ojacobson: '12' is a symlink – see stat(2) | 21:23 |
|
milki
| hahahaha | 21:23 |
|
ojacobson
| grawity: aha, thanks | 21:23 |
|
adam_
| and putting a package manager in front to make it difficult for someone to change code is such a nasty bandaid | 21:23 |
|
milki
| ya, thats not a good reason -.- | 21:24 |
|
adam_
| It's one guy's reason and he's senior | 21:24 |
|
milki
| but he's senior...in .net | 21:24 |
|
adam_
| the problem is that juniors are jumping on board because that's what all the cool kids in .net shops use | 21:24 |
|
| well, yes and no | 21:25 |
| ← IrishPrime left | 21:25 |
|
adam_
| he's senior in a lot of stuff and is generally good for such things as Domain Driven Design (see Eric Evans), CQRS and Event Sourcing | 21:25 |
|
| however, he's very quick to throw in arbitrary stuff without regard to side effects to get stuff done | 21:26 |
| → phipes joined | 21:26 |
| → juliohm joined | 21:26 |
| → jason237 joined | 21:26 |
| → khmarbaise joined | 21:27 |
|
adam_
| so I'm trying to do a LOT of educating in a short amount of time | 21:27 |
| → bartzy joined | 21:27 |
| ← salamanderrake left | 21:28 |
| → eaj joined | 21:28 |
|
adam_
| so here are some submodule issues I'd like to resolve: | 21:29 |
| → mvensky joined | 21:29 |
|
adam_
| 1. giant 3rd party dll storage repo. Slows down the build server. | 21:29 |
|
ls___
| Is this the correct command to get the log of a particular branch 'git log <branchname>? | 21:30 |
|
milki
| ls___: !tias | 21:30 |
|
gitinfo
| ls___: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS. | 21:30 |
|
adam_
| ls___: yes | 21:30 |
| ← harobed left | 21:30 |
| → ncthom91 joined | 21:30 |
| → irqq joined | 21:30 |
| ← alpha123 left | 21:31 |
|
milki
| build server should be smarter in grabbing the correct dlls | 21:32 |
|
| storing them in a git repo sounds like a bad idea (tm) | 21:32 |
| ← Advocation left | 21:33 |
| ← sq-one left | 21:33 |
| → salamanderrake joined | 21:34 |
| → thierryp joined | 21:34 |
| → dinoangelov joined | 21:34 |
| → marcjs joined | 21:34 |
| ← ls___ left | 21:35 |
|
marcjs
| is it possible to squash foreign commits? | 21:35 |
| ← dreiss left | 21:35 |
|
_ikke_
| foreign commits? | 21:35 |
|
milki
| you can manipulate commits that you have reference to locally | 21:35 |
|
marcjs
| I hate it to bother our contributors in their PullRequest at github with squashing commits. | 21:35 |
| → jerius joined | 21:35 |
| → gdogrady joined | 21:36 |
| ← eaj left | 21:36 |
| ← Luke-Jr left | 21:36 |
|
milki
| marcjs: https://help.github.com/articles/merging-a-pull-request#merging-locally | 21:36 |
|
| do it locally | 21:36 |
| → Luke-Jr joined | 21:37 |
| ← ncthom91 left | 21:37 |
| → Mars___ joined | 21:38 |
|
marcjs
| milki: yeah I know how to merge manually, but when I squash other's commits won't I appear then as the author? | 21:38 |
| ← Bass10 left | 21:38 |
|
canton7
| marcjs, git differentiates between author and committer | 21:38 |
| ← rpg_ left | 21:38 |
|
maestrojed
| I wanted to rename a branch. Locallly I did "git checkout oldName" and "git branch -m newName". I pushed newName to origin which went fine. But origin/oldName still exists. What did I do wrong? | 21:39 |
| ← thierryp left | 21:39 |
|
maestrojed
| or how do I fix it | 21:39 |
|
canton7
| marcjs, so if you rebase some files, you become the committer, but the author's unchanged | 21:39 |
| ← hwrdprkns left | 21:39 |
| ← phile left | 21:39 |
|
marcjs
| ok good to know, then it should work :) thanks! | 21:39 |
| → rpg joined | 21:39 |
|
canton7
| maestrojed, nothing. remove the old branch from the remote with 'git push --delete remotename oldName' | 21:39 |
| ← slyfox left | 21:39 |
|
milki
| maestrojed: you need to explicitly delete the old branch from the remote | 21:39 |
|
maestrojed
| canton7 milki great thanks! | 21:40 |
| ← mklappstuhl left | 21:40 |
| ← geekbri_ left | 21:40 |
| krkini → kini | 21:41 |
| ← brisbin left | 21:41 |
| → yiati joined | 21:42 |
| → marhaban joined | 21:42 |
|
yiati
| How unsacred would you all say it is to tinker with the source code of a submodule | 21:42 |
| ← zapb_ left | 21:42 |
| ← amortimer_mbp left | 21:43 |
| ← sgambino left | 21:43 |
| → eijk_ joined | 21:43 |
| → infynyxx_ joined | 21:43 |
|
canton7
| yiati, "source code of a submodule"? | 21:44 |
|
| i.e. 'cd submodule; do stuf....'? | 21:44 |
| → brisbin joined | 21:44 |
| → FatDarrel_ joined | 21:45 |
|
yiati
| i.e. Modifying an external project that you are using for your project slightly because it doesn't do quite what you want it to do, thus creating your own local branch that you have to maintain yourself | 21:45 |
| ← jonatasnona left | 21:45 |
|
adam_
| yiati: I'm very happy with it | 21:45 |
|
| you are effectively forking | 21:46 |
|
| and it's very powerful | 21:46 |
|
yiati
| No one has any issues doing this, or views it as hacky? | 21:46 |
|
adam_
| nope | 21:46 |
| → ncthom91 joined | 21:46 |
| ← cilly left | 21:46 |
|
yiati
| You have to maintain your own version of an external project | 21:46 |
|
canton7
| you can even submit your patches back to the original maintainer :) | 21:46 |
|
adam_
| if you generalize the solution, you can make a pull request | 21:46 |
|
yiati
| And completely lose all benefits of the open source community | 21:46 |
|
canton7
| yiati, no? you can still merge in changes from upstream | 21:47 |
| ← eijk left | 21:47 |
|
adam_
| if it's accepted you can go back to using the core again | 21:47 |
|
yiati
| canton7: I'm not talking about pull requests, I think those are fantastic | 21:47 |
| → sgambino joined | 21:47 |
|
adam_
| yiati: you can still keep up to date and your changes at the same time | 21:47 |
|
| just keep merging or rebasing based on your preference | 21:47 |
| ← FatDarrel left | 21:48 |
| FatDarrel_ → FatDarrel | 21:48 |
|
adam_
| don't forget about rerere if your conflicts are starting to bother you | 21:48 |
| ← mvelioglu_ left | 21:48 |
|
canton7
| but if you're including that project as a submodule, then you'll have to manually update once in a while anyway | 21:48 |
| ← rfoust left | 21:48 |
|
yiati
| that sounds horribly unnecessary. The real solution should be to fix what's wrong on your end, not in the other projects source code | 21:48 |
|
| Even if it takes a bit more code | 21:48 |
|
| Makes it much easier to maintain | 21:48 |
| ← jleclanche left | 21:48 |
|
canton7
| sure, but that's not always possible | 21:49 |
|
yiati
| :( | 21:49 |
|
guardian
| why are there git commands implemented as shell scripts that don't use git-rev-parse? because they existed before git-rev-parse and its parseopt mode? | 21:49 |
|
canton7
| fixing original > working around in your own code > maintaining fork with no intention of submitting back to upstream, IMO | 21:49 |
|
yiati
| Alright I can at least agree to that ordering | 21:50 |
|
| I just feel like maintaining a fork is an ugly last resort that some people willingly jump onto if it's the easier option | 21:50 |
| → joaoh82 joined | 21:50 |
| → da5id joined | 21:52 |
|
milki
| guardian: you said that already | 21:52 |
| ← robbyoconnor left | 21:53 |
| ← marthinal left | 21:53 |
| ← infynyxx_ left | 21:53 |
| → cilly joined | 21:53 |
| → dreiss joined | 21:53 |
|
ojacobson
| guardian: why not ask their respective authors? | 21:53 |
| → robbyoconnor joined | 21:53 |
| → therealGent joined | 21:54 |
| ← croaky left | 21:54 |
|
milki
| or check the commit dates | 21:54 |
| ← joaoh82 left | 21:54 |
| → croaky joined | 21:54 |
|
ojacobson
| (This is largely a chatroom full of git users; asking git development history questions here is maybe less productive than you'd hope. Try the mailing list, where most of the active git developers hang out. :) | 21:55 |
|
guardian
| I'm looking for some guidance whether it should be used by new commands or not :( | 21:55 |
|
milki
| you should have said so in the first place -.- | 21:55 |
|
guardian
| actually some commands use OPTIONS_SPEC, and git-sh-setup tests if OPTIONS_SPEC is defined but never mentions it in its manual | 21:55 |
| → simesy joined | 21:55 |
|
guardian
| and the man for git-rev-parse mentions OPTS_SPEC as an example | 21:55 |
| → hwrdprkns joined | 21:55 |
| ← AaronMT left | 21:56 |
| ← jcvfen left | 21:56 |
| ← pheaver left | 21:57 |
| → mizu_no_oto joined | 21:57 |
|
guardian
| but not OPTIONS_SPEC so it's a bit rough to connect the dots :) | 21:57 |
|
milki
| guardian: you probably find the git mailing list more productive since actual git developers are there | 21:58 |
|
guardian
| yep I'll collect my thoughts and questions and try there | 21:58 |
| → jcvfen joined | 21:58 |
|
milki
| again, make sure to explain what you are trying to do before diving into your questions first | 21:58 |
| → endiruna joined | 21:59 |
| ← Freeman42 left | 22:01 |
| ← cannonball left | 22:02 |
| ← dort left | 22:03 |
| ← gfontenot left | 22:03 |
| ← nZac left | 22:03 |
| emmajane → [emmajane] | 22:04 |
| ← dougsland left | 22:04 |
| → dougsland joined | 22:05 |
| ← bl33 left | 22:05 |
| ← Kayra left | 22:05 |
| → infynyxx joined | 22:06 |
| ← Kicer86 left | 22:06 |
| ← bdavenport left | 22:06 |
| → nZac joined | 22:06 |
| ← jnavila left | 22:08 |
| → pheaver joined | 22:09 |
| ← hwrdprkns left | 22:10 |
|
xiong
| Please talk to me about this kind of subtree: https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE | 22:10 |
| → Pullphinger joined | 22:10 |
| ← cilly left | 22:10 |
|
grawity
| https://github.com/git/git/tree/master/contrib/subtree | 22:11 |
|
xiong
| I have installed git from wheezy-backports which gives me git version 1.8.5.2; but $ man git subtree fails. Also, hard to find out about this browsing the web; too many ambiguities in the word 'subtree'. | 22:11 |
|
gitinfo
| the git manpage is available at http://jk.gs/git.html | 22:11 |
| ← alezost left | 22:11 |
| → yhager joined | 22:12 |
| → cagedwisdom joined | 22:12 |
| → cilly joined | 22:13 |
|
xiong
| I'll need a tad more context there, friend. Can I obtain this feature within any Debian package? | 22:13 |
| ← xlinkz0 left | 22:13 |
|
jrnieder
| xiong: if you want to help with packaging, sure | 22:13 |
|
xiong
| Oh dear. | 22:13 |
|
grawity
| xiong: git-subtree is in contrib/, so it's probably somewhere in /usr/share/git/subtree/ | 22:13 |
|
jrnieder
| xiong: see http://bugs.debian.org/704652 | 22:13 |
|
xiong
| The main git manpage is nothing. | 22:13 |
|
jrnieder
| xiong: gitinfo is a bot | 22:14 |
|
| xiong: it just did some pattern matching on your question and produced a not-too-helpful answer | 22:14 |
|
xiong
| So perhaps git-subtree is rattling around in my system now but I need to locate it, maybe move it, and locate its manpage? | 22:15 |
| → msafi joined | 22:15 |
| ← msafi left | 22:15 |
| → msafi joined | 22:16 |
| ← cjwilbur_ left | 22:16 |
|
xiong
| I thought I had a case that demanded submodules and I tried them. Now I am chastened and will use subtrees if I can. | 22:16 |
|
| However the only replacement offered for what's described as a nasty feature is... difficult to get. | 22:17 |
|
EugeneKay
| !subrepos | 22:18 |
|
gitinfo
| [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding. | 22:18 |
|
EugeneKay
| My favorite solution is none of this - take a tarball of the subrepo and just unzip it into your repo; git add path/to/lib/ && git commit -m 'Add FooLib v1.2.3' | 22:18 |
|
xiong
| http://git-scm.com/book/en/Git-Tools-Subtree-Merging | 22:19 |
| ← eletuchy_ left | 22:19 |
|
zumba_addict
| hi folks, I have 2 local branches, can I combine then together? | 22:19 |
|
EugeneKay
| zumba_addict - man git-merge | 22:19 |
|
gitinfo
| zumba_addict: the git-merge manpage is available at http://jk.gs/git-merge.html | 22:19 |
|
zumba_addict
| cool | 22:19 |
| → eletuchy joined | 22:19 |
|
zumba_addict
| looks like it's the same approach i did earlier | 22:19 |
| ← cilly left | 22:19 |
|
zumba_addict
| i git pulled master, then i git checkout my-local, then I git merge master | 22:20 |
| ← pbrobst left | 22:20 |
| ← dprophit left | 22:20 |
|
xiong
| EugeneKay, I seem to have difficulty expressing my concerns. I'm dealing with a number of subprojects; most of them are, indeed, projects in their own right. I need to be able to deal with them as such. | 22:20 |
|
| That is, I need to be able to navigate into the subproject, checkout or update, pull or push. | 22:20 |
| → vince_prignano joined | 22:20 |
|
xiong
| Push to a fork and submit a pull req upstream. | 22:21 |
| → cilly joined | 22:21 |
|
xiong
| These foreign projects are not going to alter anything to accommodate a wrapping superproject. | 22:21 |
| → jleclanche joined | 22:21 |
| ← osmosis left | 22:22 |
| ← matanya left | 22:22 |
| ← corni left | 22:23 |
| ← eletuchy left | 22:24 |
|
xiong
| I can't use any approach that discards the link to upstream. Is that not a sane statement? | 22:24 |
| ← mizu_no_oto left | 22:24 |
| ← krononaut left | 22:24 |
| ← d0liver__ left | 22:24 |
| ← hellopat left | 22:24 |
| → Kayra joined | 22:24 |
| ← kermit left | 22:25 |
| ← simesy left | 22:25 |
| ← jerius left | 22:26 |
|
zumba_addict
| i need to switch temporarily to a local branch but there are conflicts on my other branch. How do I swithc? | 22:26 |
| ← infynyxx left | 22:26 |
|
xiong
| git-subtree looks, on first reading, to be a sane solution. Why is it hidden away? | 22:26 |
|
zumba_addict
| i need to see a file | 22:26 |
| ← breakingthings left | 22:26 |
|
grawity
| zumba_addict: a) `git stash`, then switch | 22:26 |
| ← RaceCondition left | 22:26 |
|
grawity
| zumba_addict: or b) `git show otherbranch:path/to/file` | 22:26 |
|
zumba_addict
| then later git stash pop | 22:26 |
|
| i like the latter | 22:27 |
|
| thanks | 22:27 |
| ← cilly left | 22:27 |
| → mvelioglu_ joined | 22:27 |
| → kermit joined | 22:28 |
| ← psyl0n left | 22:28 |
| ← jason237 left | 22:30 |
|
xiong
| I have added a 'me too' to that thread. | 22:30 |
| → d0liver_ joined | 22:31 |
| → Guest34984 joined | 22:31 |
|
Guest34984
| hi | 22:31 |
|
gitinfo
| Guest34984: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 22:31 |
|
Guest34984
| getting some error at github. error: src refspec master does not match any. error: failed to push some refs to 'https://github.com/username/otb.git' | 22:31 |
| → RaceCondition joined | 22:32 |
|
Guest34984
| git push -u origin master | 22:32 |
| ← d0liver_ left | 22:32 |
| ← leeN left | 22:32 |
| → d0liver joined | 22:33 |
|
grawity
| Do you have a branch named 'master'? | 22:33 |
| → cilly joined | 22:33 |
| ← bubbleheadinc left | 22:33 |
| → eaj joined | 22:33 |
|
Guest34984
| I just followed the github post repository creation | 22:34 |
|
| grawity, i think the github is implicitly named remot | 22:34 |
|
zumba_addict
| git stash didn't work when there is a git merge failure | 22:34 |
|
Guest34984
| grawity, i think the github is implicitly named remote master | 22:34 |
| → calcifea joined | 22:35 |
|
ojacobson
| Guest34984: what's currently true on github has almost no bearing on the message you recieved. | 22:37 |
| ← shawndumas left | 22:37 |
|
ojacobson
| Only what's currently true in your local repo can affect that message. | 22:37 |
|
| Do you have a *local* master branch? What does 'git branch' say about it? | 22:38 |
| ← DolpheenDream_ left | 22:38 |
|
zumba_addict
| how do I find out if there are still conflicts? | 22:38 |
|
| git status only shows the changes | 22:39 |
|
| found it by using find | 22:39 |
| ← niatish left | 22:39 |
| ← Landshark753 left | 22:39 |
| → shinnya joined | 22:39 |
| ← cilly left | 22:39 |
| → axl_ joined | 22:40 |
| ← ojacobson left | 22:40 |
| → hwrdprkns joined | 22:40 |
| → leandrosansilva_ joined | 22:40 |
|
Guest34984
| grawity, http://pastie.org/8612068 | 22:41 |
| → cilly joined | 22:41 |
| ← WaReZ left | 22:41 |
| → Klagid_ joined | 22:41 |
| ← leandrosansilva left | 22:41 |
| → eletuchy joined | 22:41 |
| → shawndumas joined | 22:41 |
| ← Klagid_ left | 22:42 |
| ← eaj left | 22:42 |
| ← master_j left | 22:43 |
|
tang^
| Guest34984: github says the URL you're pushing to does not exist. did you create the repo on github first? | 22:43 |
| → GT4066 joined | 22:43 |
|
Guest34984
| yes.. | 22:43 |
|
tang^
| oh wait, you never actually committed anything | 22:44 |
|
| you need to read the message | 22:44 |
|
bamj0rb
| Guest34984: Your branch does not exist until you commit something. | 22:45 |
|
Guest34984
| yes | 22:45 |
|
| how to commit | 22:45 |
|
tang^
| nothing added to commit but untracked files present (use "git add" to track) | 22:45 |
|
bamj0rb
| Use `git add' to add files to the index. Use `git commit' to commit them. | 22:45 |
|
Guest34984
| well i did git commit -m "first commit" | 22:45 |
|
tang^
| and it said 'nothing added to commit but untracked files present (use "git add" to track)' | 22:45 |
| → frogonwheels joined | 22:45 |
| ← FerreusR left | 22:47 |
| ← livingstn left | 22:47 |
|
Guest34984
| working now. thans . i did add * | 22:47 |
| → Silmarilion joined | 22:47 |
| ← yiati left | 22:48 |
| → mhi^ joined | 22:49 |
| ← bartzy left | 22:49 |
| ← mdhopkin_ left | 22:49 |
|
bamj0rb
| You probably wanted . instead since * would (in sane shells) glob to non-hidden files, which may not be everything you want. You can also just say -A. | 22:49 |
| ← cilly left | 22:50 |
| → infynyxx joined | 22:50 |
| → cilly joined | 22:50 |
| ← gdogrady left | 22:51 |
| → Landshark753 joined | 22:51 |
| → mdhopkin_ joined | 22:51 |
| → joaoh82 joined | 22:51 |
| ← sgambino left | 22:52 |
| ← abbycabs left | 22:52 |
| ← grawity left | 22:52 |
| → grawity joined | 22:54 |
| ← tang^ left | 22:54 |
| → gdogrady joined | 22:55 |
| ← cilly left | 22:55 |
| → bitslayer joined | 22:56 |
| ← joaoh82 left | 22:56 |
| → konadr joined | 22:56 |
| ← pheaver left | 22:57 |
| → amcsi joined | 22:57 |
| → konadr1 joined | 22:58 |
| ← konadr left | 22:58 |
| ← diegoviola left | 22:58 |
| ← zhost left | 22:59 |
| → m-o-s joined | 23:00 |
| → thiago joined | 23:00 |
| → sgambino joined | 23:01 |
| ← konadr1 left | 23:02 |
| ← aard__ left | 23:02 |
| ← pinage404 left | 23:03 |
| ← tieTYT left | 23:03 |
| → Diemuzi joined | 23:04 |
| gitinfo set mode: +v | 23:04 |
| ← dmsuperman left | 23:04 |
| ← Dougie187 left | 23:04 |
| [emmajane] → emmajane | 23:04 |
| → tieTYT joined | 23:04 |
| ← mvelioglu_ left | 23:05 |
| ← m-o-s left | 23:05 |
| ← hjp_beta__ left | 23:05 |
| ← croaky left | 23:05 |
| ← dreiss left | 23:05 |
| → harleypig joined | 23:06 |
| ← rendar left | 23:06 |
| → RobOakes joined | 23:06 |
| ← petey__ left | 23:07 |
|
RobOakes
| Is there a way to force git to ask for my username/password when updating a bunch of submodules? | 23:07 |
| ← mfulz left | 23:07 |
| ← juliohm left | 23:07 |
|
RobOakes
| I'm not terribly excited to put in my username/password into .gitmodules, as the file is under version control. | 23:07 |
| → danecando joined | 23:07 |
| → petey_ joined | 23:07 |
| ← dxdt left | 23:07 |
|
RobOakes
| And I can't figure out how to have git reliably prompt for the username/password (I'm using http, not ssh). | 23:08 |
| ← pantsman left | 23:08 |
|
grawity
| man gitcredentials | 23:08 |
|
gitinfo
| the gitcredentials manpage is available at http://jk.gs/gitcredentials.html | 23:08 |
| → pantsman joined | 23:09 |
| ← pantsman left | 23:09 |
| → pantsman joined | 23:09 |
| → eaj joined | 23:09 |
| → croaky joined | 23:10 |
| ← webguynow left | 23:11 |
| → webguynow joined | 23:12 |
| → dxdt joined | 23:12 |
| ← khmarbaise left | 23:12 |
| ← petey_ left | 23:12 |
| → subsonic joined | 23:14 |
| ← longbeach left | 23:14 |
| ← irqq left | 23:14 |
|
niels__
| say a have a develop branch based on master, develop is 100+ commits ahead of master, i don't want anything to do with master, i basically want to have a new master based on develop. how do i do that? | 23:15 |
|
arand__
| niels__: do they diverge? | 23:16 |
| ← Kayra left | 23:16 |
| → dort joined | 23:16 |
|
subsonic
| When I branch from staging -> to branchtest, commit, then merge staging into branchtest (to look for updates), switch to staging, then merge branchtest into staging with --no-commit it doesn't follow the no-commit and automatically merges. Anybody know why? | 23:16 |
| → dreiss joined | 23:17 |
|
osse
| niels__: suppose you could magically move the 'master' "label" from where it is to where 'develop' is now. Would that be awesomesauce? | 23:17 |
| → pheaver joined | 23:17 |
| → Klagid_ joined | 23:18 |
| ← eaj left | 23:18 |
| ← mdhopkins left | 23:19 |
| SJrX → SJr | 23:19 |
| ← panpainter left | 23:19 |
|
joshc
| subsonic: is it performing a fast-forward "merge"? in that case no merge commit is created | 23:19 |
| ← FortySix2 left | 23:20 |
| ← thevishy left | 23:21 |
|
osse
| niels__: I'mn going soon so in case the answer to my question is "yes" here's the procedure for that: git checkout master; git reset --hard develop. | 23:22 |
| → daivyk joined | 23:22 |
| → diegoviola joined | 23:22 |
| → torbjorn_ joined | 23:24 |
|
niels__
| arand__: yes, i need to get completely rid of master. i just want a copy of develop as master. | 23:24 |
| → pbrobst joined | 23:24 |
|
torbjorn_
| I easily do git tag help instead of git help tag, same with branch. how about making git prompt "are you sure" when ever objects named "help" are created where it might not be right? | 23:25 |
| ← mdhopkin_ left | 23:25 |
| ← Klagid_ left | 23:25 |
|
d0liver
| niels__: "master" is just a pointer. you just need to move it to the tip of develop like osse said. | 23:26 |
| ← Guest34984 left | 23:26 |
| ← vince_prignano left | 23:26 |
| ← nZac left | 23:26 |
|
osse
| \o/ | 23:27 |
|
niels__
| d0liver: so if i do as he says, the current master will no longer be, and it'll be a copy of develop so to speak | 23:27 |
|
d0liver
| niels__: sort of | 23:27 |
|
| your current master won't have anything pointing at it | 23:27 |
|
| and it will eventually be cleaned up if left alone long enough | 23:27 |
| ← akersof left | 23:28 |
|
d0liver
| but really all you're doing is moving the pointer that is "master" to the tip of develop | 23:28 |
| ← dxdt left | 23:28 |
| ← bamj0rb left | 23:28 |
| ← Landshark753 left | 23:29 |
|
parcs
| hello | 23:29 |
|
osse
| niels__: I like to think of it as if you drew the history on a whiteboard in the office with two post-it notes on it. You then move the 'master' post-it note to where the 'develop' post-it is. And after a while the cleaning lady wipes a way the part that used to be 'master' because it's just sticking out to the side :p | 23:29 |
|
niels__
| ahhh | 23:30 |
|
| that makes sense | 23:30 |
| ← kill-9_ left | 23:30 |
| → dxdt joined | 23:31 |
|
osse
| that way of thinking about it was taken quote literally from one those videos | 23:31 |
|
| !videos | 23:31 |
|
gitinfo
| [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional) | 23:31 |
|
osse
| The last one | 23:31 |
|
| s/quote/quite/ | 23:32 |
|
xiong
| This does not seem to apply to my situation; I have installed git from Debian wheezy-backports: https://github.com/git/git/blob/master/contrib/subtree/INSTALL | 23:33 |
| → Mangellan2497 joined | 23:33 |
|
xiong
| I'd like to use this feature, really. Advice? | 23:33 |
| ← dfanjul_ left | 23:33 |
| → Landshark753 joined | 23:33 |
| ← _Qman left | 23:34 |
| → kodab joined | 23:34 |
|
xiong
| Do you think this really needs to amount to more than sticking git-subtree.sh somewhere in my $PATH? Ideas for a better approach? | 23:34 |
| → simesy joined | 23:34 |
|
d0liver
| What's the problem with the existing approach? | 23:36 |
| → Error404NotFound joined | 23:36 |
| → panpainter joined | 23:36 |
| → Dougie187 joined | 23:37 |
| ← koda left | 23:37 |
|
osse
| niels__: if develop is literally ahead of master (ie. master is somewhere in the history of develop) then you can do a fast-forward merge. The result would be the same. In this case though it seems the idea is to nuke master from orbit so reset --hard probably feels more right :P | 23:37 |
| ← Destos left | 23:38 |
| ← msafi left | 23:38 |
|
niels__
| osse: Develop-> This branch is 127 commits ahead and 3 commits behind master | 23:40 |
| ← Splenetic left | 23:40 |
| → VictorCL joined | 23:40 |
| → petey_ joined | 23:41 |
|
d0liver
| xiong: It kind of looks like you're supposed to be rebuilding git for that tool | 23:41 |
|
osse
| niels__: ahh ok. so then it will be sticking out to the side and the cleaning lady will fix it | 23:41 |
| ← SocalNick left | 23:41 |
| ← danecando left | 23:41 |
|
niels__
| osse: haha, love that | 23:41 |
|
| osse: which.. is.. git checkout master; git reset --hard develop, right? | 23:41 |
|
osse
| niels__: oui, monsieur | 23:42 |
| → nnyk_ joined | 23:42 |
|
imachuchu
| niels__: right, but what about those "3 commits behind master"? It sounds like master has 3 commits that aren't on develop | 23:43 |
|
grawity
| yes, that's what it menas | 23:43 |
|
| means* | 23:43 |
| ← halu left | 23:43 |
|
osse
| imachuchu: those are bastard children than niels__ wants nothing to do with | 23:43 |
|
d0liver
| yeah, he said he was okay with that | 23:43 |
|
| he said he doesn't care about master | 23:43 |
|
niels__
| exactly, the master should vanish! | 23:44 |
|
d0liver
| I would still probably git checkout -b master-old first | 23:44 |
|
| if it wre me | 23:44 |
|
| *were | 23:44 |
| ← mitz_ left | 23:44 |
| ← lavaman left | 23:44 |
|
imachuchu
| ok, Just wanted to make sure that he knew that there were 3 commits that were going to be lost | 23:44 |
|
osse
| d0liver: but then you have to checkout master again. git branch master-old :) | 23:44 |
| → SocalNick joined | 23:45 |
| ← Noldorin left | 23:45 |
|
d0liver
| it's still the same # of commands I think | 23:45 |
|
| if you start on develop | 23:45 |
|
| actually | 23:46 |
| → jdav_gon` joined | 23:46 |
| → akersof joined | 23:46 |
|
d0liver
| no, that's weird | 23:46 |
|
| you would want to start on master | 23:46 |
|
| meh | 23:46 |
|
EugeneKay
| xiong - listening to your description, why not just use independent repos? Why the need for a "superproject" at all? | 23:46 |
|
d0liver
| you win | 23:46 |
|
xiong
| d0liver, I think it's called upon but not actually required -- I don't know. | 23:47 |
|
EugeneKay
| (went to lunch) | 23:47 |
|
d0liver
| xiong: It's probably required because you're going to type things like git subtree .. blah | 23:47 |
|
| which means you need to extend git | 23:47 |
|
| unless you want to use the hyphen everytime | 23:47 |
|
xiong
| EugeneKay, because although there will be some work done on individual projects, the main demand is to integrate them into a working whole. | 23:47 |
| ← Fiouz_ left | 23:47 |
| → Kayra joined | 23:47 |
| → mlimaloureiro joined | 23:47 |
| → halu joined | 23:48 |
| ← leandrosansilva_ left | 23:48 |
|
d0liver
| I'm inclined to agree with EugeneKay though because subtrees are sort of non-standard and they support bad workflow I think | 23:48 |
| ← jdav_gone left | 23:48 |
| → leandrosansilva joined | 23:49 |
|
EugeneKay
| Is this for the purpose of releasing a "working" codebase? | 23:49 |
|
d0liver
| It sort of encourages you to have a very fuzzy notion of what belongs in this project and what belongs in others | 23:49 |
| → Fiouz joined | 23:49 |
|
xiong
| I may seem to be contradicting myself but that's just because the resolution will be different in different cases. A, drop in the subproject and it just works. B, fight it out and toss the subproject as conflicting with everything else. C, modify one sub to play nice with the rest. D, add a third sub that makes one of the two fighters get along with the rest. And so on. | 23:49 |
|
| Tell me how I can otherwise deal with all these weird cases. | 23:50 |
| ← aberrant left | 23:50 |
|
xiong
| The project looks different when viewed from different angles. I can't help that. | 23:50 |
| ← Pullphinger left | 23:50 |
| ← rpg left | 23:51 |
|
xiong
| I must have a clean, trackable way to add projects into the big mess, remove them, and checkout different versions of any given one. | 23:51 |
| ← akersof left | 23:51 |
|
d0liver
| xiong: Use a dependency manager like composer | 23:51 |
| ← dxdt left | 23:51 |
| ← mlimaloureiro left | 23:52 |
|
d0liver
| this isn't really a git thing unless you're working on those projects simultaneously | 23:52 |
| → joaoh82 joined | 23:52 |
|
d0liver
| and if you're working on those projects to the extent that you can't make your modifications in your local project | 23:52 |
| ← Kayra left | 23:52 |
|
d0liver
| then make your own fork | 23:52 |
|
| and use your dependency manager to pull from your fork | 23:52 |
|
xiong
| In what way am I *not* working on them simultaneously? | 23:52 |
| ← VictorCL left | 23:53 |
|
d0liver
| You shouldn't be changing the codebase of all the projects you're using | 23:53 |
|
| think about what a nightmare that's going to be when they update | 23:53 |
|
xiong
| No. I should only change a sub when necessary. | 23:53 |
| ← joaoh82 left | 23:53 |
|
d0liver
| but it's always going to be necessary to get updates, bug fixes, etc | 23:53 |
|
| and when you do it's going to be terrible | 23:53 |
|
xiong
| From upstream's viewpoint they should be able to look at a simple pull request from a fork of their project alone. | 23:53 |
| ← decotii left | 23:54 |
| → joaoh82 joined | 23:54 |
| ← Houte left | 23:54 |
|
d0liver
| then make a separate repo | 23:54 |
|
| and send a pull request from that one | 23:54 |
|
| that way your changes to that project are localized | 23:54 |
|
| but in general, if you're not planning on contributing your changes | 23:54 |
| → akersof joined | 23:54 |
|
xiong
| Of course, d0liver. That's what I intend. | 23:54 |
|
d0liver
| then you shouldn't be making them in the codebase for that project | 23:54 |
|
| if you're planning on contributing | 23:54 |
|
xiong
| The super is an integration device. | 23:54 |
|
d0liver
| then get a dependency manager | 23:54 |
|
| and hook it up to your forks | 23:55 |
|
| then update your forks | 23:55 |
|
| and use the dep manager to pull from your forks | 23:55 |
|
xiong
| Okay. So what you are saying is that I don't want git to control the superproject at all?? | 23:55 |
|
d0liver
| Eh. no. | 23:55 |
|
| I'm saying have git control the "superproject" | 23:55 |
| → VictorCL joined | 23:55 |
|
d0liver
| and figure out what your subprojects are | 23:55 |
|
| create a repo for each of those | 23:56 |
| → Exancillatus joined | 23:56 |
|
d0liver
| then use a dependency manager to pull those into your super project | 23:56 |
|
| that way your subprojects have a life of their own | 23:56 |
|
| and they're not tied to your super project | 23:56 |
|
xiong
| Okay, I obviously need more study-up. 'composer'? | 23:56 |
|
d0liver
| it will be much cleaner in the end | 23:56 |
| ← therealGent left | 23:56 |
|
d0liver
| composer is a php thing | 23:56 |
|
| but a dependency manager of some type | 23:56 |
| ← simesy left | 23:57 |
|
d0liver
| which basically just pulls in repositories into your repo | 23:57 |
|
xiong
| Right! | 23:57 |
|
d0liver
| you specify a version and it creates a lock | 23:57 |
| → mitz_ joined | 23:57 |
|
xiong
| That's what I've been trying to do with submodules and subtrees. | 23:57 |
|
d0liver
| and it will manage updates for you etc. | 23:57 |
|
| Yeah, but submodules and subtrees are half baked | 23:57 |
|
| you need a different tool | 23:57 |
| ← joaoh82 left | 23:58 |
|
xiong
| Well, not to be rude; but this might be better advice to give at the outset, instead of saying 'Don't use submodules, use subtrees.' Not saying you personally said that, either. | 23:58 |
| ← VictorCL left | 23:58 |
|
d0liver
| well, submodules and subtrees can serve a purpose too.. but they're kind of weak tools imo | 23:59 |
|
xiong
| I'm unaware of the existence of such a... super-git, if you will. Let me do study-up; I have much to learn. | 23:59 |
|
d0liver
| okay | 23:59 |
| → Noldorin joined | 23:59 |
| ← hyperair left | 23:59 |