| 2012-08-22 |
| → FreeNote joined | 00:00 |
| ← lustucru left | 00:00 |
| ← breck left | 00:00 |
| → LucasTizma joined | 00:01 |
| ← imachuchu left | 00:02 |
| ← spyro left | 00:02 |
| → ilteris_ joined | 00:02 |
| ← pfFreddd left | 00:03 |
| ← opus left | 00:04 |
| ← dwmw2_gone left | 00:05 |
| ← rehat left | 00:06 |
| → rehat joined | 00:07 |
| → dwmw2_gone joined | 00:07 |
| ← Arokh left | 00:09 |
| → boombatower joined | 00:09 |
| cpg → cpg|away | 00:10 |
| ← Anubisss_ left | 00:10 |
| → Anubisss joined | 00:11 |
| → nwest joined | 00:11 |
| → andrewhl joined | 00:12 |
|
SaCu
| bigmeow, then wait until you figured out - after being used to the concepts of DVCS and git - how much pain it involves to go _back_ to svn :) | 00:12 |
| ← alexukf left | 00:13 |
| ← iocor left | 00:15 |
| ← shiyuan left | 00:15 |
| ← dwmw2_gone left | 00:15 |
| → spyro joined | 00:16 |
| → iocor joined | 00:16 |
| ← msmithng left | 00:16 |
| → msmithng joined | 00:16 |
| ← robbyoconnor left | 00:17 |
| → cthuluh joined | 00:17 |
| → dwmw2_gone joined | 00:17 |
| ← kenperkins left | 00:18 |
| ← g0bl1n left | 00:19 |
| → Davey joined | 00:19 |
| ← Synthead left | 00:20 |
| ← msmithng left | 00:20 |
| → msmithng joined | 00:20 |
| → bitmonk_ joined | 00:21 |
| → Arokh joined | 00:22 |
| → Bosox20051 joined | 00:23 |
| → ninegrid joined | 00:23 |
| ← andrewhl left | 00:24 |
| ← bitmonk left | 00:24 |
| ← dwmw2_gone left | 00:25 |
| ← Bosox20051 left | 00:25 |
| → dwmw2_gone joined | 00:25 |
| → jpmelos joined | 00:25 |
| ← jpmelos left | 00:25 |
| → robbyoconnor joined | 00:25 |
| The24z → The24z_away | 00:26 |
| → jpmelos joined | 00:26 |
| ← bitmonk_ left | 00:26 |
| → lustucru joined | 00:26 |
| ← Arokh left | 00:27 |
| → skyf joined | 00:28 |
| ← hak42 left | 00:28 |
|
bigmeow
| SaCu: dude, what a hell you are;( | 00:28 |
| → Arokh joined | 00:29 |
| ← beneggett left | 00:31 |
| ← eletuchy_ left | 00:31 |
| → _huoxito joined | 00:31 |
| ← jpmelos left | 00:32 |
| → toothr joined | 00:32 |
| → shiyuan joined | 00:32 |
| → jpmelos joined | 00:33 |
| ← jwmann left | 00:36 |
| ← neurodrone left | 00:36 |
| ← bartek left | 00:36 |
| → jwmann joined | 00:37 |
| ← jwmann left | 00:37 |
| ← sgambino left | 00:37 |
| → jwmann joined | 00:37 |
| ← jwmann left | 00:37 |
| ← shiyuan left | 00:38 |
| tizzo → tizzo-afk | 00:38 |
| ← rehat left | 00:39 |
| The24z_away → The24z | 00:39 |
| ← Lulzon left | 00:41 |
| → Bosox20051 joined | 00:43 |
| → cakehero joined | 00:43 |
| ← the_cybersphinx left | 00:44 |
| ← ninegrid left | 00:46 |
| ← ryez left | 00:46 |
| ← iocor left | 00:46 |
| → opus joined | 00:46 |
| → Chaser_ joined | 00:48 |
| ← SeekingFor left | 00:48 |
| → SeekingFor joined | 00:49 |
| → wolftankk joined | 00:51 |
| ← gusnan left | 00:51 |
| ← skyf left | 00:51 |
| → beneggett joined | 00:52 |
| ← metcalfc_ left | 00:53 |
| → andrewh joined | 00:55 |
| ← mischat left | 00:57 |
| The24z → The24z_away | 00:57 |
| ← xaka left | 00:58 |
| → sorahn joined | 00:59 |
| ← thelazydeveloper left | 00:59 |
| ← patrick99e99 left | 01:00 |
| → breck joined | 01:00 |
|
sorahn
| is there something similar to 'git rev-parse' that I Can use to either verify a branch exists locally or on remote, and either switch to it, or create it | 01:00 |
| ← stevedomin left | 01:01 |
|
sorahn
| i tied git rev-parse <branch> >/dev/null but that still spits out a bunch of error stuff | 01:01 |
|
| and i tried it with 2 >'s as well | 01:01 |
| ← breck left | 01:01 |
| → maqr joined | 01:02 |
| ← aantix left | 01:03 |
| → timj joined | 01:05 |
| → patrick99e99 joined | 01:06 |
| ← beneggett left | 01:06 |
|
frogonwheels
| sorahn: git show-ref refs/heads/ | 01:07 |
|
| sorahn: git show-ref refs/heads/<branchname> | 01:07 |
| → Enzo_cc joined | 01:07 |
| Enzo_cc → Guest39198 | 01:07 |
|
cmn
| or you can tell rev-parse not to output those lines and use the exit status | 01:08 |
|
frogonwheels
| sorahn: but, btw, git checkout already does that. | 01:09 |
|
| sorahn: just say you had refs/remote/origin/topicbranch but no refs/heads/topicbranch then git checkout topicbranch will create it, set it to track refs/remote/origin/topicbranch and check it out | 01:10 |
| → xiangfu joined | 01:11 |
|
cmn
| but that assumes there is no upstream/topicbranch | 01:11 |
|
| and it sounds like this is for a script, so relying on these helpers won't always work | 01:12 |
|
frogonwheels
| cmn: ? | 01:12 |
|
cmn
| git checkout topicbranch will only create a local topicbranch if it's the only possible meaning | 01:12 |
|
frogonwheels
| sorahn: !xy | 01:12 |
|
gitinfo
| sorahn: This sounds like an "XY Problem" http://mywiki.wooledge.org/XyProblem So let's step back for a minute. What are you actually trying to achieve? Why are you doing it this way? | 01:12 |
|
frogonwheels
| cmn: as it should. agreed. | 01:13 |
|
| cmn: we are guessing what sorahn's x is here. Let's find out, shall we? | 01:13 |
| ← kvanderw left | 01:13 |
|
cmn
| if there is more than one remote-tracking branch with the same name, it will fail, and from wanting to shut up rev-parse, it sounds like a script | 01:13 |
| ← jcao219 left | 01:13 |
| ← Vert left | 01:14 |
|
frogonwheels
| cmn: why would you prefer rev-parse over show-ref refs/heads/topicbranch ? | 01:14 |
| → jalama joined | 01:14 |
| ← hwrd|work left | 01:14 |
|
cmn
| no particular reason | 01:14 |
|
| but the problem presented as about rev-parse | 01:15 |
| → iori joined | 01:15 |
| → hoyang joined | 01:16 |
|
cmn
| I do notice that show-ref shows all branches with name ending in the given string | 01:17 |
| ← Fandekasp left | 01:17 |
| ← hyperair left | 01:17 |
| ← linguini left | 01:17 |
| ← archdori left | 01:17 |
|
frogonwheels
| cmn: ahh.. well noticed. | 01:17 |
|
| cmn: I counter that with --verify --quiet ;) | 01:18 |
|
cmn
| that won't consier 'master' to be valid | 01:18 |
|
| which may or may not be a good thing, depending on what you're trying to do | 01:18 |
|
frogonwheels
| cmn: but presumably refs/heads/master would be | 01:18 |
|
cmn
| yeah | 01:18 |
|
| show-ref's --verify is much more strict | 01:18 |
| → Fandekasp joined | 01:19 |
| ← SyouJyoA left | 01:19 |
| → archdori joined | 01:19 |
|
frogonwheels
| cmn: I'm stuck on show-ref 'cause it is targeted at references, and not generally parsing revisions. But obviously the devil's in the details :) | 01:19 |
| → rehat joined | 01:19 |
| ← flakblas left | 01:19 |
| ← YoMomma left | 01:19 |
| → shane_ joined | 01:19 |
| ← pdtpatrick left | 01:19 |
| ← palm_vue left | 01:20 |
| ← bizhanMona left | 01:20 |
| ← Lgb left | 01:20 |
| ← Sym3tri left | 01:20 |
|
frogonwheels
| cmn: git show-ref --quiet master && echo YES | 01:20 |
|
| cmn: git show-ref --quiet mast && echo YES <-- this doesn't find master | 01:20 |
| ← cakehero left | 01:20 |
| → Destos joined | 01:21 |
| → palm_vue joined | 01:21 |
| → Lgb joined | 01:21 |
|
cmn
| of course it doesn't, 'mast' isn't a suffix of 'master' | 01:21 |
| → bizhanMona joined | 01:21 |
|
frogonwheels
| bleh. suffix. sorry. got it. | 01:21 |
|
| cmn: git show-ref --quiet refs/heads/${branchname} seems to me a pretty good solution. if only sorahn would pop back in and find it :) | 01:22 |
| → pandeiro joined | 01:22 |
| ← dinesh6654_ left | 01:23 |
|
cmn
| if you're giving full refnames, then the difference shouldn't be too much, but I guess show-ref is safer | 01:24 |
| → harish joined | 01:26 |
| ← jpmelos left | 01:29 |
| ← Jabberwalker left | 01:30 |
| cpg|away → cpg | 01:32 |
| → zhipeng joined | 01:33 |
| ← SeekingFor left | 01:34 |
| ← etcetera left | 01:35 |
| → SeekingFor joined | 01:35 |
| → cakehero joined | 01:36 |
| ← specialGuest left | 01:37 |
| → superfluous joined | 01:38 |
| → fireh joined | 01:38 |
| ← shane_ left | 01:39 |
| ← apok left | 01:41 |
| ← jalama left | 01:42 |
| ← msmithng left | 01:43 |
| → shawngo joined | 01:44 |
| → daniel-s joined | 01:45 |
| → kvanderw joined | 01:45 |
| ← i7c left | 01:46 |
| → pdtpatrick joined | 01:46 |
| → joelataylor joined | 01:47 |
| → hyperair joined | 01:47 |
| ← hyperair left | 01:47 |
| → hyperair joined | 01:47 |
| → kevwil joined | 01:47 |
| → jackh joined | 01:48 |
| → flippo joined | 01:49 |
| ← t0rc left | 01:49 |
| ← pdtpatrick left | 01:49 |
| ← Jay_Levitt left | 01:49 |
| → i7c joined | 01:50 |
| → jalama joined | 01:50 |
| → jackh_ joined | 01:50 |
| → etcetera joined | 01:53 |
| ← LucasTizma left | 01:54 |
| → Araxia joined | 01:54 |
| ← Araxia left | 01:55 |
| ← etcetera left | 01:55 |
| → iwoj joined | 01:55 |
| gitinfo set mode: +v | 01:55 |
|
iwoj
| how to i delete a previous commit? | 01:55 |
|
| i tried rebase | 01:55 |
|
| but that only gives the option to squash and reword | 01:56 |
|
cmn
| iwoj: read the instructions | 01:56 |
| → cooloney joined | 01:57 |
| → nadavoid joined | 01:58 |
| ← pl0sh left | 01:58 |
| ← Destos left | 01:59 |
|
SethRobertson
| iwoj: Also read !fixup which provides other options and more insrutuctions | 02:00 |
|
gitinfo
| iwoj: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 02:00 |
| ← zdk left | 02:00 |
| ← iwoj left | 02:00 |
| → Per4u3e joined | 02:00 |
| → weiyang joined | 02:00 |
| → andymikefred joined | 02:02 |
| → zdk joined | 02:03 |
| ← Per4u3e left | 02:04 |
| → ology joined | 02:05 |
| ← superfluous left | 02:08 |
| ← weiyang left | 02:08 |
| → Chib joined | 02:08 |
| → weiyang joined | 02:08 |
| → buhman joined | 02:08 |
|
buhman
| git bisect is SO cool | 02:08 |
| → daniel-s_ joined | 02:08 |
| ← simesy left | 02:08 |
|
buhman
| I'm going to find this guy's bad commit without even looking at his code :D | 02:09 |
| tizzo-afk → tizzo | 02:09 |
| → simesy joined | 02:09 |
| → daniel-s__ joined | 02:09 |
| ← Marbug left | 02:10 |
| ← daniel-s left | 02:12 |
|
sorahn
| hi i'm back. cmn and frogonwheels I'm trying to script my dev environment to switch tickets and branches at the same time. So I just want to pass in the branch name (same as the ticket name) and have git either switch to it if it's a branch that exists, or create it if it's new. | 02:12 |
| ← daniel-s_ left | 02:13 |
|
sorahn
| tickets for our bug tracking system not related to git. but i can switch it with scripts as it is. I'd just like git to go with it if possible | 02:13 |
| → xaka joined | 02:13 |
| → duckxx joined | 02:14 |
| tizzo → tizzo-afk | 02:14 |
| tizzo-afk → tizzo | 02:15 |
| ← maletor left | 02:15 |
| ← SeekingFor left | 02:16 |
| → SeekingFor joined | 02:16 |
| ← jackh_ left | 02:17 |
| ← cmullican left | 02:17 |
| ← wolftankk left | 02:18 |
|
frogonwheels
| sorahn: that seems quite a healthy idea. I think git show-ref --quiet refs/heads/${branchname} was the best solution. | 02:19 |
|
| sorahn: you can check for upstream versions of the branch with git show-ref --quiet refs/remotes/${remotename}/${branchname} | 02:19 |
|
| sorahn: or you can check for any with git show-ref --quiet ${branchname} | 02:20 |
| ← artnez left | 02:20 |
|
sorahn
| that looks great. | 02:20 |
| ← Bosox20051 left | 02:20 |
|
sorahn
| so ( git show-ref <branch> && git checkout <branch> ) || git checkout -b <branch> | 02:21 |
|
| thanks for the help | 02:22 |
| → corburn joined | 02:23 |
| ← patrick99e99 left | 02:23 |
|
frogonwheels
| sorahn: and if you put --quiet in your show-ref command, you won't need to surpress output | 02:24 |
|
sorahn
| oh yea, i saw that too | 02:24 |
|
| forgot to stick it in there | 02:24 |
|
| thanks | 02:25 |
| → patrick99e99 joined | 02:25 |
| ← kvanderw left | 02:26 |
| ← kevwil left | 02:28 |
| → WillMarshall joined | 02:28 |
| → erynofwales joined | 02:30 |
| ← patrick99e99 left | 02:31 |
| → dinesh6654 joined | 02:31 |
| ← jalama left | 02:32 |
| → metcalfc_ joined | 02:32 |
| ← corburn left | 02:33 |
| → wolftankk joined | 02:33 |
| → neurodrone joined | 02:33 |
| ← daniel-s__ left | 02:34 |
| → shane_ joined | 02:36 |
| → jcao219 joined | 02:36 |
| → keyzs joined | 02:37 |
| ← joelataylor left | 02:37 |
|
| keyzs what are probably the 3 best hosting companies worldwide? | 02:37 |
| tizzo → tizzo-afk | 02:38 |
| ← SkAzZ left | 02:38 |
| → Marbug joined | 02:39 |
| → Destos joined | 02:39 |
| ← Destos left | 02:39 |
| → andrewhl joined | 02:39 |
| ← Eridius left | 02:41 |
| → etcetera joined | 02:42 |
| → rohan32 joined | 02:42 |
| → hollyw00d joined | 02:43 |
| ← ehsan left | 02:45 |
| → jalama joined | 02:45 |
|
EugeneKay
| Loaded question. I like Linode for small VPSes. | 02:47 |
|
| Everything else I host myself in a rack rented from HE | 02:47 |
| ← jeyanth left | 02:49 |
| ← sorahn left | 02:49 |
| → private joined | 02:50 |
| private → Guest11123 | 02:50 |
| ← jalama left | 02:52 |
| → daniel-s joined | 02:53 |
| → eletuchy joined | 02:56 |
| ← metcalfc_ left | 02:57 |
| tizzo-afk → tizzo | 03:00 |
| ← duckxx left | 03:02 |
| SeoZ-work[AWAY] → SeoZ | 03:03 |
| → jeyanth joined | 03:03 |
| ← opus left | 03:04 |
| ← ivan`_ left | 03:06 |
| → stevedomin joined | 03:07 |
| → ivan` joined | 03:07 |
| → artnez joined | 03:09 |
| → jonmasters joined | 03:10 |
| → pppaul joined | 03:11 |
| → kidsalsa joined | 03:12 |
| → ehsan joined | 03:13 |
| → gavin_huang joined | 03:13 |
| → Yuuhi`` joined | 03:15 |
| ← nwest left | 03:16 |
| ← Yuuhi` left | 03:17 |
| → txdv joined | 03:18 |
| → oojacoboo joined | 03:19 |
| ← shane_ left | 03:19 |
| ← txdv_ left | 03:20 |
| → xxthink joined | 03:21 |
| ← jeyanth left | 03:22 |
| ← kcj left | 03:22 |
| → ak5 joined | 03:23 |
| → rchavik joined | 03:24 |
|
ak5
| hi guys, I have a few repos in my dir tree, that I wanted to add as submodules, so I did git submodule add blabla.git relative/path/from/git/repo | 03:25 |
| → iliketurtles joined | 03:25 |
|
ak5
| but when I pull, it doesn't seem to get the files inside, just the folder | 03:25 |
| ← ivan` left | 03:26 |
|
ak5
| oh after pull I still needed to do git submodule init | 03:28 |
|
| my bas | 03:28 |
|
| bad* | 03:28 |
|
bigmeow
| how to delete a file on remote git repo? | 03:28 |
|
| i have push a password file to remote repo | 03:28 |
|
RandalSchwartz
| bigmeow, !fixup | 03:28 |
|
gitinfo
| bigmeow: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 03:28 |
|
bigmeow
| now i want to delete it, how to do this? | 03:28 |
|
RandalSchwartz
| the biggest problem you'll have is rewriting public history | 03:28 |
|
SethRobertson
| Read the instructions on the link | 03:28 |
|
ak5
| bigmeow: https://help.github.com/articles/remove-sensitive-data | 03:29 |
| → ivan` joined | 03:29 |
| → lirt joined | 03:30 |
| ← txdv left | 03:31 |
| ← magcius left | 03:31 |
| → beneggett joined | 03:31 |
| → txdv joined | 03:32 |
| flippo → FLIPPO | 03:32 |
| ← nadavoid left | 03:32 |
| → magcius joined | 03:34 |
| → drook joined | 03:37 |
| ← dreiss left | 03:37 |
| ← drook left | 03:39 |
| ← SirFunk_ left | 03:40 |
| → SirFunk joined | 03:41 |
| → fisted joined | 03:42 |
| → maletor joined | 03:42 |
| ← fisted_ left | 03:42 |
| ← maqr left | 03:42 |
| ← arvind_khadri left | 03:42 |
| → kcj joined | 03:43 |
| ← ivan` left | 03:43 |
| ← Sky[x] left | 03:43 |
| → Know1edge joined | 03:44 |
| → Kichael joined | 03:44 |
| → Araxia joined | 03:44 |
| ← Chib left | 03:45 |
| → corburn joined | 03:45 |
| → ivan` joined | 03:45 |
| ← genehack left | 03:46 |
| ← splud left | 03:46 |
| ← eletuchy left | 03:46 |
| → genehack joined | 03:46 |
| ← genehack left | 03:47 |
| → genehack joined | 03:47 |
| ← oojacoboo left | 03:48 |
| ← plasticboy left | 03:48 |
| → eletuchy joined | 03:49 |
| → plasticboy joined | 03:49 |
| tizzo → tizzo-afk | 03:50 |
| ← hollyw00d left | 03:50 |
| ← dinesh6654 left | 03:50 |
| ← corburn left | 03:51 |
| ← kukks left | 03:51 |
| → igotnolegs joined | 03:53 |
| → Sky[x] joined | 03:53 |
| ← Milossh left | 03:53 |
| → preflex_ joined | 03:53 |
| ← Sky[x] left | 03:54 |
| ← plasticboy left | 03:55 |
| ← preflex left | 03:55 |
| preflex_ → preflex | 03:55 |
| → maqr joined | 03:56 |
| → fedesilva joined | 03:57 |
| ← Know1edge left | 03:57 |
| → hwrd|work joined | 03:57 |
| ← rehat left | 03:58 |
| → hollyw00d joined | 03:58 |
| ← maletor left | 03:59 |
| ← eletuchy left | 04:00 |
| → aantix joined | 04:01 |
| ← dvide left | 04:02 |
| → plasticboy joined | 04:02 |
| rohan32 → rohan|sleep | 04:02 |
| ← xaka left | 04:04 |
| → Vampire0 joined | 04:05 |
| ← OOPMan left | 04:05 |
| → YoMomma joined | 04:05 |
| ← YoMomma left | 04:06 |
| → Eridius joined | 04:06 |
| ← d3vic3 left | 04:06 |
| ← khmarbaise left | 04:08 |
| → Enzo_cc joined | 04:08 |
| → ReekenX joined | 04:08 |
| Enzo_cc → Guest84686 | 04:08 |
| → rehat joined | 04:08 |
| → dreiss joined | 04:09 |
| → d3vic3 joined | 04:10 |
| ← Guest39198 left | 04:10 |
| → OOPMan joined | 04:11 |
| ← kpreid left | 04:12 |
| → kpreid joined | 04:12 |
| ← stevedomin left | 04:13 |
| ← _huoxito left | 04:14 |
| ← etcetera left | 04:14 |
| ← hwrd|work left | 04:15 |
| ← FreeNote left | 04:16 |
| → metcalfc_ joined | 04:16 |
| ← OOPMan left | 04:20 |
| → LucasTizma joined | 04:22 |
| → dhruvasagar joined | 04:24 |
| → maletor joined | 04:25 |
| → towski joined | 04:28 |
| → shane_ joined | 04:29 |
| → pretty_function joined | 04:30 |
| ← pandeiro left | 04:33 |
| ← fedesilva left | 04:35 |
| → fedesilva joined | 04:35 |
| ← simesy left | 04:36 |
| ← Samos123 left | 04:38 |
| → luxurymode joined | 04:39 |
| → Samos123 joined | 04:39 |
| → etcetera joined | 04:44 |
| → lustucru_ joined | 04:46 |
| ← maletor left | 04:48 |
| ← lustucru left | 04:51 |
| ← lustucru_ left | 04:51 |
| ← dhruvasagar left | 04:52 |
| → avpx joined | 04:53 |
| → simesy joined | 04:53 |
| → pantsman joined | 04:54 |
| ← pantsman left | 04:54 |
| → pantsman joined | 04:54 |
| ← lirt left | 04:56 |
| → apok joined | 04:56 |
| ← SeekingFor left | 04:56 |
| → lirt joined | 04:56 |
| ← shane_ left | 04:57 |
| → Zespre_ joined | 04:57 |
| ← towski left | 04:57 |
| ← lirt left | 04:57 |
| → towski joined | 04:58 |
| ← Zespre left | 04:58 |
| → SeekingFor joined | 04:58 |
| → lirt joined | 04:58 |
| → j416 joined | 04:59 |
| → beautifulmind joined | 04:59 |
| ← FLIPPO left | 05:00 |
| ← apok left | 05:03 |
| ← towski left | 05:04 |
| ← luxurymode left | 05:05 |
| → maletor joined | 05:06 |
| → lustucru joined | 05:07 |
| → towski joined | 05:07 |
| ← codewrangler left | 05:08 |
| ← SeekingFor left | 05:12 |
| → TheJH joined | 05:18 |
| ← cakehero left | 05:19 |
| ← pppaul left | 05:19 |
| ← nirix left | 05:21 |
| ← etcetera left | 05:24 |
| ← Psycho_pr left | 05:24 |
| → Psycho_pr_ joined | 05:24 |
| ← metcalfc_ left | 05:25 |
| → SeekingFor joined | 05:26 |
| → w09x joined | 05:27 |
| → shruggar joined | 05:27 |
| → dinesh6654 joined | 05:28 |
| ← thansen_ left | 05:31 |
| ← MacGyver left | 05:31 |
| → MacGyver joined | 05:31 |
| ← MacGyver left | 05:31 |
| → MacGyver joined | 05:31 |
| → thansen joined | 05:31 |
| ← lustucru left | 05:32 |
| ← andrewhl left | 05:33 |
| → etcetera joined | 05:33 |
| ← hollyw00d left | 05:34 |
| ← sweet|kid left | 05:36 |
| → herdingcat joined | 05:36 |
| ← Fiouz left | 05:36 |
| → sparticvs joined | 05:37 |
| ← Samos123 left | 05:38 |
| → Chib joined | 05:39 |
| → Fiouz joined | 05:39 |
| The24z_away → The24z | 05:39 |
| → ilogger2 joined | 05:58 |
| → Cake joined | 05:58 |
| ← Cake left | 05:59 |
| → arvind_khadri joined | 05:59 |
| → senny joined | 05:59 |
| → tommsen joined | 06:01 |
| → fornext joined | 06:08 |
| → hoschi joined | 06:09 |
| → dsirijus joined | 06:10 |
| → cbreak-work joined | 06:15 |
| → etcetera joined | 06:15 |
| → harshpb joined | 06:15 |
| → leeN joined | 06:16 |
| → soee joined | 06:18 |
| → Maccer joined | 06:20 |
|
xxthink
| how to upgrade gitolite from v1.5.4 to v3? | 06:21 |
| → papegaaij joined | 06:21 |
|
EugeneKay
| xxthink - read the upgrading docs. The 2.x ones (mostly) apply to coming from 1.5.x as well | 06:22 |
|
xxthink
| ok | 06:22 |
| ← etcetera left | 06:24 |
| → tqmz joined | 06:24 |
| → chester_ joined | 06:26 |
| → dax_roc joined | 06:27 |
| → psoo joined | 06:27 |
| → dc5ala joined | 06:30 |
| → patrick99e99 joined | 06:31 |
| → marthinal joined | 06:31 |
| → corburn joined | 06:32 |
|
sitaram
| xxthink: what EugeneKay said. And the reason is that 1.x to 2 was not nearly as drastic a change (and definitely did not involve a completely different RC file format) | 06:36 |
| → flijten joined | 06:36 |
| → lirt joined | 06:39 |
| → und3f joined | 06:39 |
| → OOPMan joined | 06:40 |
| → jonnu joined | 06:40 |
| → w41 joined | 06:41 |
|
xxthink
| sitaram: thank you for your excellent work | 06:43 |
|
sitaram
| you're welcome! | 06:45 |
| → rgr joined | 06:47 |
| → etcetera joined | 06:47 |
| → ak5_ joined | 06:49 |
| → tsdh joined | 06:52 |
| → MaximB_ joined | 06:53 |
| → dpino joined | 06:54 |
| → mishok13 joined | 06:54 |
| → n1x joined | 06:55 |
| → brianpWins joined | 06:59 |
|
brianpWins
| I accidentally the whole repo | 06:59 |
| → jackh joined | 06:59 |
|
_ikke_
| brianpWins: Yeah, I do that sometimes too .. | 07:00 |
|
brianpWins
| but really. I thought the remote branch origin was set to a different remote repo. So I've pushed changes to the wrong remote. Is there a way to undo that push. So the remote i pushed to will no longer have those changes (until a later date when they get marge in again) | 07:00 |
|
| marge = merged | 07:01 |
|
_ikke_
| brianpWins: You can't undo a push | 07:01 |
|
brianpWins
| yeah, I just want an undo-esque affect | 07:01 |
|
eighty4
| What would be the easiest way to get all diffs for a single file? Google won't give me the answer :/ | 07:01 |
|
_ikke_
| brianpWins: Do you know where the branch pointed to before the push? | 07:01 |
|
brianpWins
| like if I revert locally then force push. as long as no one else has pulled it should be okay? | 07:02 |
|
_ikke_
| brianpWins: You don't have to 'revert' locally | 07:02 |
|
eighty4
| i.e. all changes to it including the actually code | 07:02 |
|
brianpWins
| _ikke_: yup I know where it pushed to, and where I'd prefer it to push to | 07:03 |
|
_ikke_
| eighty4: Not sure what you want, but have you tried git log --all -p -- path/to/file ? | 07:03 |
| ← tommsen left | 07:03 |
|
_ikke_
| brianpWins: you can do git push -f <remote> <commit_you_want>:<remote_branch> | 07:03 |
|
brianpWins
| sweet. and as long as no one has pulled in the last 5 minutes it won't effect a thing ? | 07:04 |
| → Advocation joined | 07:04 |
|
_ikke_
| brianpWins: nope | 07:04 |
|
eighty4
| _ikke_: that would basically be what I want :) I was looking at log but missed that apperantly :/ | 07:04 |
|
brianpWins
| _ikke_: sweet, I was pretty sure that was what I needed to do. Just wanted to verify before I start push -f'ing anything | 07:05 |
|
| lol push offing anything | 07:05 |
|
| effing* | 07:05 |
| → tommsen joined | 07:05 |
|
_ikke_
| lol | 07:05 |
|
| brianpWins: Note that some repositories might block non-ff pushes | 07:06 |
| → macivy joined | 07:07 |
| ← lirt left | 07:07 |
| → hyperair joined | 07:07 |
| ← n1x left | 07:08 |
| → thansen joined | 07:08 |
|
brianpWins
| noted | 07:08 |
|
| sweet it looks like ti worked just dandy | 07:09 |
|
| now to fix up the remote branches naming | 07:09 |
|
xxthink
| what does "change all NAME/ to VREF/NAME/" mean when I upgrade gitlite | 07:09 |
|
| for example | 07:10 |
| → Milossh joined | 07:10 |
|
xxthink
| I have a testing repo, RW+ = @all | 07:10 |
|
| what should I do? | 07:10 |
|
EugeneKay
| Do you have any repo definitins which include the string "NAME/" ? | 07:10 |
| → nirix joined | 07:11 |
|
xxthink
| no | 07:11 |
|
EugeneKay
| Then don't worry about it | 07:11 |
| ← psoo left | 07:11 |
|
xxthink
| ok | 07:11 |
|
EugeneKay
| It's an advanced feature which changed syntax, that's all. | 07:11 |
| → nor5trom joined | 07:12 |
| ← nor5trom left | 07:12 |
| → nor5trom joined | 07:12 |
|
xxthink
| ok | 07:12 |
| → timj1 joined | 07:12 |
| ← jackh left | 07:12 |
| → skorgon joined | 07:12 |
| ← skorgon left | 07:12 |
| → skorgon joined | 07:12 |
| → eijk joined | 07:13 |
| ← nor5trom left | 07:13 |
|
brianpWins
| thanks _ikke_ | 07:14 |
|
_ikke_
| yw | 07:15 |
| → lb joined | 07:15 |
| ← lb left | 07:15 |
| → lb joined | 07:15 |
| ← tsdh left | 07:17 |
| → maccieju joined | 07:17 |
| ← maccieju left | 07:18 |
| → breck joined | 07:20 |
| → nor5trom joined | 07:20 |
| → harish joined | 07:20 |
| → Lgb joined | 07:21 |
| → maletor joined | 07:21 |
| → palm_vue joined | 07:21 |
| → bizhanMona joined | 07:21 |
| → Sebo joined | 07:22 |
| → tsdh joined | 07:24 |
| → psoo joined | 07:27 |
| → _jmg joined | 07:28 |
| → thiago joined | 07:29 |
| → jkremser joined | 07:29 |
| → bjornars joined | 07:31 |
| → twinturbo joined | 07:35 |
|
twinturbo
| Hey I have a remote branch I'm tracking. My coworker used push -f to push a different history. How can I merge that into my local branch without problems? | 07:35 |
| ← maletor left | 07:36 |
|
lb
| twinturbo: !rewrite | 07:37 |
|
gitinfo
| twinturbo: [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config) | 07:37 |
| ← rgr left | 07:38 |
| → jdav_gon` joined | 07:39 |
| → klj613 joined | 07:39 |
| → fedesilva_ joined | 07:40 |
| → sangi joined | 07:40 |
| ← brianpWins left | 07:40 |
| → Guest39198 joined | 07:40 |
| fedesilva_ → fedesilva | 07:41 |
| → blami_ joined | 07:45 |
| → robbyoconnor joined | 07:49 |
| ← breck left | 07:49 |
| ← etcetera left | 07:49 |
| → alexukf joined | 07:50 |
| → cthuluh joined | 07:50 |
| → dr_lepper joined | 07:51 |
| → gavin_huang joined | 07:51 |
|
xxthink
| who has the post-receive hooks? | 07:52 |
|
| I want to send email after pushing the code | 07:52 |
| ← Sebo left | 07:52 |
| → RaceCondition joined | 07:53 |
|
xxthink
| I have found one | 07:53 |
| ← fedesilva left | 07:53 |
| → scholtz joined | 07:54 |
| → yuwang joined | 07:55 |
| → thirdknife joined | 07:55 |
| → ryez joined | 07:55 |
| ← ryez left | 07:56 |
| → Guest84686 joined | 07:56 |
| → jargon- joined | 07:59 |
| → fedesilva joined | 07:59 |
| ← Guest39198 left | 07:59 |
| → Error404NotFound joined | 07:59 |
| → d3vic3 joined | 08:00 |
| ← fedesilva left | 08:03 |
| → arkiver joined | 08:05 |
| → _Qman joined | 08:06 |
| → LimeBlast joined | 08:07 |
| → jackh joined | 08:07 |
| → lustucru joined | 08:07 |
| → twigmorewelsh joined | 08:08 |
| → ryez joined | 08:09 |
| → fedesilva joined | 08:10 |
|
ryez
| why git merge sometimes requires a message specified? | 08:11 |
| → lukosanthropos joined | 08:11 |
| ← lukosanthropos left | 08:11 |
| → lukosanthropos joined | 08:12 |
| → frogonwheels_ joined | 08:12 |
| → simesy_ joined | 08:12 |
| ← simesy_ left | 08:12 |
| → mikaelj joined | 08:13 |
| ← flijten left | 08:13 |
| → unreal joined | 08:13 |
| → cxreg joined | 08:13 |
| → lyddon joined | 08:13 |
| → joshc joined | 08:13 |
|
charon
| ryez: starting a few releases ago, it fires up the editor when doing a non- !ff merge | 08:14 |
|
gitinfo
| ryez: A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. | 08:14 |
| → dhruvasagar joined | 08:14 |
| → flijten joined | 08:15 |
| ← skorgon left | 08:15 |
| ← fedesilva left | 08:17 |
| ← twigmorewelsh left | 08:18 |
| → an0maly_ joined | 08:18 |
| → tjadc joined | 08:19 |
| → Element9 joined | 08:19 |
| → vadi joined | 08:21 |
|
vadi
| Howto get the all the files of my local repository to the state of an old point (commit-id) ? | 08:22 |
|
nevyn
| git checkout commit | 08:22 |
| → fedesilva joined | 08:22 |
| → Vert joined | 08:23 |
|
vadi
| I have done it. Actually I have done: rm -rf * and then git checkout commit-id, and I think my problem was the rm -rf * | 08:23 |
|
| I think without the rm -rf * it will work | 08:23 |
|
| Thanks | 08:23 |
|
nevyn
| vadi: | 08:23 |
|
| do you still have .git? | 08:23 |
|
vadi
| yes | 08:23 |
| → apok joined | 08:23 |
|
vadi
| rm -rf * does not remove it | 08:23 |
|
nevyn
| so you should be ok. | 08:24 |
|
| what happens whn you run git checkout commit-id ? | 08:24 |
| → g105b joined | 08:24 |
|
vadi
| thanks, I think I got an non-complete repo because the git-checkout takes the current ref (HEAD) and apply the patches back to the commit-id. | 08:25 |
|
| That was the fault of me executing rm -rf * | 08:25 |
|
| before the checkout | 08:25 |
|
| I thought git checkout would do a _full_ checkout, | 08:25 |
|
| but I think it just take current referente and calculate the minimum checkout to take the repot to commit-id point. | 08:26 |
|
nevyn
| git reset --hard HEAD | 08:26 |
| ← alexukf left | 08:27 |
|
vadi
| Does do just a commit back? | 08:27 |
|
nevyn
| nope. | 08:27 |
|
EugeneKay
| I think you a verb | 08:27 |
|
nevyn
| that should reset the current branch to HEAD (which is where it is by definition) and restore the working directory | 08:27 |
|
vadi
| ok, thanks | 08:28 |
| → amcsi_work joined | 08:28 |
|
nevyn
| I think | 08:28 |
| → giallu joined | 08:28 |
| → skorgon joined | 08:29 |
| ← skorgon left | 08:29 |
| → skorgon joined | 08:29 |
| → alexukf joined | 08:29 |
| → mischat joined | 08:30 |
| ← g105b left | 08:31 |
| → osse joined | 08:32 |
| ← dr_lepper left | 08:32 |
| → dr_lepper joined | 08:33 |
| ← dr_lepper left | 08:33 |
| → dr_lepper joined | 08:33 |
| → lcc joined | 08:34 |
| ← apok left | 08:35 |
| → changedNicks joined | 08:36 |
| changedNicks → sweet|kid | 08:36 |
| ← eijk left | 08:36 |
| → jjore joined | 08:37 |
| ← giallu left | 08:37 |
|
ryez
| charon: thanks for pointing out this, yes I understand what is a non-ff merge | 08:38 |
|
nevyn
| vadi: did that work? | 08:39 |
| → thanpolas joined | 08:39 |
|
thanpolas
| how can i re-commit a reverted commit? | 08:39 |
|
nevyn
| revert the revert? | 08:40 |
|
thanpolas
| right | 08:40 |
|
nevyn
| that will work. | 08:40 |
|
lb
| or cherry-pick | 08:40 |
|
thanpolas
| i can cherry-pick a commit from the same branch? | 08:40 |
|
nevyn
| sure | 08:40 |
|
lb
| you can cherrypick every commit | 08:40 |
|
| (in the same repo) | 08:41 |
|
nevyn
| cherry-pick makes a NEW commit remember. | 08:41 |
|
FauxFaux
| You can cherry-pick any commit at any time, unless it's a filthy merge commit. | 08:41 |
|
nevyn
| !bad merge | 08:41 |
|
FauxFaux
| !dirty | 08:41 |
|
| Mmm. | 08:41 |
|
| (The best kind of merge.) | 08:41 |
|
thanpolas
| oh cool | 08:41 |
|
| cherry-pick worked | 08:41 |
|
jast
| !ping | 08:41 |
|
gitinfo
| I only respond to !ECHO-REQUEST | 08:41 |
| ← hyperair left | 08:41 |
| → xxc_michael joined | 08:42 |
|
FauxFaux
| But, I wasn't referring to dirty merges, I was referring to merges at all. ¬_¬ | 08:42 |
|
_ikke_
| !ECHO-REQUEST | 08:42 |
|
nevyn
| thanpolas: I still liked reverting the revert | 08:42 |
| → afuentes joined | 08:42 |
|
nevyn
| it would have been more real history but whatever it's your repo ;) | 08:42 |
| ← alexukf left | 08:42 |
| ← w41 left | 08:42 |
|
_ikke_
| .trigger_edit !ECHO-REQUEST I only respond to !ping | 08:42 |
|
gitinfo
| _ikke_: Valid trigger names must consist of [a-zA-Z0-9_.-] | 08:42 |
|
thanpolas
| nevyn i agree | 08:42 |
|
_ikke_
| :-( | 08:42 |
|
EugeneKay
| _ikke_ - no ! | 08:43 |
|
_ikke_
| yeah, just found that | 08:43 |
|
| .trigger_edit ECHO-REQUEST I only respond to !ping | 08:43 |
|
gitinfo
| _ikke_: Okay. | 08:43 |
|
lb
| !ECHO-REQUEST | 08:43 |
|
gitinfo
| I only respond to !ping | 08:43 |
|
nevyn
| thanpolas: because now it's commit revert commit | 08:43 |
|
| rather than commit revert revertofrevert whcih is a more meaningful story to me. | 08:43 |
|
_ikke_
| EugeneKay: lol, git ctcp request? | 08:44 |
| ← dsirijus left | 08:44 |
|
EugeneKay
| _ikke_ - what, your client doesn't support it? >_> | 08:44 |
|
_ikke_
| nope :P\ | 08:44 |
|
EugeneKay
| MINE does | 08:44 |
|
_ikke_
| Unknown CTCP requested by EugeneKay: GIT | 08:44 |
|
| What does it do? | 08:44 |
| → paolooo joined | 08:44 |
|
vadi
| nevyn, Yes, git reset --hard HEAD + git checkout commit_id | 08:45 |
|
| thanks | 08:45 |
|
EugeneKay
| Try it ;-) | 08:45 |
| ← twinturbo left | 08:45 |
|
_ikke_
| lol | 08:45 |
|
paolooo
| hi @all, can you help me. How do I fix "You are not currently on a branch..." | 08:46 |
|
EugeneKay
| paolooo - !detached | 08:46 |
|
gitinfo
| paolooo: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach | 08:46 |
|
EugeneKay
| paolooo - !reattach | 08:46 |
|
gitinfo
| paolooo: Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue | 08:46 |
|
EugeneKay
| A) is probably what you did | 08:46 |
|
_ikke_
| EugeneKay: try again | 08:46 |
|
EugeneKay
| <3 | 08:47 |
|
JrCs
| !cherry | 08:47 |
| ← lcc left | 08:47 |
| ← pfote left | 08:47 |
|
_ikke_
| JrCs: man git cherry | 08:47 |
|
gitinfo
| JrCs: the git-cherry manpage is available at http://git-scm.com/docs/git-cherry.html | 08:47 |
| → noelbush joined | 08:48 |
|
EugeneKay
| .trigger_edit fast_forward @!ff | 08:48 |
|
gitinfo
| EugeneKay: Okay. | 08:48 |
| ← harshpb left | 08:49 |
| → whitman joined | 08:51 |
| → harshpb joined | 08:51 |
| → w09x joined | 08:56 |
| → RaceCondishun joined | 08:57 |
| → angelsl joined | 08:58 |
| ← harshpb left | 08:58 |
| → lcc joined | 08:59 |
| → harshpb joined | 08:59 |
| → letharion joined | 09:00 |
| → hyperair joined | 09:00 |
| ← RaceCondition left | 09:00 |
| RaceCondishun → RaceCondition | 09:00 |
| ← RaceCondition left | 09:00 |
|
paolooo
| gitinfo: thanks. git rebase --continue worked for me. Thank you again | 09:01 |
|
gitinfo
| paolooo: you're welcome, but please note that I'm a bot. I'm not programmed to care. | 09:01 |
|
_ikke_
| lol, gitinfo has a karma of 2 :D | 09:01 |
|
paolooo
| ah hehehe.. didn't know that... | 09:01 |
|
EugeneKay
| gitinfo++ | 09:01 |
|
_ikke_
| EugeneKay: It works on saying name: thanks | 09:02 |
|
EugeneKay
| Shush, I'm drunk | 09:02 |
|
_ikke_
| :D | 09:02 |
|
| EugeneKay: When aren't you drunk? | 09:02 |
|
EugeneKay
| _ikke_: thanks | 09:02 |
|
lb
| gitinfo: thanks | 09:02 |
|
gitinfo
| lb: you're welcome, but please note that I'm a bot. I'm not programmed to care. | 09:02 |
|
EugeneKay
| _ikke_ - wednesdays | 09:02 |
|
_ikke_
| EugeneKay: What day is it today? | 09:03 |
|
EugeneKay
| Tuesday night | 09:03 |
|
lb
| ;) | 09:03 |
|
| Somewhere on the internet there's always morning/night/today/yesterday/tomorrow ;) | 09:03 |
|
EugeneKay
| I have to be up in 8 hours to do a product deployment. This isn't gonna end well. | 09:03 |
| → Vile joined | 09:04 |
|
_ikke_
| EugeneKay: Good luck, please let me know how it ended | 09:04 |
| ← harish left | 09:04 |
|
EugeneKay
| Failure is the expected outcome with this client, so I'm covered | 09:04 |
| ← letharion left | 09:04 |
|
_ikke_
| lol | 09:04 |
| ← lcc left | 09:05 |
|
EugeneKay
| I need a name for my submodules-alike command | 09:06 |
|
| git-library doesn't sound right | 09:06 |
| → Advocation_ joined | 09:07 |
| → RaceCondition joined | 09:07 |
|
_ikke_
| git-lib? | 09:08 |
| ← Advocation left | 09:08 |
| Advocation_ → Advocation | 09:08 |
|
_ikke_
| git subproject | 09:08 |
| → gerard0 joined | 09:08 |
|
_ikke_
| git include | 09:08 |
|
EugeneKay
| git include | 09:08 |
|
_ikke_
| :D | 09:08 |
|
EugeneKay
| Heh | 09:08 |
| → john3_ joined | 09:08 |
|
EugeneKay
| I like it | 09:08 |
|
| I've explained the basic concept to you, yes? | 09:09 |
|
_ikke_
| EugeneKay: Nope | 09:09 |
|
EugeneKay
| Same idea as submodules, but instead of including a ref to a URL:SHA, it includes the tree named at the SHA at the path | 09:09 |
|
| The idea being that $USER can git-clone the project and not have to care about any submodule commands | 09:10 |
| → SkAzZ joined | 09:10 |
|
EugeneKay
| No mesys history merging involved, just "Imported foolib at $SHA" | 09:10 |
|
_ikke_
| isn't that the same as subtree merge? | 09:11 |
| ← macivy left | 09:11 |
| → fayimora joined | 09:11 |
|
_ikke_
| !subtree | 09:11 |
|
gitinfo
| The git subtree merge method is ideal to incorporate a subsidiary git repositories directly in to single git repository with "unified" git history, where you only need to pull changes in from external sources not contribute your own changes back (which if technically possible is at least difficult). See http://progit.org/book/ch6-7.html Type "!subtree_alt" for more options | 09:11 |
|
EugeneKay
| Subtree craps up your repo with a bunch of objects/refs from the child repo | 09:11 |
|
| This would store it in .git/includes/FooLib/ | 09:11 |
|
_ikke_
| But the idea is the same? | 09:11 |
|
EugeneKay
| And no keeping of history, at all. | 09:11 |
|
_ikke_
| Ok | 09:12 |
|
EugeneKay
| I don't care about how FooLib got to $SHA, just that I'm including it at that point | 09:12 |
|
_ikke_
| But it's still possible to update FooLib to another $SHA? | 09:12 |
|
EugeneKay
| Sure, if you have the git-include shell script. | 09:12 |
|
_ikke_
| right | 09:12 |
|
EugeneKay
| At the moment I rm FooLib/ -rf, then git-archive a fresh copy from FooLib.git and untar it to FooLib/ | 09:12 |
|
| This would do that.... in a shell script | 09:12 |
|
blami_
| EugeneKay: I wanted to do the same with my project and libraries I developed for it and was angry that git does not support it | 09:13 |
| → xiangfu joined | 09:13 |
|
_ikke_
| EugeneKay: But the result would be the same if you manually cloned the sub repo, and copied the files into the directory and comitted that? | 09:13 |
| → SkAzZ1 joined | 09:13 |
| → letharion joined | 09:13 |
|
_ikke_
| EugeneKay: right | 09:13 |
|
EugeneKay
| _ikke_ - exactly so; I have a local clone of FooLib, which I git-archive from | 09:13 |
|
| blami_ - good to know I'm not the only one with that problem ;-) | 09:14 |
|
_ikke_
| How do you interact with git include? | 09:14 |
|
blami_
| EugeneKay: er. I wanted to say I think I was an idiot in the end :) | 09:14 |
|
EugeneKay
| Define interact. | 09:15 |
|
_ikke_
| EugeneKay: How do you tell it what to checkout exactly | 09:15 |
|
blami_
| EugeneKay: it's far easier to do it using separate repos and git-submodule with wrapper script | 09:15 |
| ← dhruvasagar left | 09:15 |
|
EugeneKay
| I'm thinking to use the same basic syntax as submodules. | 09:15 |
| ← SkAzZ left | 09:15 |
|
EugeneKay
| blami_ - I hate submodules because they require an external URI dependency | 09:15 |
|
| That and they cause AIDS | 09:15 |
|
arex\
| Why do I have a million git.exe and git-remote-http.exe processes running? | 09:16 |
|
blami_
| EugeneKay: for serious development you need some sort of upstream anyways | 09:16 |
|
arex\
| (and sh.exe) | 09:16 |
|
blami_
| EugeneKay: so that's not blocker | 09:16 |
|
EugeneKay
| Sure, but your consumers don't need to care about the upstream. They should be able to git-clone once and be done | 09:16 |
|
| No worrying about submodule update crap | 09:16 |
|
| The tree you publish is the tree people use | 09:16 |
|
| arex\ - I have no idea. WHat are you doing? | 09:17 |
|
teotwaki
| EugeneKay: please, don't use AIDS as a joke, at least, not in this context. There's enough bigotted people on the internet that one doesn't need to add more fuel to that fire. | 09:17 |
| ← thiago left | 09:17 |
|
EugeneKay
| teotwaki - my Uncle has had AIDS since 1986. He's a Univeristy of Washington research case, on the grounds that he refuses to die. I'm a bit desensitized. | 09:18 |
|
| (I was only born in '88) | 09:18 |
|
teotwaki
| EugeneKay: and I had two good friends pass away from it over the last year. The plural of anecdotes != data. | 09:18 |
|
EugeneKay
| teotwaki - sorry to hear that. submoduls still suck. | 09:19 |
|
teotwaki
| oh, yeah, they do. | 09:19 |
|
| just call them black holes or something. | 09:19 |
|
| EugeneKay revises himself | 09:19 |
|
EugeneKay
| That and they eat kittns.. | 09:19 |
|
_ikke_
| EugeneKay: Never though you were as old as I am | 09:19 |
|
teotwaki
| s/old/young/ | 09:20 |
| ← vadi left | 09:20 |
|
_ikke_
| teotwaki: age complex? | 09:20 |
|
EugeneKay
| Old people. Bah! :-p | 09:20 |
|
teotwaki
| I'm from '86! Hah! | 09:20 |
|
| But you youngens haven't hit your quarter century yet | 09:21 |
|
| While for me... that was over 15... months ago! | 09:21 |
| gitinfo set mode: +v | 09:21 |
| ← frogonwheels_ left | 09:22 |
| ← jackh left | 09:22 |
| → jackh joined | 09:23 |
| → specialGuest joined | 09:24 |
| → frogonwheels_ joined | 09:24 |
| → weiyang joined | 09:25 |
| ← lustucru left | 09:25 |
| → tvw joined | 09:25 |
| ← letharion left | 09:26 |
| ← thirdknife left | 09:26 |
| ← weiyang left | 09:27 |
| → Advocation_ joined | 09:27 |
| ← Advocation left | 09:27 |
| Advocation_ → Advocation | 09:27 |
| → patrick85 joined | 09:27 |
| → shruggar joined | 09:27 |
| → jatt joined | 09:29 |
| → dhruvasagar joined | 09:30 |
|
garo
| How can i create a new branch in a rep on github ? (i will use it for commits with code that is not finished yet, so it would be best if no else can see that branch) | 09:30 |
|
_ikke_
| garo: You can't hide anything on a public git repo | 09:30 |
|
| garo: So if you don't want people to see it, don't put it on github | 09:31 |
|
lb
| garo: you'll have to use a private repo for that | 09:31 |
|
| or work local ;) | 09:31 |
|
garo
| i'll just name it BUGGY_DO_NOT_USE than... | 09:32 |
|
| but how can i create it, i can't find a create-new-branch button anywhere... | 09:32 |
|
EugeneKay
| Create it locally, then push it up | 09:33 |
|
lb
| garo: just create it local | 09:33 |
|
arex\
| EugeneKay: nothing special | 09:33 |
| → senny_ joined | 09:34 |
| → letharion joined | 09:34 |
|
garo
| i'm trying "git checkout -b buggy_do_not_use && git push" but it just tells me "Everything up-to-date" | 09:35 |
|
| same with "git push origin" | 09:36 |
|
arex\
| Git Extensions refuses to use putty, it only wants to use OpenSSH :( | 09:36 |
|
| Ideas? | 09:36 |
| ← senny left | 09:36 |
|
lb
| garo: push origin buggy_do_not_use | 09:36 |
|
FauxFaux
| git push -u origin buggy_do_not_use # would be better, so it remembers. | 09:36 |
| → blueyed joined | 09:36 |
|
lb
| arex\: use linux and openssh ;) | 09:36 |
|
garo
| ok, now it works, thanks ! | 09:37 |
|
EugeneKay
| garo - your local $NEWBRANCH is not configured for remote tracking yet. You need to use one of the methods listed above to create it remotely and thus configure the tracking, so the two-word 'git push' will magically work | 09:37 |
|
| (you can, technically speaking, also do it via git-config, but I'm too drunk to look up the exact specs on that) | 09:37 |
|
| (or not drunk enough) | 09:37 |
| → _iron joined | 09:38 |
|
lb
| EugeneKay: go with the 2. option ;) | 09:38 |
| → rob_w joined | 09:38 |
| ← john3_ left | 09:38 |
|
rob_w
| i delete files in my only branch .. how do i get them back ? | 09:38 |
| → john3_ joined | 09:39 |
| ← letharion left | 09:39 |
|
lb
| rob_w: did you commited them? | 09:39 |
| → timthelion joined | 09:39 |
| → vadi joined | 09:40 |
| → pfFredd joined | 09:40 |
| ← fayimora left | 09:41 |
| → hidekin1 joined | 09:42 |
|
rob_w
| lb, yes | 09:43 |
| ← pfFredd left | 09:43 |
| → sirdancealot joined | 09:43 |
|
EugeneKay
| rob_w - man git-checkout; you want to do something like `git checkout $SHA -- foo/bar.txt` | 09:44 |
|
gitinfo
| rob_w: the git-checkout manpage is available at http://git-scm.com/docs/git-checkout.html | 09:44 |
|
lb
| rob_w: git checkout SHATHATCONTAINSTHEFILE -- FILE | 09:44 |
|
EugeneKay
| This will give you foo/bar.txt as it existed at $SHA | 09:44 |
|
rob_w
| kkk thx | 09:44 |
|
EugeneKay
| If you just deleted $FILE in the last commit you can use HEAD~ for $SHA, but see also !treeish | 09:44 |
|
gitinfo
| A tree-ish is something that looks like a tree. Read 'man gitrevisions' and http://git-scm.com/book/en/Git-Tools-Revision-Selection | 09:44 |
| → Lord_DeathMatch joined | 09:45 |
| → letharion joined | 09:47 |
| → Sebo joined | 09:47 |
| ← Sebo left | 09:47 |
|
rob_w
| ok whatif it is not a single file but a alot of and also direcotrys ? is there a way to bring em all back in once | 09:48 |
| → lng joined | 09:49 |
|
EugeneKay
| checkout will take a dir/, too | 09:49 |
| → Sebo joined | 09:49 |
|
lng
| hi! user A created branch A and pushed. After that, how come User B can see that branch without knowing its name? | 09:50 |
|
EugeneKay
| Because git doesn't do any sort of access control. If you can read refs/heads/Foo, you can get Foo | 09:51 |
|
| Are you using gitolite? | 09:51 |
| ← jackh left | 09:51 |
|
lng
| GitLab | 09:52 |
|
EugeneKay
| Which uses gitolite underneath | 09:52 |
|
lng
| I don't want to pull it to my current branch | 09:52 |
|
EugeneKay
| There is no (sane) way to restrict reads on a per-branch basis with the standard git stack, which gitolite/gitlab use. | 09:52 |
|
_ikke_
| lng: How are you pulling it? | 09:52 |
|
lng
| first I'd like to list it | 09:53 |
|
| git branch -r | 09:53 |
|
| it doesn't show it | 09:53 |
|
_ikke_
| lng: git fetch <remote> | 09:53 |
|
lng
| maybe I need to add remote of that user? | 09:53 |
|
| oh | 09:53 |
|
_ikke_
| lng: Does that user have it's own branch? | 09:54 |
|
lng
| _ikke_: yes | 09:54 |
|
| uniq one | 09:54 |
|
| say I don't know its name | 09:54 |
|
| and want to list users branches | 09:54 |
|
_ikke_
| lng: Don't know what name? | 09:55 |
|
lng
| branch name | 09:55 |
|
_ikke_
| git ls-remote lists all refs on the remote | 09:55 |
| ← specialGuest left | 09:55 |
|
lng
| it might be something like develop/[TaskName] | 09:56 |
|
| _ikke_: after I know the branch name, do I fetch it, right? | 09:56 |
|
| and it does not change the branch I'm currently working in? | 09:56 |
| → mklappstuhl joined | 09:57 |
|
lng
| I don't want to merge it | 09:57 |
| → guampa joined | 09:57 |
| → achadwick joined | 09:57 |
|
lng
| actually, I just want to make it local and switch to it | 09:57 |
|
| to see code | 09:57 |
|
| one detail, the user pushed this branch to bare repo | 09:58 |
| ← fedesilva left | 09:58 |
|
lb
| lng: git fetch, git checkout $branch | 09:59 |
|
lng
| I see, thanks! | 09:59 |
| ← tvw left | 09:59 |
|
lb
| lng: !fetchfour | 09:59 |
|
gitinfo
| lng: Never use the four-word version of git-fetch or git-pull (e.g. git fetch remote refspec). It always ends in tears. Yes, if you understand the implications of FETCH_HEAD it can technically be done, but really it is easier to just fetch the whole remote (or perhaps edit the fetchspec if you never want other bits). If you must, see !fetch4why | 09:59 |
| ← vadi left | 10:00 |
|
lb
| just do a git fetch | 10:00 |
|
_ikke_
| lng: note that git automatically creates the local branch because it sees a branch <remote>/<branch> | 10:00 |
|
lng
| now I can see it | 10:00 |
| ← RaceCondition left | 10:00 |
|
lng
| why did not pull expose it before? | 10:01 |
| → RaceCondition joined | 10:01 |
|
lng
| ah I | 10:01 |
|
| know why | 10:01 |
|
| because I used another branch name | 10:01 |
|
_ikke_
| lng: You don't want to use pull for that | 10:01 |
|
lng
| yes | 10:02 |
|
| as it will merge | 10:02 |
|
| right? | 10:02 |
| → frsk joined | 10:02 |
|
lb
| yes | 10:02 |
|
| !pull | 10:03 |
|
gitinfo
| pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/ | 10:03 |
|
lng
| yep | 10:03 |
| → PapaSierra2 joined | 10:03 |
| ← dhruvasagar left | 10:04 |
| → thiago joined | 10:05 |
|
lng
| thanks all of you, guys | 10:05 |
|
lb
| yw | 10:05 |
| ← Sebo left | 10:06 |
| ← PapaSierra2 left | 10:07 |
| → stevedomin joined | 10:08 |
|
lng
| `git checkout analytics` -> Branch analytics set up to track remote branch analytics from origin. | 10:10 |
|
| ``git checkout analytics` -> Branch analytics set up to track remote branch analytics from origin. | 10:10 |
|
| oops | 10:10 |
|
| is it correct? | 10:10 |
| → cybersphinx joined | 10:11 |
|
lng
| looks good | 10:11 |
|
FauxFaux
| Feels good. | 10:11 |
| → seanw joined | 10:14 |
| → flexd joined | 10:14 |
|
seanw
| What does it mean if "forced update" is followed by "already up-to-date"? That I haven't lost anything? | 10:14 |
| → k-man joined | 10:15 |
|
_ikke_
| seanw: forced update == push -f? | 10:15 |
| ← gavin_huang left | 10:15 |
|
seanw
| _ikke_: no, there was no forced push, but one day I pulled from my repo that only I write to and I got a forced update message. | 10:16 |
| → jacobian joined | 10:16 |
| → gavin_huang joined | 10:16 |
|
jacobian
| How do I make it so I can just write: git push, rather than git push origin master? | 10:16 |
|
seanw
| _ikke_: I just want to ensure that I haven't lost anything. | 10:16 |
| → dvide joined | 10:17 |
|
charon
| seanw: you can look in the reflog of the remote branch to see what the forced update was about | 10:17 |
|
| seanw: e.g., git reflog show origin/master | 10:17 |
| ← Lord_DeathMatch left | 10:18 |
|
_ikke_
| jacobian: git push -u origin master | 10:18 |
|
seanw
| charon: it says 8fc53c5 refs/remotes/origin/master@{3}: pull : forced-update | 10:18 |
|
charon
| seanw: well, the line before that tells you what the ref was before the update | 10:19 |
|
| seanw: so you can use the two sha1s with 'gitk A...B' or some such | 10:20 |
| → gusnan joined | 10:20 |
| → Sebo joined | 10:20 |
| → Lord_DeathMatch joined | 10:20 |
|
seanw
| charon: so changes shown there are what is potentially lost? And if those changes aren't lost, then I haven't lost anything? | 10:20 |
|
lng
| I love Git more and more - it is owesome SCM! | 10:21 |
|
lb
| lng: stay with it, you'll get so much fun | 10:21 |
|
lng
| yea, we use it | 10:21 |
|
| before my needs were simple | 10:21 |
|
| but now we started to use branching and many other things | 10:22 |
|
| my mind is expanding | 10:22 |
|
charon
| seanw: the A...B syntax shows the changes on *either* side of the update, so you'll have to look carefully (you can also use A..B to get only one side) | 10:22 |
|
lng
| lng: I need to be careful pulling something as it might spoil code | 10:23 |
| → udantee joined | 10:24 |
|
seanw
| charon: if I do gitk A..B where A is the hash below the forced-update in the reflog and B is the forced-update line, I get no commits. That means there was nothing locally to be affected by the forced-update? | 10:24 |
|
_ikke_
| lng: Note that you need to be careful with pull, it'll create merges everytime you pull in new history, and it can't be fast-forwarded. | 10:26 |
| → thirdknife joined | 10:26 |
| ← gavin_huang left | 10:27 |
| ← xiangfu left | 10:27 |
| → soee_ joined | 10:29 |
| ← soee left | 10:29 |
| → hollyw00d joined | 10:30 |
| ← thirdknife left | 10:30 |
| → fireh joined | 10:31 |
| ← dc5ala left | 10:32 |
| ← nirix left | 10:34 |
| → narfnarfnarf joined | 10:34 |
| ← hollyw00d left | 10:34 |
| → dhruvasagar joined | 10:36 |
| ← Lord_DeathMatch left | 10:36 |
| → Lord_DeathMatch joined | 10:36 |
| → ollieglass joined | 10:37 |
| ← sirdancealot left | 10:37 |
| → sirdancealot joined | 10:38 |
| → iocor joined | 10:39 |
| ← RaceCondition left | 10:39 |
| → RaceCondition joined | 10:40 |
| → Chib joined | 10:41 |
| gitinfo set mode: +v | 10:41 |
|
ollieglass
| Could someone explain what these red blocks are? git diff is showing them https://twitter.com/ollieglass/status/238224121576685568/photo/1 | 10:41 |
|
FauxFaux
| ollieglass: Whitespace errors, including mixing tabs and spaces, and whitespace at the end of the line. | 10:42 |
|
ollieglass
| They appear when I clone a project. Are they being added, because of my local git config? | 10:42 |
| → thirdknife joined | 10:43 |
|
FauxFaux
| Hilighting what git considers errors is enabled by default, I think. Why do you care? | 10:43 |
| → babilen joined | 10:44 |
| ← Lord_DeathMatch left | 10:44 |
| ← paolooo left | 10:44 |
| ← thirdknife left | 10:44 |
| → Lord_DeathMatch joined | 10:44 |
| → thirdknife joined | 10:44 |
|
ollieglass
| I'm running a script that installs a lot of dependencies. One of them fails with ""doctrine-dbal" has local modifications. Please revert or commit/push them before running this command again." | 10:45 |
| → paolooo joined | 10:45 |
|
ollieglass
| This is the modification that git diff shows. | 10:45 |
| → sebbo joined | 10:45 |
| ← arkiver left | 10:45 |
|
ollieglass
| It's (a) causing the whole installation to fail and (b) is something I've not seen before | 10:45 |
|
FauxFaux
| It's not just the redness that's a local modification, it looks like a load of the file is modified. Perhaps even the whole file? In that case, it's normally core.autocrlf at fault. | 10:46 |
|
seanw
| charon: I've now realised that I hvae a circle. git reflog shows that the repo went 8fc53c5, 805d6cc, 8fc53c5. Any ideas how that could have occured? Thanks for your help so far. | 10:47 |
|
| (sorry this is origin/master) | 10:47 |
|
FauxFaux
| seanw: That's not a circle, that's a rollback; i.e. a !rewrit | 10:48 |
|
gitinfo
| seanw: [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config) | 10:48 |
| → landypro joined | 10:48 |
| → pretty_function joined | 10:48 |
|
seanw
| FauxFaux: I am the only person writing to thsi repo and I definitely haven't rewritten any public history. I just pull, merge, commit and push. | 10:49 |
| ← sebbo left | 10:52 |
| ← letharion left | 10:54 |
|
ollieglass
| FauxFaux: in this case it seems to be an issue with core.whitespace. Thanks for your help | 10:54 |
| ← jonnu left | 10:55 |
| ← w09x left | 10:55 |
| → gavin_huang joined | 10:57 |
| → arkiver joined | 10:57 |
| → beepbeep_ joined | 10:58 |
| ← hyperair left | 10:59 |
| ← landypro left | 11:00 |
|
beepbeep_
| I'm trying to checkout a certain branch. I have succesfully checked out the master branch. When I type git branch, I see the master branch and I see that I'm on it, I do not see any other branches. I assume this is because I don't have the other branches locally yet. So, I look at github and I see branch "foo" and type git checkout -b foo. I get following msg: fatal: git checkout: updating paths | 11:00 |
|
| is incompatible with switching branches. Did you intend to checkout 'foo' which can not be resolved as commit? | 11:00 |
| ← seanw left | 11:01 |
| ← dr_lepper left | 11:02 |
|
cmn
| you don't see the branches because they're not local branches, you have a bunch which are remote-tracking, use -r to see them | 11:04 |
| → letharion joined | 11:04 |
|
cmn
| also, checkout -b won't do what you seem to want | 11:04 |
|
beepbeep_
| I simply want to checkout the branch and commit to it | 11:04 |
|
| push to it* | 11:04 |
|
cmn
| there's nothing stopping you, but you need to tell git that | 11:05 |
|
beepbeep_
| How? :p | 11:05 |
|
cmn
| you use git checkout -t <remote>/<branch> | 11:05 |
|
| also, read the !book | 11:05 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 11:05 |
|
cmn
| which explains what this is about | 11:05 |
|
beepbeep_
| ty! | 11:05 |
|
| I'll definitely looking up | 11:05 |
|
| Look it up* .. wow. | 11:06 |
| → Jay_Levitt joined | 11:07 |
| → DanyO83 joined | 11:08 |
|
arkiver
| I got a conflict for a file and then i resovled that conflict and then commited it. Now i am getting error as : "error: you need to resolve your current index first" | 11:08 |
|
| How do I get rid of that error ? | 11:08 |
|
_ikke_
| arkiver: !repro | 11:09 |
|
gitinfo
| arkiver: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting. | 11:09 |
| → albel727 joined | 11:09 |
| → RaceCondishun joined | 11:10 |
|
arkiver
| I wanted to pull some changes, so i stashed, then i pulled and then i poped the stash. A conflict arised in one of the files. I resolved that conflict and commited as "resolved conflict" | 11:10 |
|
| after that i popped my stash | 11:10 |
| → flijten1 joined | 11:10 |
|
arkiver
| and am getting this | 11:10 |
|
| app/models/booking.rb: needs merge | 11:10 |
|
| error: you need to resolve your current index first | 11:10 |
|
_ikke_
| what does git status show? | 11:11 |
| → beautifulmind joined | 11:11 |
|
arkiver
| there is a file in "unmerged paths" | 11:11 |
|
| and another file in "not staged for commit" | 11:11 |
| ← d3vic3 left | 11:11 |
|
_ikke_
| arkiver: Probably nothing was comitted then | 11:11 |
| ← flijten left | 11:12 |
|
arkiver
| BUt i can see the commit in the git log | 11:12 |
|
_ikke_
| Hmm | 11:12 |
|
| Then only part was commited | 11:12 |
|
| You have to git add the file before it get's resolved | 11:12 |
| → d3vic3 joined | 11:13 |
| ← RaceCondition left | 11:13 |
| RaceCondishun → RaceCondition | 11:13 |
| → jceb_ joined | 11:14 |
| ← ollieglass left | 11:17 |
| ← d3vic3 left | 11:17 |
|
jacobian
| _ikke_ Thanks! | 11:19 |
| → berserkr joined | 11:19 |
|
_ikke_
| jacobian: You're welcome | 11:19 |
| ← xxc_michael left | 11:19 |
| ← Lord_DeathMatch left | 11:20 |
| → Lord_DeathMatch joined | 11:20 |
| → zdk joined | 11:24 |
| ← zdk left | 11:24 |
| ← jacobian left | 11:27 |
| ← RaceCondition left | 11:28 |
| ← stevedomin left | 11:29 |
| → beakor joined | 11:30 |
|
beakor
| hello mates | 11:30 |
|
gitinfo
| beakor: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here. | 11:30 |
| → hollyw00d joined | 11:30 |
| ← thirdknife left | 11:31 |
| → nizeguy joined | 11:32 |
| → RaceCondition joined | 11:32 |
| ← sirdancealot left | 11:32 |
| ← noelbush left | 11:33 |
| ← letharion left | 11:33 |
| ← RaceCondition left | 11:33 |
| ← hollyw00d left | 11:35 |
| ← arkiver left | 11:36 |
| → flijten joined | 11:37 |
| ← Guest84686 left | 11:38 |
| → dr_lepper joined | 11:38 |
| ← dr_lepper left | 11:38 |
| → dr_lepper joined | 11:38 |
| ← ak5_ left | 11:38 |
|
beakor
| I've added a new file to my repo, but `git status` says I've renamed one of my old files into that new file, and then modified the old file. should I be concerned? | 11:38 |
| ← flijten1 left | 11:39 |
|
cmn
| no | 11:39 |
|
OMGOMG
| concerned with drying your code, perhaps | 11:39 |
| → joelataylor joined | 11:39 |
|
cmn
| it's just a heuristic | 11:39 |
| ← joelataylor left | 11:41 |
|
archdori
| hi there. I wish to have colors when doing a git blame. it opens less, so where could I specify "less -R" instead for git blame ? | 11:41 |
| → Ryback_ joined | 11:43 |
|
aboudreault
| I've just cherry picked a commit from master in my branch. why git push is telling me that everything is up-to-date? | 11:43 |
| → dwmw2_gone joined | 11:43 |
| → maxthoursie joined | 11:43 |
| → thirdknife joined | 11:43 |
|
aboudreault
| I see it in my git log too. | 11:43 |
| → sgambino joined | 11:44 |
|
cmn
| aboudreault: see man git config push.default | 11:44 |
|
gitinfo
| aboudreault: the git-config manpage is available at http://git-scm.com/docs/git-config.html | 11:44 |
| → specialGuest joined | 11:45 |
| → sirdancealot joined | 11:45 |
| → StefanK joined | 11:45 |
|
lb
| cmn: is the git push four word syntax as bad as the git fetch four ? | 11:46 |
|
cmn
| no | 11:46 |
| → letharion joined | 11:46 |
|
aboudreault
| cmn, I've used git push origin branch--2 | 11:46 |
|
lb
| thanks | 11:46 |
|
cmn
| and it tells you that branch--2 is up-to-date? check what ls-remote says | 11:47 |
|
aboudreault
| cmn, ha wait.... looks like git cherry-pick pushed too. | 11:47 |
| → dwmw2_go` joined | 11:47 |
| ← dwmw2_gone left | 11:48 |
|
aboudreault
| cmn, , arf nvm.... another developer had made the requested change and pushed an hour ago >:|. nvm | 11:48 |
|
_ikke_
| aboudreault: :) | 11:48 |
|
lb
| aboudreault: ^^ | 11:48 |
|
cmn
| that makes no sense... the commit wouldn't be the same | 11:48 |
|
lb
| cmn: if he cherry picks? | 11:48 |
|
| why not? | 11:49 |
|
cmn
| if he does anything | 11:49 |
|
| because it's not the same commit | 11:49 |
|
| the metadata is different | 11:49 |
|
beakor
| I love git | 11:49 |
|
lb
| Oo | 11:49 |
|
beakor
| `git blame` who came up with that gem :D | 11:49 |
|
_ikke_
| lb: git cherry-pick basically creates a new commit with the same changes as the original commit | 11:49 |
|
cmn
| beakor: the CVS developers | 11:50 |
| → hwrd|work joined | 11:50 |
|
lb
| ahha | 11:50 |
| → stevedomin joined | 11:50 |
|
StefanK
| Hi, I figure this is the right place to ask if it's possible to add a submodule to a specific directory in another repository? | 11:50 |
|
lb
| StefanK: !submodule | 11:51 |
|
gitinfo
| StefanK: git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://book.git-scm.com/5_submodules.html | 11:51 |
| → fisted joined | 11:51 |
| → ReekenX joined | 11:51 |
|
lb
| _ikke_: and git does a hash to the metadata like author and stuff? | 11:51 |
|
StefanK
| lb: What should I be using instead of a submodule? | 11:52 |
|
cmn
| nobody said you shouldn't | 11:52 |
| ← letharion left | 11:53 |
|
_ikke_
| lb: Yes, the hash is calculated over the content, and over the metadata | 11:53 |
|
cmn
| but you'll have to explain what you mean by "in another repository" | 11:53 |
| ← thirdknife left | 11:53 |
|
_ikke_
| lb: Note that even content is different for a commit that introduces the same chagnes | 11:54 |
|
cmn
| what's the first repo and why does it matter? | 11:54 |
| → agileadam joined | 11:54 |
|
lb
| _ikke_: yeah, but if both devs start at the same sha, cherry picking the same different sha, then the content should be identical. not ? | 11:55 |
|
_ikke_
| lb: the same different sha? | 11:55 |
| → giallu joined | 11:56 |
| → diegoviola joined | 11:56 |
|
lb
| _ikke_: knew that ;) sha2 | 11:56 |
| → geekbri joined | 11:56 |
|
lb
| both do "git cherry-pick $sha2" | 11:56 |
| → arkiver joined | 11:56 |
|
StefanK
| cmn: ok, so my use case is the following, I have a few repos with a vagrant file and a puppet directory as well as application code. I would ideally like to add each projects puppet directory to a larger puppet repo with the name of the project it originated from. make sense? | 11:57 |
|
lb
| _ikke_: i'm just reading it . thanks anyway | 11:57 |
| ← beakor left | 11:58 |
|
cmn
| ok, but you can't have a subdir as a submodule | 11:59 |
|
| I mean, a submodule is a repo, not some subset of one | 11:59 |
| ← Lord_DeathMatch left | 11:59 |
| → Lord_DeathMatch joined | 12:00 |
|
StefanK
| cmn: ok, that's all I needed to know. I probably just move the puppet subdirs to their own repos and add those as submodules in both projects. Thanks | 12:00 |
|
cmn
| you can have unconnected branches if having one repo is simpler | 12:01 |
| → letharion joined | 12:01 |
|
_ikke_
| lb: Well, even if the content is the same, they'll end up with different commits | 12:01 |
|
| lb: different author, different time of comitting | 12:01 |
|
lb
| _ikke_: yeah just reading that stuff. i obey master i obey | 12:01 |
| → zdk joined | 12:01 |
|
archdori
| no way to get git blame rendered with colors then ? | 12:02 |
|
cmn
| with your editor/IDE, probably | 12:03 |
| ← Lord_DeathMatch left | 12:03 |
| ← arkiver left | 12:03 |
|
cmn
| what colours do you want? | 12:03 |
| → Lord_DeathMatch joined | 12:03 |
|
archdori
| cmn: my question was how can I specify to git to use "less -R" instead of the current less | 12:03 |
|
cmn
| see core.pager | 12:04 |
|
archdori
| not sure what colours I want... need to try and I'll see if I like them | 12:04 |
|
| ok thanks ! | 12:04 |
|
cmn
| less also has LESSOPTS or some env var | 12:04 |
|
| erm... | 12:04 |
| ← tsdh left | 12:04 |
|
cmn
| where do these colours come from? | 12:04 |
| → titaniumNoob joined | 12:06 |
| ← hwrd|work left | 12:07 |
|
archdori
| hmm less -R doesn't print colors, will search the LESSOPTS | 12:07 |
| → quazimodo joined | 12:08 |
| ← zdk left | 12:09 |
| → arkiver joined | 12:09 |
| → skyf joined | 12:09 |
|
_ikke_
| archdori: does git blame even output colors? | 12:10 |
| → gtrak joined | 12:10 |
|
cmn
| no | 12:10 |
|
| because there is nothing to show | 12:10 |
| ← quazimodo left | 12:10 |
|
cmn
| it would only print them out if you could convince it to output raw control codes that were in a file you were blaming | 12:11 |
|
_ikke_
| And why would there be raw control codes in the file you are blaming? | 12:11 |
|
archdori
| right I have to define rules for git blame to display colors | 12:12 |
| ← Lord_DeathMatch left | 12:12 |
| → neurodrone joined | 12:12 |
| → maloik joined | 12:12 |
| → bartek joined | 12:12 |
|
archdori
| emacs has vc-annotate http://www.saltycrane.com/blog/2011/05/colorized-interactive-git-blame-emacs-vc-annotate/ | 12:12 |
|
| but I only use vim & less | 12:12 |
|
maloik
| I made a commit to the wrong branch, but it hasnt been pushed yet... is there a way to undo it ? | 12:12 |
|
cmn
| _ikke_: I dunno, I'm just saying that's how you'd get them | 12:13 |
| → Lord_DeathMatch joined | 12:13 |
| → jalama joined | 12:14 |
|
cbreak-work
| maloik: git reset --soft HEAD~1 | 12:14 |
|
| that'll remove the newest commit in the current branch | 12:15 |
|
maloik
| remove it, and unstage the changes ? | 12:15 |
|
cbreak-work
| no | 12:15 |
|
| if you want to unstage changes as well, use --mixed instead of --soft | 12:16 |
| → leoj3n joined | 12:16 |
|
maloik
| cbreak-work: I just did it with soft, but it seems the commit is still there, is that possible ? | 12:16 |
|
archdori
| got it, I can use :Gblame from vim with fugitive, gives nice colors | 12:17 |
|
cmn
| this still doesn't explain why you thought you could get git-blame to show colours | 12:18 |
|
cbreak-work
| maloik: it should vanish if you do what I wrote | 12:18 |
|
| how did you check wether it's still there? | 12:19 |
|
| (also check git reflog) | 12:19 |
|
esc
| you can also use tig for that | 12:19 |
|
maloik
| gitx, and I did refresh :-) however its displaying on origin, despite my push failing as I had to pull changes first | 12:19 |
|
esc
| it will show nice blame view with colors | 12:19 |
|
maloik
| hmm in reflog it does seem to be gone | 12:20 |
|
cmn
| so will git gui blame, but none of this that is git-blame | 12:20 |
|
leoj3n
| When resolving a merge (http://goo.gl/25eH5) how should I edit the text that begins with "<<<<<<< HEAD:file.txt" ? | 12:20 |
|
cbreak-work
| maloik: if you pushed, then it's pushed | 12:20 |
|
| reset won't change origin | 12:21 |
|
cmn
| leoj3n: see man git merge, it explains the representation | 12:21 |
| ← nizeguy left | 12:21 |
|
gitinfo
| leoj3n: the git-merge manpage is available at http://git-scm.com/docs/git-merge.html | 12:21 |
|
cbreak-work
| just the local branch | 12:21 |
|
maloik
| cbreak-work: but the push failed ? | 12:21 |
|
cbreak-work
| maloik: no | 12:21 |
|
| it'd just fail if you pushed | 12:22 |
| ← jatt left | 12:22 |
|
maloik
| what? :-) | 12:22 |
|
cbreak-work
| maloik: do a git log | 12:22 |
|
| do you see the commit? | 12:22 |
|
maloik
| no I do not | 12:23 |
|
cbreak-work
| then it's gone. | 12:23 |
|
maloik
| so why is it still being shown on origin in my gitx ? | 12:23 |
|
cbreak-work
| that's just what's on the other repo | 12:23 |
|
| as I said, git reset only changes local branches | 12:23 |
| → nizeguy joined | 12:23 |
|
maloik
| I know, but when I pushed, it said I had to do a pull first, so the push failed ? | 12:24 |
|
cbreak-work
| yes. | 12:24 |
|
maloik
| I'd expect it wouldnt show up remotely if it failed :o | 12:24 |
| ← arkiver left | 12:24 |
|
cbreak-work
| because there was history on the remote that you don't have locally | 12:24 |
|
| you must have previously pushed it | 12:24 |
|
maloik
| hold on im going to get you a screenshot and explain properly :) | 12:24 |
|
cbreak-work
| before reseting it away | 12:24 |
|
| even though you claimed you didn't | 12:25 |
| ← jalama left | 12:25 |
|
leoj3n
| Can i edit the files using vi, by hand, or do i need to use a mergetool? | 12:26 |
| → Guest39198 joined | 12:26 |
|
cbreak-work
| you can | 12:27 |
|
leoj3n
| how would i do it by hand | 12:27 |
|
cbreak-work
| once you are done resolving conflicts, tell git about that by git adding the files | 12:27 |
|
| make the file look like you want it to look | 12:27 |
|
leoj3n
| would i leave all the >>>>>>> stuff? | 12:27 |
|
cbreak-work
| only if you want to keep them. | 12:27 |
|
leoj3n
| lol ok thanks | 12:28 |
| → Guest84686 joined | 12:28 |
| → RaceCondition joined | 12:29 |
| ← nizeguy left | 12:29 |
| → pfFredd joined | 12:30 |
| → nizeguy joined | 12:30 |
| ← bartek left | 12:30 |
| → freeed joined | 12:31 |
| ← marthinal left | 12:31 |
| ← Guest39198 left | 12:31 |
| ← Chib left | 12:31 |
|
maloik
| cbreak-work: if you have time to take a look... https://gist.github.com/e1cbc123eaba897c4b61 | 12:32 |
|
| basically what I want to do is commit the changes I made to master, then put production and master on the same 'level' before I deploy | 12:33 |
| → TrafeX joined | 12:33 |
| ← harshpb left | 12:33 |
| → erichynds joined | 12:33 |
| → roflin joined | 12:34 |
| → nigelb joined | 12:34 |
| ← pretty_function left | 12:34 |
| → pretty_function joined | 12:34 |
| → architekt joined | 12:34 |
| ← RaceCondition left | 12:34 |
| → Artemis_ joined | 12:35 |
| → haf joined | 12:36 |
|
Artemis_
| Is there a way to save the current commit has in a file? Like $REV$ in Subversion? | 12:36 |
|
_ikke_
| Artemis_: Although there is a way, the question is, why do you need / want that? | 12:37 |
| → jalama joined | 12:37 |
|
_ikke_
| Artemis_: Although, you can't store that inside git itself | 12:37 |
|
lb
| maloik: you're branches have diverged now? i would merge origin/master into master, then merge origin/production into master, then merge master into production and push both. | 12:39 |
|
Artemis_
| _ikke_: What do you mean: not store inside git? Reason to have this: We write csv files in a git repository - every time we update the file with changed/additional data we commit it to git | 12:40 |
|
_ikke_
| Artemis_: The commit hash is based on the content of the commit. If you should add the hash to the content, the hash changes | 12:40 |
|
Artemis_
| In out application we read the file into our database - but we want to know which version of the file we have in our database right now | 12:40 |
|
cmn
| if you have a database anyway, store it alongside | 12:41 |
| → RaceCondition joined | 12:42 |
|
Artemis_
| cmn: store what alongside? | 12:42 |
|
cmn
| this extra information, the version of th file | 12:42 |
|
Artemis_
| but the question is where do I get the version from if not from the imported file? | 12:43 |
| ← sangi left | 12:43 |
|
cmn
| from whatever process you use to store the file | 12:43 |
| → rohan32 joined | 12:43 |
|
cmn
| hm, wait, you want to store the commit's hash inside a file in the commit? that's impossible | 12:45 |
| → Progster joined | 12:45 |
| → ph^ joined | 12:46 |
|
cmn
| you can use $Id$ but that doesn't tell you what commit it's at | 12:46 |
| ← mischat left | 12:46 |
|
cmn
| because it can be in anything from one to several million commits | 12:46 |
| ← maxthoursie left | 12:47 |
|
Artemis_
| ok thanks - didn't think about the commit hash being based on the content | 12:47 |
| → maxthoursie joined | 12:47 |
|
cmn
| this really sounds like an !xy problem anyway | 12:48 |
|
gitinfo
| This sounds like an "XY Problem" http://mywiki.wooledge.org/XyProblem So let's step back for a minute. What are you actually trying to achieve? Why are you doing it this way? | 12:48 |
|
Artemis_
| I think we should stick with giving the file a new name every time it is computed | 12:48 |
|
cmn
| this isn't for backup | 12:48 |
| ← jalama left | 12:48 |
| ← pretty_function left | 12:48 |
|
_ikke_
| and also !UGFWIINI | 12:48 |
|
gitinfo
| You appear to be Using Git For What It Is Not Intended - https://www.google.com/search?q=UGFWIINI Are you sure git is the right tool for the job? See also !wrong | 12:48 |
| → pretty_f_ joined | 12:48 |
| → thomasfr joined | 12:48 |
| ← haf left | 12:50 |
| → haf joined | 12:50 |
|
Artemis_
| Ok, what we are doing is the following: We have an application with a database - then we have a R program which calculates data and outputs them into a csv file | 12:50 |
|
| those csv files change like every week | 12:50 |
|
maloik
| if I have a branch that's behind master, do I need to check that out and merge master, or checkout master and merge the branch to bring it up to date ? | 12:50 |
|
cmn
| that means it's generated data, no? | 12:51 |
|
Artemis_
| we import the csv into the database - but we want to keep the old versions of the csv output to be able to revert the database to a certain point | 12:51 |
| → Sajaki joined | 12:51 |
|
cmn
| right, that's pretty much the definition of a database | 12:52 |
|
Artemis_
| therefore we also want to know which version we currently have in our database | 12:52 |
|
cmn
| of a backup, sory | 12:52 |
|
| but you said the csv file doesn't have the db contents | 12:53 |
|
haf
| Hi there | 12:54 |
| ← OOPMan left | 12:54 |
|
haf
| Does somebody know how to get the very latest git on ubuntu - e.g. where an updated ppa is? | 12:54 |
|
cmn
| grab the source | 12:55 |
|
haf
| I want packages. | 12:55 |
|
gitinfo
| haf: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here. | 12:55 |
|
haf
| So that I can manage it with my package manager... | 12:55 |
|
| Is that possible from source? | 12:55 |
| → revagomes joined | 12:55 |
|
Artemis_
| cnm: The way it works: input file from somewher -> R -> output csv -> our app -> database | 12:55 |
|
cmn
| you can create a package out of the source, or update the source in the package | 12:56 |
| → pinguinux joined | 12:56 |
|
haf
| What commands do I run to create a package from the source? | 12:57 |
| → tango_ joined | 12:57 |
| ← pinguinux left | 12:57 |
| → draginx joined | 12:57 |
|
cmn
| I don't create new packages often enough to remember off the top of my head | 12:58 |
| gitinfo set mode: +v | 12:58 |
|
cmn
| have you searched for a git ppa? | 12:58 |
| ← pfFredd left | 12:58 |
|
haf
| yes, quite a lot | 12:58 |
|
| and I haven't been able to find an updated one | 12:58 |
| → FreeArtMan joined | 12:58 |
|
cmn
| and what does updated mean for you? | 12:58 |
|
haf
| It means something that contains gitsubtree | 12:59 |
|
| seems like >= 1.7.11.4 | 12:59 |
|
| and ubuntu ships 1.7.11.3 | 12:59 |
|
| of course... | 12:59 |
| ← Lord_DeathMatch left | 13:00 |
| → Lord_DeathMatch joined | 13:00 |
| → jackh joined | 13:00 |
|
cmn
| a patch-release wouldn't include such a feature as new | 13:00 |
|
adhawkins
| haf: Does this help? | 13:01 |
|
| https://help.ubuntu.com/community/CompilingEasyHowTo | 13:01 |
|
cmn
| it shipped with 1.7.11 | 13:01 |
| → cannonball joined | 13:01 |
|
cmn
| if the ubuntu maintainers don't want to include git-subtree, an updated package won't help | 13:01 |
| → ngirard joined | 13:02 |
|
lb
| ubuntu 12.04: $ git --version | 13:02 |
|
| git version 1.7.9.5 | 13:02 |
| → RaceCondishun joined | 13:02 |
|
haf
| lb: yes, and I need x.x.x.14 for subtree | 13:03 |
|
| I've already tried a PPA, that's probably why it's higher | 13:03 |
|
cmn
| and you know that for a fact? | 13:03 |
|
adhawkins
| haf: I think you're missing the point. | 13:03 |
|
| haf: What exactly does git --version show on your machine? | 13:03 |
|
cmn
| how have you come to that conclusion? | 13:03 |
|
haf
| As I told you, I have 1.7.11.3 | 13:04 |
|
| through that command | 13:04 |
| → stevedomi joined | 13:04 |
| ← RaceCondishun left | 13:04 |
|
adhawkins
| But lb says that his ubuntu has 1.7.9.5 | 13:04 |
|
| And cmn is saying that an upgrade from 1.7.11.3 to 1.7.11.14 wouldn't add subtree | 13:04 |
| → glennpratt joined | 13:04 |
| → Davey joined | 13:04 |
| → RaceCondishun joined | 13:04 |
|
adhawkins
| As subtree was added in 1.7.11 | 13:04 |
| ← stevedomin left | 13:05 |
|
cmn
| how have you come to the conclusion that this piont-release will bring subtree? | 13:05 |
|
haf
| It gives git: 'subtree' is not a git command. See 'git --help'. | 13:05 |
|
cmn
| so? | 13:05 |
|
haf
| So, it's obviously wrong that 1.7.11.0 added subtree; at least that's what it seems to me, since I have a version higher than that, and I don't have subtree | 13:06 |
| ← RaceCondition left | 13:06 |
| RaceCondishun → RaceCondition | 13:06 |
|
adhawkins
| haf: Or ubuntu's maintainers decided to package 1.7.11.x without subtree support | 13:06 |
| ← RaceCondition left | 13:06 |
|
adhawkins
| cmn: Is subtree a build option? | 13:06 |
|
cmn
| haf: I already told you that's not the reason | 13:06 |
|
adhawkins
| (i.e. can it be turned off in the build?) | 13:06 |
|
cmn
| it's in contrib | 13:07 |
|
| you need to install it extra | 13:07 |
|
adhawkins
| Ah ok, so it sounds like the ubuntu packagers didn't do that. | 13:07 |
|
cmn
| right | 13:07 |
|
| haf: I have 1.7.12 and I don't have subtree | 13:07 |
|
| this has nothing to do with the minor release you're obsessed about | 13:07 |
|
haf
| ok, right, so then the question becomes, how do I install from source w/ contrib support. | 13:07 |
|
adhawkins
| https://launchpad.net/~ivan1986/+archive/ppa/+build/2404580 | 13:07 |
|
| Any help? | 13:08 |
| → Chib joined | 13:08 |
| → macabre joined | 13:08 |
| ← Artemis_ left | 13:08 |
|
cmn
| contrib support? | 13:08 |
| ← tango_ left | 13:08 |
|
haf
| adhawkins: perhaps, except I'm not on 32 bits and I don't know what that package really does. | 13:09 |
|
| cmn: yes, how do I compile the contrib things into git? | 13:09 |
|
cmn
| haf: apt-get source git, then go into contrib/subtree and read the instructions | 13:09 |
|
adhawkins
| Nor me, I just googled it. | 13:09 |
|
| Maybe you need to ask in #ubuntu? (if it exists) | 13:09 |
|
haf
| adhawkins: ok, thanks | 13:09 |
|
cmn
| "contrib things" isn't something you install | 13:09 |
|
haf
| cmn: seems on adhawkins like that | 13:09 |
|
lb
| adhawkins: its on irc.ubuntu.com | 13:09 |
|
cmn
| what's on him? | 13:09 |
| → hyperair joined | 13:09 |
|
haf
| then notion that it's installed. | 13:10 |
|
| I'll try the apt-get source git then... | 13:10 |
|
| but I still dunno how to create a package from it | 13:10 |
|
cmn
| you don't have to | 13:10 |
| ← amcsi_work left | 13:10 |
|
haf
| unless of course I use the automake thing | 13:10 |
|
| I want to do so, because then it's easier to manage | 13:10 |
| → tango_ joined | 13:10 |
| → quazimodo joined | 13:10 |
|
haf
| no subtree directory | 13:12 |
| → w41 joined | 13:12 |
|
haf
| cmn: have you tried what you're suggesting? | 13:12 |
|
| ok nm | 13:12 |
|
| found it | 13:12 |
|
| the readme only contains the man page | 13:13 |
| → ohcibi joined | 13:13 |
|
haf
| INSTALL contains some instructions on how to build though, but nothing on packaging | 13:13 |
| → TeckniX joined | 13:14 |
|
haf
| no wonder people think it's obtruse to work on linux with all this yak shaving | 13:14 |
|
lb
| haf because that has nothing to do with it | 13:14 |
|
haf
| ^^ | 13:14 |
| → koki joined | 13:14 |
| → wereHamster joined | 13:14 |
| → v0n joined | 13:14 |
|
lb
| just google "ubuntu packaging" | 13:14 |
| → noneo joined | 13:14 |
| → ro0 joined | 13:15 |
| → zackiv31 joined | 13:15 |
|
haf
| lb: it's not that simple ^^ | 13:15 |
|
| lb: that would give me a million hits | 13:15 |
| → naquad joined | 13:15 |
| → zaiste joined | 13:15 |
|
haf
| lb: and then I'd spend an hour reading about it before I can do any real work | 13:15 |
|
| like now, e.g. I'm missing http.h supposedly from making it | 13:16 |
| → AaronMT joined | 13:16 |
|
haf
| now I have to try and find where that comes from | 13:16 |
|
| this is yak shaving big time ;) | 13:16 |
|
lb
| so you rather chat in the git irc channel for about an hour and still dont find someone who does the ubuntu package thing for you ? Oo tough... | 13:16 |
|
| no offense ;) | 13:17 |
|
haf
| lb: right now, I'm trying to build git from source with subtree support | 13:17 |
|
| lb: when it comes to the packaging I'll probably move, yes. | 13:17 |
|
| lb: but what a non-yak project would do is to have a make target called 'rpm' or 'deb' or something ;) | 13:17 |
|
| lb: or a continuous integration server | 13:18 |
|
| lb: or a deb or rpm server | 13:18 |
|
axrfnu
| yes, world's a bad place | 13:18 |
|
haf
| axrfnu: hehe | 13:18 |
|
lb
| hehe | 13:19 |
| ← zackiv31 left | 13:19 |
| ← palm_vue left | 13:20 |
| ← bizhanMona left | 13:20 |
| ← Lgb left | 13:20 |
| ← iocor left | 13:21 |
|
haf
| OK question; I've built the git root folder, but now it's the contrib. INSTALL says to use 'make install' which I should replace with 'sudo checkinstall' -- should I do that from the root git folder or from the contrib folder? | 13:21 |
| → Lgb joined | 13:21 |
| → palm_vue joined | 13:22 |
| → bizhanMona joined | 13:22 |
| → codewrangler joined | 13:23 |
|
haf
| Rephrased: when I've run 'make && cd contrib/subtree && make', then what? | 13:23 |
| ← specialGuest left | 13:23 |
|
haf
| perhaps 'cd ../.. && sudo automake' or alternatively 'sudo automake' or third option: 'sudo automake && cd ../.. && sudo automake' | 13:23 |
| → beakor joined | 13:24 |
|
beakor
| hello mates | 13:24 |
| → danielpunt joined | 13:24 |
| ← john3_ left | 13:25 |
|
beakor
| in this project I have, a function was deleted a number of revisions ago. How do I retrieve this function? | 13:25 |
| → john3_ joined | 13:25 |
|
leoj3n
| I'm on a Mac trying to git clone a GitHub repo to my NAS @ /Volumes/nasusername/myrepo … the nasusername share is mounted via Transmission using SFTP … I get the error `fatal: could not create leading directories` … can this be made to work? | 13:25 |
|
haf
| beakor: you can do git checkout with a refspec | 13:26 |
|
| it will then check out that file | 13:26 |
| → hellopat joined | 13:26 |
|
_ikke_
| beakor: you can use git checkout -p <commit> -- <file> to partially checkout that file | 13:26 |
|
haf
| depending on how much you changed, you can also do something like create a diff/patch from n+1..n and then apply it | 13:26 |
|
| or you can do a revert commit, I guess | 13:26 |
| → nadavoid joined | 13:26 |
|
haf
| ** Does somebody know how to build contrib packages for git? | 13:27 |
|
| git revert <refspec> | 13:28 |
|
| beakor: does that help? | 13:28 |
| ← gtrak left | 13:29 |
| ← scholtz left | 13:29 |
| → scholtz joined | 13:30 |
| → msmithng joined | 13:30 |
| → robotmay joined | 13:31 |
| ← blami_ left | 13:31 |
| → jjbohn joined | 13:32 |
| → bartek joined | 13:32 |
| → sawdisk joined | 13:35 |
| → derekpioneer joined | 13:36 |
| → spaceonline joined | 13:37 |
| → Know1edge joined | 13:41 |
| → tonyj joined | 13:42 |
| → tplaner_ joined | 13:42 |
| ← hyperair left | 13:44 |
| → dov23 joined | 13:44 |
| → hyperair joined | 13:45 |
| → _huoxito joined | 13:45 |
| ← hyperair left | 13:46 |
| ← ph^ left | 13:46 |
| ← dov23 left | 13:47 |
| → dov23 joined | 13:48 |
| ← naquad left | 13:48 |
| ← thomasfr left | 13:48 |
| → thomasfr joined | 13:49 |
| → naquad joined | 13:49 |
| → hyperair joined | 13:50 |
| → intransit joined | 13:50 |
| ← hyperair left | 13:50 |
| → chuckharmston joined | 13:52 |
| ← danielpunt left | 13:53 |
|
lb
| hm first time i'm facing a rebase. can anyone tell me the correct command to rebase master onto origin/master ? | 13:53 |
|
| http://pastebin.com/e6ufBsgm | 13:53 |
| ← thomasfr left | 13:53 |
|
_ikke_
| git rebase origin/master | 13:53 |
|
lb
| _ikke_: ok, i was worried about it | 13:54 |
| → xxiao joined | 13:54 |
|
lb
| but now i'm loving git magic ^^ thanks | 13:55 |
|
_ikke_
| Well, you have to know the rules | 13:55 |
| ← Lord_DeathMatch left | 13:55 |
| → hyperair joined | 13:55 |
|
_ikke_
| But this is a simple case, so rebasing is safe | 13:55 |
| → Lord_DeathMatch joined | 13:55 |
|
lb
| yep thought so, but i didn't wanted to screw things up ^^ | 13:56 |
|
xxiao
| i have some binary files in git, i don't really need the old versions as they eat up space fast, can I remove certain files _fully_ from git? | 13:56 |
|
_ikke_
| xxiao: You'd have to rewrite histry | 13:57 |
|
| history | 13:57 |
|
FauxFaux
| xxiao: https://help.github.com/articles/remove-sensitive-data | 13:57 |
|
xxiao
| git filter-branch --tree-filter 'rm filename' HEAD | 13:57 |
|
| not sure is this is correct, from http://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-a-git-repository | 13:58 |
|
FauxFaux
| Read man git filter-branch, or my link, or just run it, and find out? | 13:58 |
|
gitinfo
| the git-filter-branch manpage is available at http://git-scm.com/docs/git-filter-branch.html | 13:58 |
| ← beautifulmind left | 13:58 |
| → marthinal joined | 13:58 |
| → jason237 joined | 13:59 |
| → MacGyver joined | 13:59 |
| ← MacGyver left | 13:59 |
| → MacGyver joined | 13:59 |
| → erynofwales joined | 13:59 |
| ← lng left | 14:00 |
|
draginx
| ok so is there anyway I can make it so if I have file sin a directory.. and I have an nginx instance pointing to it... the files will change base on whatever branch I'mactively on there? | 14:00 |
|
| bascially ill do git checkout test; vim test.php; <add a simple var_dump> then hit the page.. looks good, git checkout master -- still see the simple var_dump (not good) | 14:00 |
|
xxiao
| FauxFaux: thanks, studying | 14:01 |
| ← letharion left | 14:01 |
|
FauxFaux
| draginx: Sounds like a niggix problem. | 14:01 |
|
loops
| draginx, for the most part git wont touch files unless you've told it to track them. if var_dump is just a random file git will leave it there when you checkout master | 14:02 |
|
draginx
| well both branches have this file | 14:02 |
| ← v0n left | 14:02 |
|
draginx
| im just modifying it | 14:02 |
|
FauxFaux
| Ohh, I see, loops. draginx: !float | 14:02 |
|
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. | 14:02 |
| → kermit joined | 14:02 |
| ← kermit left | 14:02 |
| → kermit joined | 14:02 |
|
draginx
| but theres no way to like.. completely change the environment based on which branch Im on? :/ | 14:02 |
|
| whats the point of branches then? O_o | 14:02 |
| → alexisabril joined | 14:03 |
|
draginx
| i just want one change to *stay* in that branch | 14:03 |
|
loops
| draginx, ah, yes, git will not destroy your changes. it thinks you want to commit those changes on another branch | 14:03 |
|
draginx
| not to bleed over :) | 14:03 |
|
FauxFaux
| draginx: If you commit before switching branches, it'll do what you expect. | 14:03 |
|
loops
| draginx ^^ what Faux said | 14:03 |
|
draginx
| hmm | 14:03 |
|
| so what would the ordering be? | 14:03 |
| → Tegi joined | 14:03 |
|
FauxFaux
| checkout, edit, add, commit, checkout | 14:03 |
|
PerlJam
| draginx: if you didn't commit it, it's not "on a branch" It's just in your working copy. | 14:03 |
|
draginx
| git checkout test; vim file.php; git commit -m "doing my test!"; then look at file on chrome; then git checkout master; go back to chrome and changes should be reverted? | 14:03 |
| ← titaniumNoob left | 14:04 |
|
FauxFaux
| You need to do the git add (or commit with -a), but otherwise, yes. | 14:04 |
| → chrisgeorge joined | 14:04 |
|
FauxFaux
| Also, you need a shell with sane ! interpretation. ¬_¬ | 14:04 |
| → ph^ joined | 14:04 |
|
draginx
| hmm | 14:05 |
| → shawngo joined | 14:05 |
| → iocor joined | 14:05 |
| → andrewhl joined | 14:06 |
| ← bartek left | 14:07 |
| ← afuentes left | 14:07 |
|
loops
| draginx, gits behavior is really handy when you make a change and realize it should actually be on a different (or new) branch. | 14:07 |
|
draginx
| hmmm | 14:07 |
|
| but id like to only see changes for a specific branch | 14:07 |
|
| if that branch is active :/ | 14:08 |
|
loops
| draginx, the other option for you is to do git stash to temporarily shelve any changes | 14:08 |
|
draginx
| right | 14:08 |
| ← dhruvasagar left | 14:08 |
|
FauxFaux
| draginx: Yeah, but the changes aren't /in/ a branch, they're in the working copy. | 14:08 |
|
draginx
| right | 14:08 |
|
FauxFaux
| commit moves changes from the working copy to a branch. | 14:08 |
| → letharion joined | 14:08 |
| → vpetro joined | 14:08 |
|
draginx
| ahh is ee now! :) ok thanks | 14:08 |
| → Haix64 joined | 14:08 |
| ← Haix64 left | 14:09 |
|
loops
| Faux made lightbulb comment ;o) | 14:09 |
|
FauxFaux
| It also caused a breakdown of her vocal circuits. | 14:09 |
|
loops
| heh | 14:09 |
| → thomasfr joined | 14:09 |
| → Deck` joined | 14:10 |
| → nwest joined | 14:11 |
| → eijk joined | 14:12 |
| → ph^_ joined | 14:13 |
| ← nizeguy left | 14:13 |
| → nizeguy joined | 14:14 |
| → v0n joined | 14:15 |
| → ShadeTornado joined | 14:15 |
| → jcromartie joined | 14:15 |
| ← ph^ left | 14:17 |
|
jcromartie
| What's the best way to open source a project in a Git repo, when I might not want *all* history to be included? | 14:17 |
|
| I know about shallow clones but I don't think you can push that to a remote like Github. | 14:18 |
| ← Lord_DeathMatch left | 14:18 |
|
charon
| jcromartie: you'll have to rewrite it to exclude the parts of history you don't want to publish. see git-replace, grafts, and git-filter-branch | 14:18 |
|
FauxFaux
| Or rebase -i and deleting loads of lines. >.> | 14:18 |
| → cakehero joined | 14:18 |
|
charon
| that obviously comes with all the caveats of rewriting, but i don't think it can be avoided | 14:18 |
|
| FauxFaux: only if history is linear | 14:19 |
|
| (or you are so lucky with conflicts that you should play in the lottery instead of coding) | 14:19 |
|
FauxFaux
| Oh, yeah, mergophiles. | 14:19 |
| ← andrewhl left | 14:19 |
|
FauxFaux
| Wait, deleting lines doesn't even remotely do what he wants. | 14:19 |
| ← diegoviola left | 14:19 |
| → xmattdh joined | 14:20 |
| → diegoviola joined | 14:20 |
|
jcromartie
| hah hah | 14:20 |
| → ehsan joined | 14:20 |
| ← thomasfr left | 14:20 |
| → kukks joined | 14:20 |
| ← kukks left | 14:20 |
| → kukks joined | 14:20 |
|
jcromartie
| OK so git-filter-branch would get me something | 14:20 |
|
charon
| hrm, i also wonder whether, after grafts or git-replace, git fast-export|(cd other; git init; git fast-import) would be a way to set the replacements in stone | 14:21 |
|
| if so, that would be a few orders of magnitude faster | 14:21 |
|
FauxFaux
| Did you ever work out why filter-branch was so much slower than fast-export|fast-import? | 14:22 |
| → tommsen_ joined | 14:22 |
|
charon
| what do you mean, "work out"? one is a shell script, and the other is a C program highly optimized for that exact task | 14:22 |
| ← paolooo left | 14:22 |
|
FauxFaux
| There was a discussion in here about it the other week, I assumed you were involved. | 14:23 |
|
charon
| thiago was of course right when we had that discussion, *in theory* the approach used by filter-branch processes less data | 14:23 |
|
| but in practice, carefully coded C wins | 14:23 |
| → cweqwe joined | 14:25 |
| → Crenial joined | 14:26 |
| → lotus joined | 14:26 |
| ← lotus left | 14:26 |
| ← tommsen left | 14:26 |
| ← tommsen_ left | 14:27 |
| → Nicarlo joined | 14:27 |
| ← cweqwe left | 14:27 |
| → lotus joined | 14:27 |
| → tommsen joined | 14:27 |
| → bartek joined | 14:27 |
|
haf
| Guys, installing subtree as a package http://stackoverflow.com/a/12075310/63621 | 14:27 |
|
| I answered it after finishing the yak shaving | 14:27 |
|
lotus
| hey, I want to get my database into version control. I'm sure this is asked all the time. Is there a standard way of doing this? Maybe a tutorial to follow? | 14:27 |
| → axl_ joined | 14:27 |
|
haf
| only problem now is the --help command | 14:28 |
|
| anyone care to help me with thatr? | 14:28 |
| ← soee_ left | 14:28 |
|
haf
| (at bottom of my answer) | 14:28 |
|
lotus
| help with help? :) | 14:28 |
|
FauxFaux
| lotus: Things like dbdeploy are reasonably popular, if your platform doesn't provide one. | 14:28 |
|
PerlJam
| lotus: Try http://sqitch.org/ | 14:28 |
|
Nicarlo
| hey! | 14:29 |
| ← letharion left | 14:29 |
|
lotus
| thank you both, FauxFaux and PerlJam | 14:29 |
| → lcc joined | 14:30 |
|
gitinfo
| Nicarlo: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here. | 14:30 |
| → thanpolas_ joined | 14:31 |
| ← beakor left | 14:32 |
| ← jackh left | 14:32 |
| → codeM0nK_ joined | 14:32 |
|
haf
| lotus: exactly ;) | 14:32 |
| ← tango_ left | 14:33 |
| → ndngvr joined | 14:33 |
| ← arvind_khadri left | 14:33 |
| ← tommsen left | 14:34 |
| ← thanpolas left | 14:34 |
| → tango_ joined | 14:34 |
| codeM0nK_ → codeM0nK3Y | 14:34 |
| → Bass10 joined | 14:34 |
| → paolooo joined | 14:35 |
| ← rohan32 left | 14:35 |
| → luxurymode joined | 14:35 |
| ← Bass10 left | 14:35 |
| → Bass10 joined | 14:36 |
| → tommsen joined | 14:37 |
| → letharion joined | 14:37 |
| → kvanderw joined | 14:37 |
| ← berserkr left | 14:39 |
| → kevwil joined | 14:40 |
|
haf
| My answer now includes a one-liner to install git with git as a package ;) | 14:41 |
|
| https://gist.github.com/3426227 | 14:41 |
| ← freeed left | 14:41 |
| ← tango_ left | 14:42 |
|
jcromartie
| OK so any other option? aside from filter-branch to wipe sensitive info… | 14:43 |
|
| I'm trying to really understand shallow clones | 14:43 |
| → bitmonk joined | 14:43 |
| ← lb left | 14:43 |
|
jcromartie
| if we just want to publish the tip of the master branch as the initial open source version? | 14:44 |
| → fly9 joined | 14:44 |
|
jcromartie
| I guess I should just test the scenarios :) | 14:45 |
| → wolftankk joined | 14:45 |
| ← vpetro left | 14:45 |
|
jast
| shallow clones can't be cloned from | 14:45 |
|
| (afaik) | 14:45 |
|
jcromartie
| ah, yeah, that nixes that | 14:46 |
|
| just tried :) | 14:46 |
|
charon
| jcromartie: note that if you really only want to publish a single starting commit, you can just make a new commit on an orphan branch, no filtering required | 14:46 |
|
jcromartie
| charon: how exactly does that work? it wouldn't have the full history? | 14:47 |
|
haf
| that's right | 14:48 |
|
jcromartie
| oh wow | 14:48 |
|
| this is perfect, | 14:48 |
|
haf
| an orphan branch afaik doesn't contain any commit data | 14:48 |
|
| then you can just rename it to match | 14:48 |
| → tango_ joined | 14:48 |
| ← leoj3n left | 14:49 |
|
haf
| could someone direct me to where I can read to understand why certain MAN pages aren't installed from a makescript? | 14:51 |
| ← bartek left | 14:52 |
| → Ecesis joined | 14:52 |
| → andrewhl joined | 14:52 |
| → bartek joined | 14:52 |
| ← jceb_ left | 14:53 |
| ← Ecesis left | 14:53 |
|
charon
| haf: !xy and !repro | 14:54 |
|
gitinfo
| haf: This sounds like an "XY Problem" http://mywiki.wooledge.org/XyProblem So let's step back for a minute. What are you actually trying to achieve? Why are you doing it this way? | 14:54 |
|
| haf: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting. | 14:54 |
|
haf
| specifically how I make the contrib projects install doc -- the 'sudo checkinstall make prefix=/usr/local install-doc' doesn't install it into man | 14:54 |
|
| repro: https://gist.github.com/3426227 | 14:54 |
| ← erichynds left | 14:56 |
|
charon
| haf: so what's the output from make install-doc? | 14:56 |
|
haf
| charon: I will check, one second, please. | 14:56 |
| ← flijten left | 14:56 |
| → rchavik joined | 14:56 |
| → pl0sh joined | 14:56 |
|
charon
| haf: i get this: https://gist.github.com/e36c099c449fcf10c9fe | 14:57 |
|
| using the prefix from my ~/g/config.mak | 14:57 |
|
| (automatically sourced by git-subtree's Makefile) | 14:57 |
|
| so it's pretty much "works for me" | 14:57 |
| → freeed joined | 14:59 |
| ← Vile left | 14:59 |
|
haf
| charon: but that's not a package-based install that you're doing there. | 15:00 |
|
| charon: so it fails that criterion | 15:00 |
|
| charon: I will soon come back with some output though | 15:00 |
| → dinesh6654 joined | 15:01 |
| ← psoo left | 15:02 |
| ← msmithng left | 15:02 |
| → converge joined | 15:04 |
|
haf
| charon: seems like checkinstall wants a folder doc-pak but the makefile manually copies to the man folder | 15:04 |
| ← beepbeep_ left | 15:04 |
|
haf
| any ideas? | 15:05 |
| ← kevwil left | 15:06 |
|
jcromartie
| OK thanks guys… git checkout --orphan is the way to go | 15:06 |
|
haf
| jcromartie: glad it solved ur problem | 15:06 |
|
| as for my problem, I'm gonna have to come back later... cya all. | 15:07 |
| → mritz joined | 15:07 |
| ← haf left | 15:07 |
| ← hyperair left | 15:08 |
| → thomasfr joined | 15:08 |
| ← rchavik left | 15:08 |
| ← mritz left | 15:08 |
| → Atlantic777 joined | 15:10 |
| ← MaximB_ left | 15:10 |
| → zw_yao joined | 15:11 |
| → duckxx joined | 15:13 |
| → pppaul joined | 15:14 |
| ← pppaul left | 15:14 |
| → babilen_ joined | 15:14 |
| → pppaul joined | 15:15 |
| ← babilen left | 15:15 |
| ← cbreak-work left | 15:15 |
| → xiangfu joined | 15:16 |
| → mritz joined | 15:16 |
| → mmc1 joined | 15:16 |
| → maxthoursie_ joined | 15:17 |
| ← maxthoursie left | 15:17 |
| ← mritz left | 15:17 |
| maxthoursie_ → maxthoursie | 15:17 |
| ← w41 left | 15:18 |
| ← gavin_huang left | 15:19 |
| → eijk_ joined | 15:19 |
| ← v0n left | 15:20 |
| ← marthinal left | 15:21 |
| ← Davey left | 15:21 |
| ← Crenial left | 15:21 |
| → jcao219 joined | 15:22 |
| ← eijk left | 15:22 |
| ← rob_w left | 15:22 |
| → destinydriven joined | 15:22 |
| → marthinal joined | 15:23 |
| → harish joined | 15:23 |
| → Davey joined | 15:23 |
| ← destinydriven left | 15:24 |
| ← dr_lepper left | 15:24 |
| gitinfo set mode: +v | 15:24 |
|
zw_yao
| Hi, all. I'm new to git. what does it mean by " you should rebase your branches to the updated master"? | 15:25 |
|
charon
| zw_yao: context? | 15:25 |
|
FauxFaux
| zw_yao: Sounds like it's suggesting you should man git rebase your current branch onto master. Need context to explain why, though. | 15:26 |
|
gitinfo
| zw_yao: the git-rebase manpage is available at http://git-scm.com/docs/git-rebase.html | 15:26 |
| → destinydriven joined | 15:26 |
| → shreya joined | 15:26 |
| ← Atlantic777 left | 15:26 |
| → rehat joined | 15:26 |
|
zw_yao
| Sorry, let me provide the details. | 15:26 |
| ← jason237 left | 15:26 |
| ← jcao219 left | 15:27 |
|
Nicarlo
| Hey! im new to GIT and im a little confused with what the best practice is for what im trying to do. I'd like to setup a live, test and development area and would like to know what are the best way to push something from Development to test and then finally to Live. Would anyone know of any articles that would describe this ? | 15:27 |
| → jcao219 joined | 15:27 |
|
linduxed
| just out of curiosity | 15:28 |
| ← scholtz left | 15:28 |
| → Atlantic777 joined | 15:28 |
| ← Atlantic777 left | 15:28 |
| → Atlantic777 joined | 15:28 |
|
FauxFaux
| Nicarlo: !deploy | 15:28 |
|
gitinfo
| Nicarlo: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html | 15:28 |
| → msmithng joined | 15:28 |
|
linduxed
| could someone elaborate on the technical side of why this developer of a big project says the following? https://gist.github.com/3426767 | 15:28 |
|
Nicarlo
| FauxFaux: I love you | 15:29 |
|
FauxFaux
| linduxed: He's correct; !big | 15:29 |
|
gitinfo
| linduxed: [!large_files] Git isn't yet great at large files(larger than RAM). Look at !annex for solutions. You can find them (after gc) with: git verify-pack -v .git/objects/pack/pack-*.idx | grep blob | sort -k3nr | head | while read s x b x; do git rev-list --all --objects | grep $s | awk '{print "'"$b"'",$0;}'; done | 15:29 |
|
nowhere_man
| is it possible to use rebase to edit the first-ever commit? | 15:29 |
| → lacrymology joined | 15:30 |
|
FauxFaux
| nowhere_man: Nope; workarounds are hilariously trivial to google. | 15:30 |
| → thelazydeveloper joined | 15:30 |
|
blathijs
| Hmm, is there some way I can prevent git from pushing out specific commits? I have a branch with certain commits that are not finished, so I'd like to mark them in the commit message with "TODO" or "DONTPUSH" or something like, just in case I ever mess up and accidentally tell git to push the entire branch or something like that. This would apply to both regular git push as well as git svn dcommit. I looked through the various manpages and hooks ... | 15:30 |
| ← shreya left | 15:30 |
|
nowhere_man
| FauxFaux: they are indeed, thx | 15:30 |
|
blathijs
| ... available, but it seems there isn't really something I could use for this. Any ideas? | 15:30 |
| → t4nkd joined | 15:30 |
| → shreya joined | 15:31 |
| ← jcao219 left | 15:31 |
|
linduxed
| !annex | 15:31 |
|
gitinfo
| git-annex and git-media are two solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git-annex.branchable.com/ and https://github.com/schacon/git-media | 15:31 |
|
FauxFaux
| blathijs: Sometimes people suggest creating a dummy remote (with a bogus url), and setting the upstream for the branches to that, such that any push will fail; but it doesn't stop you bungling other pushes. | 15:31 |
| → harv joined | 15:31 |
|
zw_yao
| My upstream repo have updated. Then I want to update my local, however, I have some work on local have been done. What I want to do is update my local master branch. And then I want to do a pull-request. However, the upsteam requires squash my work into single commit. | 15:31 |
| ← Vert left | 15:32 |
| ← quazimodo left | 15:32 |
| → v0n joined | 15:33 |
| → SirCmpwn_ joined | 15:33 |
| → john3__ joined | 15:33 |
| → amcsi joined | 15:33 |
| SirCmpwn_ → SirCmpwn | 15:33 |
|
zw_yao
| sorry, my desription may be still obscure...:( | 15:33 |
|
blathijs
| FauxFaux: I still want to push things, so that doesn't really help me (I can still mess up when I'm not careful then) | 15:33 |
| ← destinydriven left | 15:34 |
| → destinydriven joined | 15:34 |
|
destinydriven
| hello guys | 15:34 |
|
blathijs
| FauxFaux: Also, I think I don't really use a branch's upstream remote often, usually I just specify the remotes by hand | 15:34 |
| ← t4nkd left | 15:34 |
| ← Davey left | 15:34 |
|
destinydriven
| I just edited a file in my repo master branch using github's editor , how do I update my local repo? | 15:34 |
|
FauxFaux
| destinydriven: man everyday | 15:35 |
|
gitinfo
| destinydriven: the everyday manpage is available at http://git-scm.com/docs/everyday.html | 15:35 |
|
blathijs
| FauxFaux: It's mostly that I regularly re-order commits, so I'd like to be sure I can't accidentally push an unfinished commit to the front of the queue | 15:35 |
| → tjholowaychuk joined | 15:35 |
|
destinydriven
| FauxFaux, thanks | 15:35 |
| → jcao219 joined | 15:35 |
| → apipkin joined | 15:36 |
| ← john3_ left | 15:36 |
|
apipkin
| how do i pull from a specified remote branch to a local branch? | 15:37 |
| ← pretty_f_ left | 15:37 |
| → zackiv31 joined | 15:37 |
|
FauxFaux
| apipkin: You can only pull /to/ the checked out branch. You already know how to pull from a specified branch. | 15:38 |
| → ku joined | 15:38 |
|
charon
| however, !pull4 | 15:38 |
| → quazimodo joined | 15:39 |
| → berserkr joined | 15:39 |
| → saml joined | 15:39 |
|
gitinfo
| [!fetchfour] Never use the four-word version of git-fetch or git-pull (e.g. git fetch remote refspec). It always ends in tears. Yes, if you understand the implications of FETCH_HEAD it can technically be done, but really it is easier to just fetch the whole remote (or perhaps edit the fetchspec if you never want other bits). If you must, see !fetch4why | 15:39 |
|
saml
| hey, I have a commit that isn't pushed.. but git push doesn't push it | 15:39 |
|
apipkin
| FauxFaux: so i just need to check out the specified branch? then pulls will be from there? | 15:39 |
|
destinydriven
| saml, git status, see what hasn't been commit, commit it, then push | 15:40 |
|
saml
| destinydriven, it says nothing to commit | 15:40 |
| ← corburn left | 15:40 |
|
saml
| i have two branches (develop and master) i was on develop and committed to develop.. and wanted to push to develop | 15:41 |
| → Davey joined | 15:41 |
|
destinydriven
| saml, and you're on develop branch? | 15:41 |
| → rwestphal joined | 15:41 |
| ← jcao219 left | 15:41 |
|
destinydriven
| git checkout develop | 15:41 |
|
saml
| but that rejected because local master was running behind.. so, `git checkout master && git pull && git checkout develop && git push` | 15:41 |
|
| nothing happens | 15:41 |
|
destinydriven
| saml, sorry, but this is beyond me :( | 15:42 |
|
saml
| git is beyond us | 15:42 |
| → scholtz joined | 15:43 |
| → jceb_ joined | 15:43 |
|
FauxFaux
| git push origin develop:develop | 15:43 |
|
saml
| ! [rejected] develop -> develop (non-fast-forward) | 15:43 |
| ← tjholowaychuk left | 15:44 |
|
saml
| giEverything up-to-date | 15:44 |
|
charon
| saml: last i checked, that had an entire paragraph of advice at the end | 15:44 |
| ← papegaaij left | 15:44 |
|
saml
| someone pushed meantime.. so after git pull && git push origin develop:develop... it says Everything up-to-date | 15:44 |
|
charon
| briefly put, the problem is that somebody (perhaps even you) pushed other work to the same branch | 15:44 |
|
saml
| but remote repository doesn't have my commit.. local repo does | 15:44 |
| ← lukosanthropos left | 15:44 |
| ← fly9 left | 15:44 |
| ← senny_ left | 15:45 |
| → fly9 joined | 15:46 |
| → axl__ joined | 15:46 |
| ← angelsl left | 15:47 |
| → maletor joined | 15:47 |
|
saml
| maybe it's github. so slow to update remote | 15:48 |
| → tommsen_ joined | 15:49 |
| ← jceb_ left | 15:49 |
|
charon
| saml: what's the *full* output of *both* git pull *and then* git push origin develop? what is the upstream branch of develop (consult git branch -vv) and your 'git config push.default'? | 15:49 |
| ← axl_ left | 15:49 |
| axl__ → axl_ | 15:49 |
| → fly9_ joined | 15:50 |
| ← tommsen left | 15:50 |
|
saml
| charon, thanks. i'll have to read up on those | 15:50 |
| ← fisted left | 15:50 |
| ← fly9_ left | 15:50 |
| → fly9_ joined | 15:51 |
| → fisted joined | 15:51 |
| → iori joined | 15:52 |
| ← fly9 left | 15:52 |
| fly9_ → fly9 | 15:52 |
| → mrOrangeChuck joined | 15:52 |
| ← dinesh6654 left | 15:52 |
| → danmackay joined | 15:52 |
| → gavin_huang joined | 15:53 |
| ← tommsen_ left | 15:54 |
| → tommsen joined | 15:54 |
| → metcalfc_ joined | 15:54 |
| → iflista joined | 15:55 |
| → afuentes joined | 15:56 |
| → vpetro joined | 15:57 |
| babilen_ → babilen | 15:57 |
|
saml
| charon, https://gist.github.com/4234fdff4eb1fb040a77 this is what I did | 15:57 |
| ← Progster left | 16:00 |
| → Vile joined | 16:00 |
| → Shusshu joined | 16:01 |
| ← robotmay left | 16:01 |
| → Anders_J joined | 16:01 |
| ← Davey left | 16:02 |
| → ryez_ joined | 16:02 |
| → OOPMan joined | 16:02 |
| → imachuchu joined | 16:04 |
| ← whitman left | 16:04 |
| → jwmann joined | 16:04 |
| ← jwmann left | 16:04 |
| ← converge left | 16:04 |
| → jwmann joined | 16:05 |
| ← jwmann left | 16:05 |
|
saml
| i was looking at master branch.. that's why i thought my change didn't go in | 16:05 |
| → jwmann joined | 16:05 |
| ← jwmann left | 16:05 |
| → t4nkd joined | 16:06 |
| ← StefanK left | 16:06 |
| → jwmann joined | 16:06 |
| ← jwmann left | 16:06 |
| ← mishok13 left | 16:07 |
| → TheJH joined | 16:07 |
| → apok joined | 16:08 |
| ← Sebo left | 16:08 |
| → Sebo joined | 16:09 |
|
lotus
| hey, I made some changes on the wrong branch but have not committed yet. I went to checkout the right branch to do the commit but it says that my changes would be overwritten. What can I do? | 16:09 |
| ← kermit left | 16:09 |
| ← skorgon left | 16:10 |
| ← tjadc left | 16:11 |
|
offby1
| lotus: git stash | 16:11 |
|
| then checkout the right branch | 16:11 |
|
| then git stash apply | 16:11 |
|
| the git add & git commit | 16:11 |
|
| very slick | 16:11 |
|
| this is (more or less) _exactly_ the problem that "git stash" was designed for. | 16:11 |
| → Textmode joined | 16:12 |
| ← vpetro left | 16:12 |
|
lotus
| ahh, thank you much :D | 16:12 |
| → Davey joined | 16:13 |
| → ppppaul joined | 16:13 |
| ← ppppaul left | 16:13 |
| ← Sebo left | 16:13 |
| ← timj1 left | 16:14 |
| → ppppaul joined | 16:14 |
| ← ppppaul left | 16:14 |
| ← pppaul left | 16:14 |
| → Sebo joined | 16:14 |
| ← nizeguy left | 16:15 |
| ← Shusshu left | 16:15 |
| → Synthead joined | 16:15 |
| → pppaul joined | 16:16 |
| → vpetro joined | 16:17 |
| ← bitmonk left | 16:17 |
| → martinjlowm joined | 16:18 |
| ← scholtz left | 16:18 |
| → titaniumNoob joined | 16:19 |
| → paolooo_ joined | 16:20 |
| ← thanpolas_ left | 16:21 |
| ← paolooo left | 16:22 |
| ← fireh left | 16:22 |
| ← ryez left | 16:22 |
| ← mmc1 left | 16:22 |
| ← freeed left | 16:23 |
| ← ryez_ left | 16:23 |
| ← Guest84686 left | 16:23 |
| → freeed joined | 16:24 |
| ← achadwick left | 16:25 |
| → psoo joined | 16:25 |
| ← fly9 left | 16:25 |
| ← xiangfu left | 16:26 |
| ← apok left | 16:26 |
| → ajpiano joined | 16:29 |
| ← maletor left | 16:29 |
| ← iori left | 16:29 |
| ← bartek left | 16:29 |
| ← Advocation left | 16:30 |
| → roto joined | 16:30 |
| → iori joined | 16:30 |
| ← rehat left | 16:31 |
| ← Sebo left | 16:31 |
| ← lcc left | 16:33 |
| ← klj613 left | 16:34 |
| → kermit joined | 16:34 |
| → hyperair joined | 16:34 |
| ← Know1edge left | 16:34 |
| → Progster joined | 16:35 |
| → sq-one joined | 16:35 |
| → maletor joined | 16:36 |
| → _keith joined | 16:37 |
| ← metcalfc_ left | 16:37 |
|
_keith
| Suggested helpers for pushing git changes to live FTP server, other than BeanStalk? | 16:38 |
| → SidGBF joined | 16:39 |
| ← OOPMan left | 16:39 |
|
shruggar
| _keith: remove "git" from your sentence and realise that the term you want to google is "deployment tool" | 16:40 |
|
SidGBF
| Hi all! Im preparing a wordpress test environment. For that I would need a submodule of wordpress install and another one that is my plugin. But one submodule must be inside another. How to do this? | 16:40 |
|
_keith
| OK, so i know I can go through Google Search results. I am asking if you have a suggestion? | 16:40 |
|
shruggar
| _keith: not git-related ones :) And there's not enough information for me to know general ones. What language? What type of thing are you deploying? How robust a solution do you want? Is push-to-deploy a definite requirement, or if you think really hard about it do you need multiple release phases? | 16:42 |
|
| !deploy might have some hints | 16:43 |
|
gitinfo
| Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html | 16:43 |
|
_keith
| Simply push-to-deploy, nothing complicated. Simple PHP web site lets say, maybe a WordPress site | 16:43 |
| ← Davey left | 16:43 |
| → converge joined | 16:44 |
|
SidGBF
| _keith: just clone the website on the server | 16:44 |
|
shruggar
| SidGBF: how would that get him… anything? | 16:44 |
|
SidGBF
| or create a repo there, add it as an origin to your local code | 16:44 |
|
_keith
| So setup repository on the server and then clone it down to my local machine? | 16:45 |
|
SidGBF
| then you can 'git push production' | 16:45 |
| → Davey joined | 16:45 |
|
SidGBF
| _keith: yup | 16:45 |
|
shruggar
| SidGBF: you've never actually tried that, have you? | 16:45 |
|
| that is not how git works | 16:45 |
|
_keith
| It seems like that can be tricky to manage? | 16:45 |
|
SidGBF
| shruggar: nop :p | 16:46 |
|
| shruggar: old idea that I had no time/need to test | 16:46 |
|
shruggar
| "push" is about sending objects / packs from one repository to another. It does not have anything to do with worktrees | 16:46 |
|
_keith
| I am using git for version control and I love it. I just want to get off of using FTP to post the changes. I was looking into BeanStalk, but it looks like more than what I am looking to do. | 16:46 |
| → codeshah joined | 16:46 |
| ← kermit left | 16:47 |
|
shruggar
| _keith: I expect !deploy will tell you enough for the basics | 16:47 |
|
gitinfo
| _keith: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html | 16:47 |
| → boombatower joined | 16:47 |
| ← stevedomi left | 16:47 |
|
_keith
| gitinfo: Checking out that link now. Thank you for the resource. | 16:47 |
|
gitinfo
| _keith: you're welcome, but please note that I'm a bot. I'm not programmed to care. | 16:47 |
| → lb joined | 16:47 |
| ← paolooo_ left | 16:47 |
|
_keith
| gitinfo: nice, just got burned, schweet | 16:48 |
|
SidGBF
| shruggar: So, he needs: 1) local repo with code, 2) remote server with production code, 3) remote server with cloned repo that actually is the production website? | 16:48 |
|
thorbjornDX
| _keith: for simple stuff you can set up a non-bare repo on your remote that pulls from a bare repo w/ a post-receive hook | 16:48 |
| → thirdknife joined | 16:48 |
| → paolooo joined | 16:48 |
| → etcetera joined | 16:48 |
|
_keith
| post-receive hook…..how would a command like that look | 16:48 |
| ← thirdknife left | 16:48 |
|
shruggar
| SidGBF: 1) local repo with code 2) some sort of deployment infrastructure :) | 16:49 |
|
SidGBF
| shruggar: ok :) | 16:49 |
|
thorbjornDX
| _keith: it's a shell script that sets GIT_DIR to your non-bare repo and does a git pull from your bare repo, let me see if I can find an example | 16:49 |
| ← babilen left | 16:49 |
| → hwrd|work joined | 16:49 |
|
_keith
| thorbjornDX: ok | 16:49 |
|
SidGBF
| Im preparing a wordpress test environment. For that I would need a submodule of wordpress install and another one that is my plugin. But one submodule must be inside another. How to do this? | 16:49 |
| → naee joined | 16:49 |
| → LekeFly joined | 16:50 |
|
shruggar
| SidGBF: for wordpress, I prefer subtree merge | 16:51 |
| → khmarbaise joined | 16:51 |
|
shruggar
| though, on looking at wordpress code, for wordpress I these days prefer to tell people to avoid wordpress if at all possible :) | 16:51 |
|
_keith
| what are using capistranio? | 16:52 |
|
| capistrano? | 16:52 |
|
SidGBF
| shruggar: why? | 16:52 |
| → avinashhm joined | 16:52 |
|
thorbjornDX
| _keith: http://toroid.org/ams/git-website-howto Use with caution though | 16:53 |
|
SidGBF
| it doesn't look like helping me out... can you explain how it works? | 16:53 |
| ← pppaul left | 16:54 |
|
thorbjornDX
| _keith: the sitaramc link posted earlier has some of the same information too, and might be more up-to-date | 16:54 |
| → tjholowaychuk joined | 16:55 |
|
_keith
| thorbjornDX: Thanks, I appreciate the resources. | 16:55 |
|
shruggar
| SidGBF: I don't have a representative line in front of me at the moment, sorry. I shall summarise in that it is written in a style which I do not expect to see outside of a classroom, for a class where the subject is unrelated to programming, in a school in a bad neighborhood | 16:55 |
| → jason237 joined | 16:56 |
| → opus joined | 16:56 |
|
SidGBF
| shruggar: lol | 16:56 |
| ← apipkin left | 16:56 |
| → pppaul joined | 16:56 |
| → apok joined | 16:56 |
| → oojacoboo joined | 16:57 |
| → metcalfc_ joined | 16:57 |
| ← Davey left | 16:58 |
| → xxc_michael joined | 16:58 |
|
SidGBF
| anyone to solve the submodule inside submodule question? | 16:59 |
|
shruggar
| SidGBF: my only recommendation is to use subtree-merge instead | 16:59 |
| → scholtz joined | 16:59 |
|
shruggar
| SidGBF: or, if the module is your own, just develop it directly inside a wordpress clone | 17:00 |
|
SidGBF
| shruggar: as I said, I didn't understood how it will help me. Could you give me a brief explanation? | 17:00 |
| ← scholtz left | 17:00 |
|
SidGBF
| shruggar: the plugin has it's own repo | 17:00 |
| ← fornext left | 17:00 |
| ← nor5trom left | 17:00 |
|
shruggar
| sorry, I must flee :) | 17:00 |
|
| !subtree might help | 17:00 |
|
gitinfo
| The git subtree merge method is ideal to incorporate a subsidiary git repositories directly in to single git repository with "unified" git history, where you only need to pull changes in from external sources not contribute your own changes back (which if technically possible is at least difficult). See http://progit.org/book/ch6-7.html Type "!subtree_alt" for more options | 17:00 |
| ← Anders_J left | 17:01 |
| ← _keith left | 17:01 |
| → _keith joined | 17:01 |
| ← shruggar left | 17:01 |
| ← lotus left | 17:02 |
| ← ku left | 17:02 |
| → dinesh6654 joined | 17:03 |
| ← pppaul left | 17:03 |
|
imachuchu
| quick question, if I have commits A->B->C->D and I want to cherry-pick them onto my branch the correct syntax is "git cherry-pick A..D", right? | 17:03 |
|
| and I tried it (as is the knee-jerk reaction) and it missed A for some reason, is that reason my own ignorace or something else? | 17:04 |
| → kermit joined | 17:04 |
| → lotus joined | 17:04 |
| → ku joined | 17:05 |
| → alexchamberlain joined | 17:05 |
| → skorgon joined | 17:06 |
| → Davey joined | 17:07 |
| → Sym3tri_ joined | 17:07 |
|
alexchamberlain
| Hi all, I've written a post-recieve hook - on a bare repo - that clones 2 copies. On 1 copy it checks out the build branch, builds stuff from the master branch, adds everything and pushes back. The only problem is that it is calling the post-recieve hook recursively. Any ideas? | 17:07 |
|
| I guess it will involve processing STDIN | 17:08 |
| → pppaul joined | 17:08 |
|
pdelvo
| this is not specially git related, but you may can help me. I want to rename a github repository, but this does not look like a good idea because many things will break. do you have a better solution? | 17:08 |
| ← ShadeTornado left | 17:08 |
| ← psoo left | 17:10 |
| ← tommsen left | 17:10 |
| ← mklappstuhl left | 17:10 |
| → uwjesd joined | 17:10 |
|
wereHamster
| pdelvo: solution to what | 17:10 |
|
pdelvo
| I have a public repo with a working name i want to rename, but then references to it will all break | 17:11 |
| → tommsen joined | 17:11 |
|
wereHamster
| pdelvo: and where is the problem? | 17:11 |
|
pdelvo
| bookmarks will break, remotes will break. sounds not very good to me | 17:12 |
| ← letharion left | 17:12 |
|
wereHamster
| then don't rename it. | 17:12 |
| ← wolftankk left | 17:13 |
| ← Progster left | 17:14 |
| → LucasTizma joined | 17:14 |
| ← pppaul left | 17:15 |
| ← duckxx left | 17:15 |
| ← apok left | 17:16 |
| ← xxc_michael left | 17:16 |
| → tommsen_ joined | 17:16 |
| → apok joined | 17:16 |
| → letharion joined | 17:18 |
| ← titaniumNoob left | 17:18 |
| ← tommsen left | 17:18 |
| ← converge left | 17:19 |
| → spyro joined | 17:20 |
| ← spyro left | 17:20 |
| ← tommsen_ left | 17:21 |
| → spyro joined | 17:21 |
| → cmullican joined | 17:21 |
| → tommsen joined | 17:21 |
| ← etcetera left | 17:23 |
| → devth joined | 17:23 |
| → Psycho_pr_ joined | 17:24 |
| → converge joined | 17:25 |
| → p3rror joined | 17:25 |
| ← Chib left | 17:26 |
| ← p3rror left | 17:26 |
| → p3rror joined | 17:26 |
| → valberg_ joined | 17:30 |
| ← avinashhm left | 17:38 |
| ← codeshah left | 17:38 |
| ← iori left | 17:38 |
| ← eijk_ left | 17:38 |
| ← chuckharmston left | 17:38 |
| ← DanyO83 left | 17:38 |
| ← kermit left | 17:38 |
| ← hwrd|work left | 17:38 |
| ← imachuchu left | 17:38 |
| ← maxthoursie left | 17:38 |
| ← ndngvr left | 17:38 |
| ← intransit left | 17:38 |
| ← nadavoid left | 17:38 |
| ← bizhanMona left | 17:38 |
| ← Lgb left | 17:38 |
| ← cannonball left | 17:38 |
| ← paolooo left | 17:38 |
| ← SidGBF left | 17:38 |
| ← p3rror left | 17:38 |
| ← msmithng left | 17:38 |
| ← MacGyver left | 17:38 |
| ← ro0 left | 17:38 |
| ← dwmw2_go` left | 17:38 |
| ← sweet|kid left | 17:38 |
| ← converge left | 17:38 |
| ← apok left | 17:38 |
| ← tjholowaychuk left | 17:38 |
| ← maletor left | 17:38 |
| ← sq-one left | 17:38 |
| ← ajpiano left | 17:38 |
| ← roto left | 17:38 |
| ← t4nkd left | 17:38 |
| ← Vile left | 17:38 |
| ← _keith left | 17:38 |
| ← afuentes left | 17:38 |
| ← danmackay left | 17:38 |
| ← rwestphal left | 17:38 |
| ← thelazydeveloper left | 17:38 |
| ← kvanderw left | 17:38 |
| ← codeM0nK3Y left | 17:38 |
| ← ph^_ left | 17:38 |
| ← Deck` left | 17:38 |
| ← Tegi left | 17:38 |
| ← dov23 left | 17:38 |
| ← tplaner_ left | 17:38 |
| ← codewrangler left | 17:38 |
| ← ngirard left | 17:38 |
| ← revagomes left | 17:38 |
| ← geekbri left | 17:38 |
| ← giallu left | 17:38 |
| ← sgambino left | 17:38 |
| ← cybersphinx left | 17:38 |
| ← alexchamberlain left | 17:38 |
| ← SkAzZ1 left | 17:38 |
| ← jargon- left | 17:38 |
| ← robbyoconnor left | 17:38 |
| ← leeN left | 17:38 |
| ← ohcibi left | 17:38 |
| ← architekt left | 17:38 |
| ← wereHamster left | 17:38 |
| ← nigelb left | 17:38 |
| ← _iron left | 17:38 |
| ← patrick85 left | 17:38 |
| ← LimeBlast left | 17:38 |
| ← iflista left | 17:38 |
| ← zackiv31 left | 17:38 |
| ← harv left | 17:38 |
| ← xmattdh left | 17:38 |
| ← erynofwales left | 17:38 |
| ← jjbohn left | 17:38 |
| ← narfnarfnarf left | 17:38 |
| ← udantee left | 17:38 |
| ← osse left | 17:38 |
| ← TheJH left | 17:38 |
| ← quazimodo left | 17:38 |
| ← harish left | 17:38 |
| ← luxurymode left | 17:38 |
| ← roflin left | 17:38 |
| ← Ryback_ left | 17:38 |
| ← timthelion left | 17:38 |
| ← jjore left | 17:38 |
| ← Element9 left | 17:38 |
| ← freeed left | 17:38 |
| ← axl_ left | 17:38 |
| ← zw_yao left | 17:38 |
| ← kukks left | 17:38 |
| ← ehsan left | 17:38 |
| ← derekpioneer left | 17:38 |
| ← zaiste left | 17:38 |
| ← koki left | 17:38 |
| ← skyf left | 17:38 |
| ← k-man left | 17:38 |
| ← flexd left | 17:38 |
| ← gerard0 left | 17:38 |
| ← cthuluh left | 17:38 |
| ← cmullican left | 17:38 |
| ← iocor left | 17:38 |
| ← shawngo left | 17:38 |
| ← spaceonline left | 17:38 |
| ← guampa left | 17:38 |
| ← Sajaki left | 17:38 |
| ← lyddon left | 17:38 |
| ← cxreg left | 17:38 |
| ← thansen left | 17:38 |
| ← patrick99e99 left | 17:38 |
| ← frsk left | 17:38 |
| ← letharion left | 17:38 |
| ← LucasTizma left | 17:38 |
| ← LekeFly left | 17:38 |
| ← vpetro left | 17:38 |
| ← berserkr left | 17:38 |
| ← gusnan left | 17:38 |
| ← _Qman left | 17:38 |
| ← yuwang left | 17:38 |
| ← bjornars left | 17:38 |
| ← tommsen left | 17:38 |
| ← Sym3tri_ left | 17:38 |
| ← lacrymology left | 17:38 |
| ← Atlantic777 left | 17:38 |
| ← pl0sh left | 17:38 |
| ← sawdisk left | 17:38 |
| ← saml left | 17:38 |
| ← blueyed left | 17:38 |
| ← Maccer left | 17:38 |
| ← lb left | 17:38 |
| ← mrOrangeChuck left | 17:38 |
| ← fisted left | 17:38 |
| ← nwest left | 17:38 |
| ← AaronMT left | 17:38 |
| ← dvide left | 17:38 |
| ← thiago left | 17:38 |
| ← xxiao left | 17:38 |
| ← Textmode left | 17:38 |
| ← tonyj left | 17:38 |
| ← noneo left | 17:38 |
| ← glennpratt left | 17:38 |
| ← hidekin1 left | 17:38 |
| ← an0maly_ left | 17:38 |
| ← unreal left | 17:38 |
| ← und3f left | 17:38 |
| ← hoschi left | 17:38 |
| ← maloik left | 17:38 |
| ← nick_h left | 17:38 |
| ← worch left | 17:38 |
| ← opus left | 17:38 |
| ← naee left | 17:38 |
| ← shreya left | 17:38 |
| ← thomasfr left | 17:38 |
| ← alexisabril left | 17:38 |
| ← naquad left | 17:38 |
| ← hellopat left | 17:38 |
| ← FreeArtMan left | 17:38 |
| ← neurodrone left | 17:38 |
| ← albel727 left | 17:38 |
| ← Error404NotFound left | 17:38 |
| ← rphillips left | 17:38 |
| ← linduxed left | 17:38 |
| ← boombatower left | 17:38 |
| ← v0n left | 17:38 |
| ← dinesh6654 left | 17:38 |
| ← metcalfc_ left | 17:38 |
| ← oojacoboo left | 17:38 |
| ← amcsi left | 17:38 |
| ← destinydriven left | 17:38 |
| ← jcromartie left | 17:38 |
| ← dpino left | 17:38 |
| ← dax_roc left | 17:38 |
| ← skorgon left | 17:38 |
| ← ku left | 17:38 |
| ← lotus left | 17:38 |
| ← john3__ left | 17:38 |
| ← spyro left | 17:38 |
| ← uwjesd left | 17:38 |
| ← Davey left | 17:38 |
| ← jason237 left | 17:38 |
| ← martinjlowm left | 17:38 |
| ← marthinal left | 17:38 |
| ← andrewhl left | 17:38 |
| ← tango_ left | 17:38 |
| ← Bass10 left | 17:38 |
| ← diegoviola left | 17:38 |
| ← cakehero left | 17:38 |
| ← chrisgeorge left | 17:38 |
| ← palm_vue left | 17:38 |
| ← TeckniX left | 17:38 |
| ← macabre left | 17:38 |
| ← draginx left | 17:38 |
| ← frogonwheels_ left | 17:38 |
| ← mikaelj left | 17:38 |
| ← _jmg left | 17:38 |
| ← Milossh left | 17:38 |
| ← jaeckel left | 17:38 |
| ← Seveas left | 17:38 |
| ← robinsmidsrod left | 17:38 |
| ← devth left | 17:38 |
| ← khmarbaise left | 17:38 |
| ← hyperair left | 17:38 |
| ← Synthead left | 17:38 |
| ← TrafeX left | 17:38 |
| ← sirdancealot left | 17:38 |
| ← Jay_Levitt left | 17:38 |
| ← jdav_gon` left | 17:38 |
| ← chester_ left | 17:38 |
| → cycad joined | 17:39 |
| → hooch joined | 17:39 |
| → Droggl joined | 17:39 |
| → eregon joined | 17:39 |
| → project2501b joined | 17:39 |
| → littlebear joined | 17:39 |
| → esc joined | 17:39 |
| → Hunner joined | 17:39 |
| → snappy joined | 17:39 |
| → antix_ joined | 17:39 |
| → no_maam_ joined | 17:39 |
| → tazle_ joined | 17:39 |
| → crispus joined | 17:39 |
| → nasso joined | 17:39 |
| → unnamedwill joined | 17:39 |
| → akheron joined | 17:39 |
| → eightyeight joined | 17:39 |
| → Poapfel joined | 17:39 |
| → slakmagik joined | 17:39 |
| → bddn joined | 17:39 |
| → blathijs joined | 17:39 |
| → click joined | 17:39 |
| → serj joined | 17:39 |
| → spb joined | 17:39 |
| → nelk joined | 17:39 |
| → roland joined | 17:39 |
| → jsec joined | 17:39 |
| → antihero joined | 17:39 |
| → ivan` joined | 17:39 |
| → loops joined | 17:39 |
| → dax_roc joined | 17:39 |
| → jcromartie joined | 17:39 |
| → destinydriven joined | 17:39 |
| → amcsi joined | 17:39 |
| → metcalfc_ joined | 17:39 |
| → dinesh6654 joined | 17:39 |
| → daniel- joined | 17:39 |
| → Antisoche_ joined | 17:39 |
| → netj_ joined | 17:39 |
| → Caelum_ joined | 17:39 |
| → RichardBronosky_ joined | 17:39 |
| → spyro_ joined | 17:39 |
| → adhawkinz joined | 17:39 |
| → Vampire0_ joined | 17:39 |
| → floppyears joined | 17:39 |
| → Evanlec_ joined | 17:39 |
| → rudi_s_ joined | 17:39 |
| pratchett.freenode.net set mode: +v | 17:39 |
| → twisted`_ joined | 17:39 |
| → vogxn joined | 17:39 |
| → varg_ joined | 17:39 |
| → ladder4_ joined | 17:39 |
| → buhman_ joined | 17:39 |
| → matthiasgorgens1 joined | 17:39 |
| → ipalaus_ joined | 17:39 |
| → RRubin joined | 17:39 |
| → franck__ joined | 17:39 |
| → lteo_ joined | 17:39 |
| → mikaelj_ joined | 17:39 |
| → wcarss_ joined | 17:39 |
| → Weiss_ joined | 17:39 |
| → tokkee_ joined | 17:39 |
| → robins joined | 17:39 |
| → tmz_ joined | 17:39 |
| → vals_ joined | 17:39 |
| → Remram joined | 17:39 |
| → pigeon_ joined | 17:39 |
| → sparticv1 joined | 17:39 |
| → marlun joined | 17:39 |
| → tureba_ joined | 17:39 |
| → benbergm1n joined | 17:39 |
| → Gaga joined | 17:39 |
| → heoa_ joined | 17:39 |
| → OMGOMG_ joined | 17:39 |
| → kenperkins joined | 17:39 |
| → xxtjaxx_ joined | 17:39 |
| → raek_ joined | 17:39 |
| → uwjesd_ joined | 17:39 |
| → hyperbor1ean joined | 17:39 |
| → eno__ joined | 17:39 |
| → zizzfizzix_ joined | 17:39 |
| → diegovio1a joined | 17:39 |
| → eijk__ joined | 17:39 |
| → codertux_ joined | 17:39 |
| → andrewhl_ joined | 17:39 |
| → HAL_9001 joined | 17:39 |
| → martinjl` joined | 17:39 |
| → _iori_ joined | 17:39 |
| → subhojit777 joined | 17:39 |
| → p3rror joined | 17:39 |
| → converge joined | 17:39 |
| → cmullican joined | 17:39 |
| → letharion joined | 17:39 |
| → apok joined | 17:39 |
| → LucasTizma joined | 17:39 |
| → Sym3tri_ joined | 17:39 |
| → alexchamberlain joined | 17:39 |
| → _keith joined | 17:39 |
| → tjholowaychuk joined | 17:39 |
| → LekeFly joined | 17:39 |
| → lb joined | 17:39 |
| → maletor joined | 17:39 |
| → sq-one joined | 17:39 |
| → roto joined | 17:39 |
| → ajpiano joined | 17:39 |
| → freeed joined | 17:39 |
| → vpetro joined | 17:39 |
| → Textmode joined | 17:39 |
| → TheJH joined | 17:39 |
| → t4nkd joined | 17:39 |
| → afuentes joined | 17:39 |
| → iflista joined | 17:39 |
| → danmackay joined | 17:39 |
| → mrOrangeChuck joined | 17:39 |
| → fisted joined | 17:39 |
| → axl_ joined | 17:39 |
| → rwestphal joined | 17:39 |
| → saml joined | 17:39 |
| → berserkr joined | 17:39 |
| → zackiv31 joined | 17:39 |
| → harv joined | 17:39 |
| → thelazydeveloper joined | 17:39 |
| → lacrymology joined | 17:39 |
| → msmithng joined | 17:39 |
| → Atlantic777 joined | 17:39 |
| → harish joined | 17:39 |
| → zw_yao joined | 17:39 |
| → pl0sh joined | 17:39 |
| → kvanderw joined | 17:39 |
| → luxurymode joined | 17:39 |
| → codeM0nK3Y joined | 17:39 |
| → kukks joined | 17:39 |
| → ehsan joined | 17:39 |
| → xmattdh joined | 17:39 |
| → ph^_ joined | 17:39 |
| → nwest joined | 17:39 |
| → Deck` joined | 17:39 |
| → iocor joined | 17:39 |
| → shawngo joined | 17:39 |
| → Tegi joined | 17:39 |
| → erynofwales joined | 17:39 |
| → MacGyver joined | 17:39 |
| pratchett.freenode.net set mode: +v | 17:39 |
| → xxiao joined | 17:39 |
| → dov23 joined | 17:39 |
| → tplaner_ joined | 17:39 |
| → spaceonline joined | 17:39 |
| → derekpioneer joined | 17:39 |
| → sawdisk joined | 17:39 |
| → jjbohn joined | 17:39 |
| → codewrangler joined | 17:39 |
| → AaronMT joined | 17:39 |
| → zaiste joined | 17:39 |
| → ro0 joined | 17:39 |
| → wereHamster joined | 17:39 |
| → koki joined | 17:39 |
| → ohcibi joined | 17:39 |
| → ngirard joined | 17:39 |
| → revagomes joined | 17:39 |
| → Sajaki joined | 17:39 |
| → architekt joined | 17:39 |
| → nigelb joined | 17:39 |
| → roflin joined | 17:39 |
| → skyf joined | 17:39 |
| → geekbri joined | 17:39 |
| → giallu joined | 17:39 |
| → dwmw2_go` joined | 17:39 |
| → sgambino joined | 17:39 |
| → Ryback_ joined | 17:39 |
| → udantee joined | 17:39 |
| → gusnan joined | 17:39 |
| → dvide joined | 17:39 |
| → k-man joined | 17:39 |
| → flexd joined | 17:39 |
| → cybersphinx joined | 17:39 |
| → thiago joined | 17:39 |
| → frsk joined | 17:39 |
| → guampa joined | 17:39 |
| → timthelion joined | 17:39 |
| → _iron joined | 17:39 |
| → blueyed joined | 17:39 |
| → patrick85 joined | 17:39 |
| → SkAzZ1 joined | 17:39 |
| → gerard0 joined | 17:39 |
| → jjore joined | 17:39 |
| → osse joined | 17:39 |
| → Element9 joined | 17:39 |
| → lyddon joined | 17:39 |
| → cxreg joined | 17:39 |
| → LimeBlast joined | 17:39 |
| → _Qman joined | 17:39 |
| → jargon- joined | 17:39 |
| → yuwang joined | 17:39 |
| → cthuluh joined | 17:39 |
| → robbyoconnor joined | 17:39 |
| → bjornars joined | 17:39 |
| → thansen joined | 17:39 |
| → patrick99e99 joined | 17:39 |
| → Maccer joined | 17:39 |
| → leeN joined | 17:39 |
| → smw joined | 17:39 |
| → dsop joined | 17:39 |
| → sweet|kid joined | 17:39 |
| → Samos123 joined | 17:39 |
| → Fiouz joined | 17:39 |
| → j416 joined | 17:39 |
| → Zespre_ joined | 17:39 |
| → kpreid joined | 17:39 |
| → plasticboy joined | 17:39 |
| → maqr joined | 17:39 |
| → genehack joined | 17:39 |
| → SirFunk joined | 17:39 |
| → txdv joined | 17:39 |
| → iliketurtles joined | 17:39 |
| → jonmasters joined | 17:39 |
| → daniel-s joined | 17:39 |
| → Marbug joined | 17:39 |
| → i7c joined | 17:39 |
| → archdori joined | 17:39 |
| → Chaser_ joined | 17:39 |
| → Arokh joined | 17:39 |
| → hays joined | 17:39 |
| → SamB_MacG5 joined | 17:39 |
| → project2501a joined | 17:39 |
| → jgoss joined | 17:39 |
| → milian joined | 17:39 |
| → ethanol joined | 17:39 |
| → osmosis joined | 17:39 |
| → garo joined | 17:39 |
| → przemoc joined | 17:39 |
| → resmo joined | 17:39 |
| → rking joined | 17:39 |
| → qknight joined | 17:39 |
| → bartman` joined | 17:39 |
| → SegFaultAX|work2 joined | 17:39 |
| → Mez joined | 17:39 |
| → aep joined | 17:39 |
| → Pupeno_W joined | 17:39 |
| → JStoker joined | 17:39 |
| → gitinfo joined | 17:39 |
| → ozzloy joined | 17:39 |
| → awx joined | 17:39 |
| → _sundar_ joined | 17:39 |
| → diago joined | 17:39 |
| → cenuij joined | 17:39 |
| → dpwright joined | 17:39 |
| → toed joined | 17:39 |
| → Kindari joined | 17:39 |
| → newbie999 joined | 17:39 |
| → ruskie joined | 17:39 |
| → pasky joined | 17:39 |
| → IcePic joined | 17:39 |
| → alta joined | 17:39 |
| → kkszysiu_work joined | 17:39 |
| → _W_ joined | 17:39 |
| → cbreak joined | 17:39 |
| → nobdraisentone joined | 17:39 |
| → Tuomas joined | 17:39 |
| → heroux joined | 17:39 |
| → oso96_2000 joined | 17:39 |
| → kristopolous joined | 17:39 |
| → nutron joined | 17:39 |
| → bremner joined | 17:39 |
| → russt joined | 17:39 |
| → Bombe joined | 17:39 |
| → Olipro joined | 17:39 |
| → jrdnn joined | 17:39 |
| → s0ber joined | 17:39 |
| → milleja46 joined | 17:39 |
| → b_jonas joined | 17:39 |
| → jspiros joined | 17:39 |
| → bloony joined | 17:39 |
| → Praise joined | 17:39 |
| → jast joined | 17:39 |
| → mitsuhiko joined | 17:39 |
| → MetaCosm joined | 17:39 |
| → teotwaki joined | 17:39 |
| → tubbo joined | 17:39 |
| → kiffer84 joined | 17:39 |
| → un1matr1x joined | 17:39 |
| → EugeneKay joined | 17:39 |
| → ReinH joined | 17:39 |
| → Womkes joined | 17:39 |
| → yardenac joined | 17:39 |
| pratchett.freenode.net set mode: +ovv | 17:39 |
| → acrocity joined | 17:39 |
| → Putr joined | 17:39 |
| → Khisanth joined | 17:39 |
| → mmattice joined | 17:39 |
| → gxk joined | 17:39 |
| → hpa joined | 17:39 |
| → Y_Ichiro joined | 17:39 |
| → CareBear\ joined | 17:39 |
| → SunilThaha joined | 17:39 |
| → Marcux83 joined | 17:39 |
| → pdelvo joined | 17:39 |
| → r126t joined | 17:39 |
| → siprbaum joined | 17:39 |
| → oakdog8 joined | 17:39 |
| → Kicer86 joined | 17:39 |
| → Nikoli joined | 17:39 |
| → aaronky joined | 17:39 |
| → kart0ffelsack joined | 17:39 |
| → Maldoror joined | 17:39 |
| → NfNitLoop joined | 17:39 |
| → eMBee joined | 17:39 |
| → GameGamer43 joined | 17:39 |
| → rhl joined | 17:39 |
| → keller joined | 17:39 |
| → smarter_ joined | 17:39 |
| → SebastianFlyte joined | 17:39 |
| → grillo joined | 17:39 |
| → helgikrs joined | 17:39 |
| → flaguy48 joined | 17:39 |
| → actel joined | 17:39 |
| → denysonique joined | 17:39 |
| → jab416171|Cloud joined | 17:39 |
| → tfnico joined | 17:39 |
| → NimeshNeema joined | 17:39 |
| → offbyone joined | 17:39 |
| → jmcantrell joined | 17:39 |
| → jave_ joined | 17:39 |
| → JEEB joined | 17:39 |
| → GodEater joined | 17:39 |
| → Zenopus joined | 17:39 |
| → mattp_ joined | 17:39 |
| → Bigcheese joined | 17:39 |
| → vDubG joined | 17:39 |
| → optixx joined | 17:39 |
| → dgottlieb joined | 17:39 |
| → kimico joined | 17:39 |
| → MissionCritical joined | 17:39 |
| → melee_ joined | 17:39 |
| → rkz joined | 17:39 |
| → allquixotic joined | 17:39 |
| → rails joined | 17:39 |
| → yhager joined | 17:39 |
| → Beej joined | 17:39 |
| → txomon|nqas joined | 17:39 |
| → tty1 joined | 17:39 |
| → gmarkall joined | 17:39 |
| → foraks joined | 17:39 |
| → talexb joined | 17:39 |
| → Guest42477 joined | 17:39 |
| → multi_io joined | 17:39 |
| → hegge joined | 17:39 |
| → axrfnu joined | 17:39 |
| → chrisward joined | 17:39 |
| → bronsen joined | 17:39 |
| → tizzo joined | 17:39 |
| → zibri joined | 17:39 |
| → electrog1ek joined | 17:39 |
| → brandonw_ joined | 17:39 |
| → jhford_ joined | 17:39 |
| → twem2 joined | 17:39 |
| → JrCs joined | 17:39 |
| → ShooterMG joined | 17:39 |
| → Orphis joined | 17:39 |
| → Chani joined | 17:39 |
| → pavelz joined | 17:39 |
| → heinrich5991 joined | 17:39 |
| → SaCu joined | 17:39 |
| → KBme joined | 17:39 |
| → SiDz joined | 17:39 |
| → yorick joined | 17:39 |
| → lindenle joined | 17:39 |
| → lu_zero joined | 17:39 |
| → arex\ joined | 17:39 |
| → berndj joined | 17:39 |
| → camdenx joined | 17:39 |
| → hexa2k9 joined | 17:39 |
| → ameoba joined | 17:39 |
| → malesca joined | 17:39 |
| → lsobral joined | 17:39 |
| → soren joined | 17:39 |
| → legumbre joined | 17:39 |
| → akiress joined | 17:39 |
| → Swathe_ joined | 17:39 |
| → nb joined | 17:39 |
| pratchett.freenode.net set mode: +v | 17:39 |
| → kini joined | 17:39 |
| → Ratler joined | 17:39 |
| → cschneid joined | 17:39 |
| → Odjuret_ joined | 17:39 |
| → ketas joined | 17:39 |
| → Hamled joined | 17:39 |
| → blami joined | 17:39 |
| → lamont joined | 17:39 |
| → sjefen6 joined | 17:39 |
| → variable joined | 17:39 |
| → colona joined | 17:39 |
| → sporous joined | 17:39 |
| → liori joined | 17:39 |
| → chayin_ joined | 17:39 |
| → wart___ joined | 17:39 |
| → d1b joined | 17:39 |
| → dzan joined | 17:39 |
| → mbreslin joined | 17:39 |
| → kanru_ joined | 17:39 |
| → diminoten joined | 17:39 |
| → BinGOs joined | 17:39 |
| → TML joined | 17:39 |
| → tg joined | 17:39 |
| → schlumpi joined | 17:39 |
| → chuckf joined | 17:39 |
| → FabTG_ joined | 17:39 |
| → elliottc1ble joined | 17:39 |
| → wanders_ joined | 17:39 |
| → myme joined | 17:39 |
| → shibayu36_ joined | 17:39 |
| → hide_ joined | 17:39 |
| → Moult joined | 17:39 |
| → nevyn joined | 17:39 |
| → drodger joined | 17:39 |
| → chris2 joined | 17:39 |
| → ZorgHCS joined | 17:39 |
| → oakdog8__ joined | 17:39 |
| → LittleFool joined | 17:39 |
| → charon joined | 17:39 |
| → oogatta joined | 17:39 |
| → troyt joined | 17:39 |
| → Gizmokid2005 joined | 17:39 |
| → basepi joined | 17:39 |
| → guide joined | 17:39 |
| → Corey joined | 17:39 |
| → Bilge joined | 17:39 |
| → gefd joined | 17:39 |
| → daethorian joined | 17:39 |
| → sontek joined | 17:39 |
| → jstemmer joined | 17:39 |
| → SwK joined | 17:39 |
| → metze joined | 17:39 |
| → stepnem joined | 17:39 |
| → thallada joined | 17:39 |
| → SkieDr joined | 17:39 |
| → imarcusthis joined | 17:39 |
| → Soliton joined | 17:39 |
| → dropdrive joined | 17:39 |
| → FauxFaux joined | 17:39 |
| → Cerise joined | 17:39 |
| → kenyon joined | 17:39 |
| → Will| joined | 17:39 |
| → steevel joined | 17:39 |
| → Mogget joined | 17:39 |
| → dirker_ joined | 17:39 |
| → petteyg joined | 17:39 |
| → tystr joined | 17:39 |
| → xrogaan_ joined | 17:39 |
| → Strogg joined | 17:39 |
| → jperry2 joined | 17:39 |
| → SethRobertson joined | 17:39 |
| → Derander joined | 17:39 |
| → olri joined | 17:39 |
| → EToS joined | 17:39 |
| → hejki joined | 17:39 |
| → Fissure joined | 17:39 |
| → ammar joined | 17:39 |
| → somasin joined | 17:39 |
| → Caius joined | 17:39 |
| → n2o4 joined | 17:39 |
| → kanzure joined | 17:39 |
| → felher joined | 17:39 |
| → Freeaqingme joined | 17:39 |
| → mtkd_ joined | 17:39 |
| → LotR joined | 17:39 |
| → lfaraone__ joined | 17:39 |
| → tomek joined | 17:39 |
| → jhoepken joined | 17:39 |
| → kmussel joined | 17:39 |
| → majuscule joined | 17:39 |
| → TheMoonMaster joined | 17:39 |
| → offby1 joined | 17:39 |
| → mjessome joined | 17:39 |
| → sente joined | 17:39 |
| → Sajbar joined | 17:39 |
| → teukka joined | 17:39 |
| → rvsjoen joined | 17:39 |
| → niax joined | 17:39 |
| → totte joined | 17:39 |
| → VadtecWk joined | 17:39 |
| → Maxdamantus joined | 17:39 |
| → Drakevr joined | 17:39 |
| → surfdue joined | 17:39 |
| → theoros joined | 17:39 |
| → majoh joined | 17:39 |
| → mythmon joined | 17:39 |
| → Pieter joined | 17:39 |
| → UukGoblin joined | 17:39 |
| → coopsh joined | 17:39 |
| → roger_raymond joined | 17:39 |
| → haarg joined | 17:39 |
| → yeryry joined | 17:39 |
| → pom_ joined | 17:39 |
| → RichardJ joined | 17:39 |
| → Myhro joined | 17:39 |
| → _ikke_ joined | 17:39 |
| → Natureshadow joined | 17:39 |
| → Nickeeh joined | 17:39 |
| → AlexanderS joined | 17:39 |
| → EgS joined | 17:39 |
| → Ingmar joined | 17:39 |
| → zorzar joined | 17:39 |
| → mikegerw1tz joined | 17:39 |
| → txwikinger joined | 17:39 |
| → kloeri joined | 17:39 |
| → sente` joined | 17:39 |
| → tomaw joined | 17:39 |
| → maxb joined | 17:39 |
| → bwidmer joined | 17:39 |
| → Stravy joined | 17:39 |
| → Fuxx joined | 17:39 |
| → phryk joined | 17:39 |
| → mika joined | 17:39 |
| → Chipzz joined | 17:39 |
| → Derega joined | 17:39 |
| → sobel joined | 17:39 |
| → Lisimba2 joined | 17:39 |
| → sneakret joined | 17:39 |
| → reuss joined | 17:39 |
| → ndim joined | 17:39 |
| → Slush- joined | 17:39 |
| pratchett.freenode.net set mode: +v | 17:39 |
| → SJr joined | 17:39 |
| → GH0S1_R33P0R joined | 17:39 |
| → maxorator joined | 17:39 |
| → cworth joined | 17:39 |
| → leptonix joined | 17:39 |
| → epitron joined | 17:39 |
| → sharpobject joined | 17:39 |
| → ybit joined | 17:39 |
| → bball- joined | 17:39 |
| → marienz joined | 17:39 |
| → Grum joined | 17:39 |
| → poohtarou joined | 17:39 |
| → joschi joined | 17:39 |
| → Kiall joined | 17:39 |
| → felipe joined | 17:39 |
| → mikeshultz joined | 17:39 |
| → spacepluk joined | 17:39 |
| → deavid joined | 17:39 |
| → [mbm] joined | 17:39 |
| → JPohlmann joined | 17:39 |
| → e-ndy joined | 17:39 |
| → makkes joined | 17:39 |
| → doki_pen joined | 17:39 |
| → dj_tjerk joined | 17:39 |
| → Bucciarati joined | 17:39 |
| → batrick joined | 17:39 |
| → chronos joined | 17:39 |
| → Kuukunen joined | 17:39 |
| → ldlework joined | 17:39 |
| → ironfroggy joined | 17:39 |
| → up_the_irons joined | 17:39 |
| → ahf joined | 17:39 |
| → kirin` joined | 17:39 |
| ← daniel- left | 17:39 |
| → DarkClown joined | 17:39 |
| → cespare joined | 17:39 |
| → palm_vue joined | 17:39 |
| → tommsen joined | 17:39 |
| → dermoth|home joined | 17:39 |
| → Milossh joined | 17:39 |
| → toky joined | 17:39 |
| → Dynom joined | 17:39 |
| → larva joined | 17:39 |
| → Bass2 joined | 17:39 |
| → youngblood_ joined | 17:39 |
| → TeckniX_ joined | 17:39 |
| → devth joined | 17:39 |
| → khmarbaise joined | 17:39 |
| → hyperair joined | 17:39 |
| → Synthead joined | 17:39 |
| → TrafeX joined | 17:39 |
| → sirdancealot joined | 17:39 |
| → Jay_Levitt joined | 17:39 |
| → jdav_gon` joined | 17:39 |
| → chester_ joined | 17:39 |
| → tinti_ joined | 17:39 |
| → jjore_ joined | 17:39 |
| → mlevin joined | 17:39 |
| → Vinnie_win joined | 17:39 |
| → Zeeshan_M joined | 17:39 |
| → squentin joined | 17:39 |
| → Emmycakes joined | 17:39 |
| → zz_jcao219 joined | 17:39 |
| → madduck joined | 17:39 |
| → finch joined | 17:39 |
| → jkitchen joined | 17:39 |
| → milli` joined | 17:39 |
| → Sargun_Screen joined | 17:39 |
| → mikemol joined | 17:39 |
| → Glitch| joined | 17:39 |
| → jams joined | 17:39 |
| → davidh joined | 17:39 |
| → lae joined | 17:39 |
| → goner joined | 17:39 |
| → SIFTU joined | 17:39 |
| → kcm1700 joined | 17:39 |
| → SimonP86 joined | 17:39 |
| → sejo joined | 17:39 |
| → jeremy_c_ joined | 17:39 |
| → imMute joined | 17:39 |
| → cedr joined | 17:39 |
| → shad joined | 17:39 |
| → Nugget joined | 17:39 |
| → milki joined | 17:39 |
| → ben_alman joined | 17:39 |
| → devn joined | 17:39 |
| → OPK joined | 17:39 |
| → mattikus joined | 17:39 |
| → draginx joined | 17:39 |
| → paolooo joined | 17:39 |
| → aantix joined | 17:39 |
| ← SwK left | 17:39 |
| → skorgon joined | 17:39 |
| → ku joined | 17:39 |
| → lotus joined | 17:39 |
| → john3__ joined | 17:39 |
| → krishna joined | 17:39 |
| → three18ti joined | 17:39 |
| → asakura joined | 17:39 |
| → ahayweh joined | 17:39 |
| → sh4rm4 joined | 17:39 |
| → cmn joined | 17:39 |
| → Windwaker joined | 17:39 |
| → The24z joined | 17:39 |
| → RobertLaptop joined | 17:39 |
| → KRF joined | 17:39 |
| → zivester joined | 17:39 |
| → vitor-br joined | 17:39 |
| → intripoon_ joined | 17:39 |
| → grandy joined | 17:39 |
| → WakiMiko joined | 17:39 |
| → rrxtns joined | 17:39 |
| → nogginBasher joined | 17:39 |
| → Internet13 joined | 17:39 |
| → setmeaway joined | 17:39 |
| → Adys joined | 17:39 |
| → piggybox joined | 17:39 |
| → beawesomeinstead joined | 17:39 |
| → dougsland joined | 17:39 |
| → phix joined | 17:39 |
| → Merwin joined | 17:39 |
| → lonewulf` joined | 17:39 |
| → nowhere_man joined | 17:39 |
| → kaen joined | 17:39 |
| → iamtakingiteasy joined | 17:39 |
| → candybar joined | 17:39 |
| → n00b6502 joined | 17:39 |
| → Nibato joined | 17:39 |
| → Tommy[D] joined | 17:39 |
| → Kabaka joined | 17:39 |
| → webben joined | 17:39 |
| → krazyj joined | 17:39 |
| → SHAGGSTaRR joined | 17:39 |
| → faen joined | 17:39 |
| → Gitzilla joined | 17:39 |
| → else- joined | 17:39 |
| → stfn joined | 17:39 |
| → Leonidas joined | 17:39 |
| → ciscon joined | 17:39 |
| → anildigital joined | 17:39 |
| → jlewis joined | 17:39 |
| → Godslastering joined | 17:39 |
| → JonasF_ joined | 17:39 |
| → neersighted joined | 17:39 |
| → neurodamage joined | 17:39 |
| → drags joined | 17:39 |
| → CrazyGir joined | 17:39 |
| → _root_ joined | 17:39 |
| → othiym23 joined | 17:39 |
| → aboudreault joined | 17:39 |
| → BBonifield joined | 17:39 |
| → vinay joined | 17:39 |
| → Ferris_ joined | 17:39 |
| → jayne joined | 17:39 |
| → avium joined | 17:39 |
| → lahwran joined | 17:39 |
| → esto joined | 17:39 |
| → lqi joined | 17:39 |
| → ciaranm joined | 17:39 |
| → rjt_ joined | 17:39 |
| → avinash_hm joined | 17:40 |
| → ferai joined | 17:40 |
| → Exposure_ joined | 17:40 |
| → DanyO joined | 17:40 |
| → molixiaoge__ joined | 17:40 |
| → hwrd|work joined | 17:40 |
| → imachuchu joined | 17:40 |
| → maxthoursie joined | 17:40 |
| → ndngvr joined | 17:40 |
| → intransit joined | 17:40 |
| → nadavoid joined | 17:40 |
| → bizhanMona joined | 17:40 |
| → Lgb joined | 17:40 |
| → cannonball joined | 17:40 |
| → keltvek joined | 17:40 |
| → magnus_ joined | 17:40 |
| → meatlover joined | 17:40 |
| → warthog9 joined | 17:40 |
| → palyboy joined | 17:40 |
| → Tabmow joined | 17:40 |
| → bigmeow joined | 17:40 |
| → scttnlsn joined | 17:40 |
| → CEnnis91 joined | 17:40 |
| → avar joined | 17:40 |
| → lausi joined | 17:40 |
| → dsantiago joined | 17:40 |
| → SJS joined | 17:40 |
| → sitaram joined | 17:40 |
| → jpalmer joined | 17:40 |
| → The_Ball joined | 17:40 |
| → thomas_b joined | 17:40 |
| → PaulePanter joined | 17:40 |
| → Mpenzi joined | 17:40 |
| → gnoel_ joined | 17:40 |
| → tabakhase_ joined | 17:40 |
| → vmiklos_ joined | 17:40 |
| → djh___ joined | 17:40 |
| → efjboss_ joined | 17:40 |
| → Spockz_ joined | 17:40 |
| → frogonwheels__ joined | 17:40 |
| → ianmcorvidae|alt joined | 17:40 |
| → opus joined | 17:40 |
| → naee joined | 17:40 |
| → shreya joined | 17:40 |
| → thomasfr joined | 17:40 |
| → alexisabril joined | 17:40 |
| → naquad joined | 17:40 |
| → hellopat joined | 17:40 |
| → FreeArtMan joined | 17:40 |
| → neurodrone joined | 17:40 |
| → albel727 joined | 17:40 |
| → Error404NotFound joined | 17:40 |
| → meLon joined | 17:40 |
| → preflex joined | 17:40 |
| → Kichael joined | 17:40 |
| → Fandekasp joined | 17:40 |
| → joephelius joined | 17:40 |
| → TNTshop joined | 17:40 |
| → markatto joined | 17:40 |
| → torjus joined | 17:40 |
| → eam joined | 17:40 |
| → dv_ joined | 17:40 |
| → madsy joined | 17:40 |
| → microcolonel joined | 17:40 |
| → rue joined | 17:40 |
| → barneybook joined | 17:40 |
| → ping-pong joined | 17:40 |
| → nischayn22 joined | 17:40 |
| → bgerber joined | 17:40 |
| → lottadot joined | 17:40 |
| → cpg|away joined | 17:40 |
| → srcerer joined | 17:40 |
| → piti joined | 17:40 |
| → Silex joined | 17:40 |
| → zamba joined | 17:40 |
| → JPT joined | 17:40 |
| → tgummerer joined | 17:40 |
| → redrocket joined | 17:40 |
| → wolog joined | 17:40 |
| → canton7 joined | 17:40 |
| → tonsofpcs joined | 17:40 |
| → cmr joined | 17:40 |
| → qwertz_ joined | 17:40 |
| → tgggg joined | 17:40 |
| → peper joined | 17:40 |
| → ikrabbe joined | 17:40 |
| → rphillips joined | 17:40 |
| → linduxed joined | 17:40 |
| → tchan joined | 17:40 |
| → delt0r joined | 17:40 |
| → _jesse_ joined | 17:40 |
| → mh_le joined | 17:40 |
| → AlexMax joined | 17:40 |
| → yibe_ joined | 17:40 |
| → abackstrom joined | 17:40 |
| → shabble joined | 17:40 |
| → errr joined | 17:40 |
| → orisinal joined | 17:40 |
| → TTilus joined | 17:40 |
| → chadi joined | 17:40 |
| ← MissionCritical left | 17:40 |
| ← Adys left | 17:40 |
| ← Kabaka left | 17:40 |
| ← neersighted left | 17:40 |
| ← nogginBasher left | 17:40 |
| ← Godslastering left | 17:40 |
| ← Internet13 left | 17:40 |
| ← aantix left | 17:40 |
| ← cmn left | 17:40 |
| → Adys joined | 17:40 |
| ← peper left | 17:40 |
| → boombatower joined | 17:40 |
| → v0n joined | 17:40 |
| → magcius joined | 17:40 |
| → tr4656 joined | 17:40 |
| → RandalSchwartz joined | 17:40 |
| → tansell joined | 17:40 |
| → _aeris_ joined | 17:40 |
| → tm1000 joined | 17:40 |
| → heytrav joined | 17:40 |
| → kryl99 joined | 17:40 |
| → skoop joined | 17:40 |
| → zenazn joined | 17:40 |
| → EvanDotPro joined | 17:40 |
| → Tectu joined | 17:40 |
| → Seveaz joined | 17:40 |
| → Tuna-Fish2 joined | 17:40 |
| → micah joined | 17:40 |
| → tokiya_ joined | 17:40 |
| → tonyj joined | 17:40 |
| → noneo joined | 17:40 |
| → glennpratt joined | 17:40 |
| → maloik joined | 17:40 |
| → hidekin1 joined | 17:40 |
| → an0maly_ joined | 17:40 |
| → unreal joined | 17:40 |
| → und3f joined | 17:40 |
| → hoschi joined | 17:40 |
| → artnez joined | 17:40 |
| → toothr joined | 17:40 |
| → mgorbach joined | 17:40 |
| → scriabin joined | 17:40 |
| → xerxas joined | 17:40 |
| → jcp joined | 17:40 |
| → aruiz joined | 17:40 |
| → gurps joined | 17:40 |
| → niki joined | 17:40 |
| → lectrick joined | 17:40 |
| → heidar joined | 17:40 |
| → ivan\ joined | 17:40 |
| → cian1500ww joined | 17:40 |
| → tnelson joined | 17:40 |
| → gonzzor joined | 17:40 |
| → ryland_ joined | 17:40 |
| → RickXy joined | 17:40 |
| → saurik joined | 17:40 |
| → andres joined | 17:40 |
| → aromasca_ joined | 17:40 |
| → yatiohi joined | 17:40 |
| → mh` joined | 17:40 |
| → knittl joined | 17:40 |
| → sunny256 joined | 17:40 |
| → kortti joined | 17:40 |
| → dcorbin_work joined | 17:40 |
| → DrNick joined | 17:40 |
| → ScottE joined | 17:40 |
| → iivvoo joined | 17:40 |
| → nick_h joined | 17:40 |
| → worch joined | 17:40 |
| → RichiH joined | 17:40 |
| → Werring joined | 17:40 |
| → mikejw joined | 17:40 |
| → jbub joined | 17:40 |
| → Estragon joined | 17:40 |
| → robonyankitty joined | 17:40 |
| → peper joined | 17:40 |
| → aantix joined | 17:40 |
| ← ndngvr left | 17:40 |
| ← jpalmer left | 17:40 |
| ← daniel-s left | 17:40 |
| → Lisimba3 joined | 17:41 |
| → jpalmer joined | 17:41 |
| → neersighted joined | 17:41 |
| ← tjholowaychuk left | 17:41 |
| ← tommsen left | 17:41 |
| → Kabaka joined | 17:41 |
| ← tabakhase_ left | 17:41 |
| → ndngvr joined | 17:41 |
| ← Olipro left | 17:41 |
| ← xmattdh left | 17:42 |
| ← SamB_MacG5 left | 17:42 |
| → cmn joined | 17:42 |
| → xmattdh joined | 17:42 |
| → weltall joined | 17:42 |
| → joeytwiddle joined | 17:42 |
| ← Error404NotFound left | 17:42 |
| → SegFaultAX joined | 17:43 |
| ← Lisimba2 left | 17:43 |
| ← iocor left | 17:43 |
| ← srcerer left | 17:43 |
|
mikemol
| Ok, so I screwed up; I created a branch, did some work in that branch and committed those changes to that branch. All well and good. Without realizing it, I subsequently switched back to master and committed a number of changes to that. I've merged those changes into my branch, now how do I cull them from master? | 17:43 |
| → jason237 joined | 17:44 |
| ← chrisward left | 17:44 |
|
FauxFaux
| mikemol: !fixup | 17:44 |
|
gitinfo
| mikemol: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 17:44 |
| → daniel-s joined | 17:44 |
|
FauxFaux
| But, it's probably going to be easiest to destroy the merge, rebase (cherry-pick them) into the branch and just rewind master. | 17:44 |
| ← netj_ left | 17:44 |
| ← Antisoche_ left | 17:44 |
| ← dinesh6654 left | 17:44 |
| ← metcalfc_ left | 17:44 |
| ← amcsi left | 17:44 |
| ← destinydriven left | 17:44 |
| ← jcromartie left | 17:44 |
| ← dax_roc left | 17:44 |
| ← loops left | 17:44 |
| ← ivan` left | 17:44 |
| ← antihero left | 17:44 |
| ← roland left | 17:44 |
| ← nelk left | 17:44 |
| ← jsec left | 17:44 |
| ← spb left | 17:44 |
| ← serj left | 17:44 |
| ← click left | 17:44 |
| ← blathijs left | 17:44 |
| ← bddn left | 17:44 |
| ← slakmagik left | 17:44 |
| ← Poapfel left | 17:44 |
| ← eightyeight left | 17:44 |
| ← akheron left | 17:44 |
| ← unnamedwill left | 17:44 |
| ← nasso left | 17:44 |
| ← tazle_ left | 17:44 |
| ← no_maam_ left | 17:44 |
| ← antix_ left | 17:44 |
| ← esc left | 17:44 |
| ← littlebear left | 17:44 |
| ← snappy left | 17:44 |
| ← project2501b left | 17:44 |
| ← eregon left | 17:44 |
| ← Hunner left | 17:44 |
| ← Droggl left | 17:44 |
| ← crispus left | 17:44 |
| ← hooch left | 17:44 |
| → Internet13 joined | 17:45 |
| → netj_ joined | 17:45 |
| → Antisoche_ joined | 17:45 |
| → dinesh6654 joined | 17:45 |
| → metcalfc_ joined | 17:45 |
| → amcsi joined | 17:45 |
| → destinydriven joined | 17:45 |
| → jcromartie joined | 17:45 |
| → dax_roc joined | 17:45 |
| → loops joined | 17:45 |
| → ivan` joined | 17:45 |
| → antihero joined | 17:45 |
| → jsec joined | 17:45 |
| → roland joined | 17:45 |
| → nelk joined | 17:45 |
| → spb joined | 17:45 |
| → serj joined | 17:45 |
| → click joined | 17:45 |
| → blathijs joined | 17:45 |
| → bddn joined | 17:45 |
| → slakmagik joined | 17:45 |
| → Poapfel joined | 17:45 |
| → eightyeight joined | 17:45 |
| → akheron joined | 17:45 |
| → unnamedwill joined | 17:45 |
| → nasso joined | 17:45 |
| → crispus joined | 17:45 |
| → tazle_ joined | 17:45 |
| → no_maam_ joined | 17:45 |
| → antix_ joined | 17:45 |
| → snappy joined | 17:45 |
| → Hunner joined | 17:45 |
| → esc joined | 17:45 |
| → littlebear joined | 17:45 |
| → project2501b joined | 17:45 |
| → eregon joined | 17:45 |
| → Droggl joined | 17:45 |
| → hooch joined | 17:45 |
| pratchett.freenode.net set mode: +v | 17:45 |
| ← p3rror left | 17:45 |
|
mikemol
| Rewinding master sounds like what I need to do; my branch is in the state I like it, I just need to get rid of the last few commits on master. | 17:45 |
| ← erynofwales left | 17:46 |
| → face__ joined | 17:46 |
| → tommsen joined | 17:47 |
|
mikemol
| Ah, I see. My svn background is getting in my way again. | 17:47 |
| ← ahayweh left | 17:47 |
| → chrisward joined | 17:48 |
| gitinfo set mode: +v | 17:48 |
|
imachuchu
| mikemol: and are you sure you haven't pushed these changes, or someone else hasn't pulled them yet? | 17:48 |
|
| if so then just reset master back to where you want it | 17:49 |
|
| sorry, if the changes are still completely local then just reset master back to where you want it | 17:49 |
| → kermit joined | 17:49 |
| ← _iori_ left | 17:49 |
| → jaeckel joined | 17:50 |
| ← skorgon left | 17:50 |
|
mikemol
| Tried to push, but a server issue blocked it, fortunately. Nobody can pull from me. | 17:51 |
| ← LucasTizma left | 17:51 |
| ← tommsen left | 17:51 |
| → Godslastering joined | 17:52 |
|
imachuchu
| mikemol: and when you said "merged those changes", I assume you meant with the merge command (as opposed to cherry-picking) | 17:52 |
| → Olipro joined | 17:52 |
|
imachuchu
| mikemol: in which case FauxFaux is correct, you will need to undo the merge (like reset before it) then cherry-pick the commits you want from master into your branch | 17:53 |
| → dreiss joined | 17:53 |
|
imachuchu
| mikemol: preferably before you rebase master (though that's not completely needed) | 17:53 |
|
| mikemol: *reset master | 17:53 |
| ← yatiohi left | 17:53 |
| → jalama joined | 17:54 |
| ← paolooo left | 17:54 |
| ← shreya left | 17:54 |
| ← maqr left | 17:54 |
| → Ntrepid joined | 17:54 |
| → NTrepid_ joined | 17:56 |
| → oojacoboo joined | 17:56 |
| → marthinal joined | 17:56 |
| ← NTrepid_ left | 17:56 |
| → evaned1 joined | 17:56 |
| ← benbergm1n left | 17:56 |
| → eletuchy joined | 17:57 |
| → p3rror joined | 17:57 |
| → MissionCritical joined | 17:57 |
| → tommsen joined | 17:57 |
| ← Ntrepid left | 17:57 |
| → armenianeagle joined | 17:57 |
| → bartek joined | 17:58 |
| → NTrepid joined | 17:58 |
| → fedesilva joined | 17:58 |
| → und3f1 joined | 17:58 |
| ← und3f left | 17:58 |
| ← fedesilva left | 17:58 |
| → erynofwales joined | 17:59 |
| → towski joined | 17:59 |
|
mikemol
| imachuchu, FauxFaux: thx | 17:59 |
| ← t4nkd left | 18:00 |
| → jackyyll joined | 18:00 |
|
mikemol
| git log for both branches looks the same right now, so I'm no longer sure exactly where the merge took place. | 18:01 |
|
imachuchu
| mikemol: was it a ff merge (like you rebased before hand and then merged)? | 18:02 |
| → iori joined | 18:02 |
| → SamB_MacG5 joined | 18:03 |
|
mikemol
| 'git merge master' output in scrollback says "Fast-forward", yeah. | 18:04 |
| ← Samos123 left | 18:04 |
| → Samos123 joined | 18:04 |
| ← axl_ left | 18:05 |
| → fluxdude joined | 18:05 |
|
mikemol
| Hm. The same output includes the text "0c06542..37ec24a" ... I wonder if I can use that to find the point where the merge happened. | 18:06 |
| → t4nkd joined | 18:06 |
| gitinfo set mode: +v | 18:06 |
|
evaned1
| Hi all. I'm trying to build Git 1.7.12 on Red Hat Enterprise 6. I ran 'make prefix=... PROFILE=BUILD SANE_TOOL_PATH=/s/gcc-4.7.1/bin all', but nearly all git-svn tests are failing. ("not ok - 2 import an SVN revision into git", "not ok - 4 try a deep --rmdir with a commit", etc.) It says I can define NO_SVN_TESTS to skip them, but I'd rather get it working. Any ideas of what's not right? I can run 'svn' from the command line fine; it's 1.7.4. | 18:06 |
|
lb
| mikemol: thats all you need | 18:07 |
| ← opus left | 18:07 |
|
lb
| then master was at 0c06542 | 18:07 |
|
| before the merge took place | 18:07 |
|
imachuchu
| evaned1: any reason you aren't just using the ones in the repo/an rpm of git? | 18:08 |
|
lb
| mikemol: and it was fast forwareded to 37ec24a | 18:08 |
| → maqr joined | 18:08 |
| ← p3rror left | 18:08 |
|
evaned1
| Reason building my own: no admin rights and installing to a custom location | 18:08 |
|
imachuchu
| evaned1: we've just had people in the last couple of days who didn't know they had a package manager | 18:10 |
| → tjadc joined | 18:10 |
| gitinfo set mode: +v | 18:10 |
|
evaned1
| fair enough :-) | 18:10 |
|
cmn
| do you have the development libraries for libsvn? | 18:10 |
| → shruggar joined | 18:11 |
|
cmn
| actually, you shouldn't need that, just the perl lib | 18:13 |
|
micah
| how can I merge in a set of commits without taking everything else, and without having to cherry-pick each individual commit? | 18:14 |
|
evaned1
| cmn: know how I can check for the presence of the perl libraries? | 18:14 |
| ← maxthoursie left | 18:14 |
|
evaned1
| i don't really know perl | 18:14 |
|
cmn
| apt-cache show libperl-svn or something | 18:14 |
|
| or try to run your git-svn and see what it says | 18:15 |
|
mikemol
| lb: Master wasn't what was fast-forwarded. At least, I don't think it was. Hell, even I can't remember the sequence of events any more. Grr. | 18:15 |
| ← shruggar left | 18:15 |
|
mikemol
| I'll get this sorted out. At this point, it would have been easier to just rewrite the work; the commits were trivial. :( | 18:15 |
| ← jalama left | 18:15 |
| → tabakhase_ joined | 18:16 |
| → __class__ joined | 18:16 |
| → eighty4_ joined | 18:16 |
| → marc_kdab_ joined | 18:16 |
| → asedeno_ joined | 18:16 |
| → quadz joined | 18:16 |
| → njbair_ joined | 18:16 |
| → idoru joined | 18:16 |
| ← twisted`_ left | 18:16 |
| → twisted`_ joined | 18:16 |
| ← ladder4_ left | 18:16 |
| → ladder4_ joined | 18:16 |
| ← palm_vue left | 18:16 |
| → palm_vue joined | 18:16 |
|
evaned1
| ah, that's the problem. thanks | 18:16 |
| → _br_ joined | 18:16 |
| → SeySayux joined | 18:16 |
| → quazimod1 joined | 18:16 |
| → blast_hardcheese joined | 18:16 |
| → jtwalters joined | 18:16 |
| → xid joined | 18:16 |
| → dermoth|work joined | 18:16 |
| → thorbjornDX joined | 18:16 |
| ← NTrepid left | 18:16 |
| → NTrepid joined | 18:16 |
| ← Tegi left | 18:16 |
| ← marc_kdab_ left | 18:17 |
|
evaned1
| now i'm unsure of why it seemed to work on another system, but whatever i guess | 18:17 |
| → marc_kdab_ joined | 18:17 |
| ← blast_hardcheese left | 18:17 |
| → Goplat joined | 18:17 |
| → cilly joined | 18:18 |
| ← bartek left | 18:18 |
| ← sq-one left | 18:19 |
| → fornext joined | 18:20 |
| → Kulrak joined | 18:20 |
| ← cilly left | 18:20 |
| ← joephelius left | 18:21 |
| ← markatto left | 18:22 |
|
jjbohn
| back | 18:22 |
| jjbohn → jjbohn|afk | 18:22 |
| → joephelius joined | 18:22 |
| ← _Qman left | 18:22 |
|
imachuchu
| mikemol: even if the changes were trivial it's nice to know how to do it, you never know when next time the chagnes may be painful to just reimplement | 18:23 |
| → les_sylvains joined | 18:23 |
| ← tjadc left | 18:23 |
| → shruggar joined | 18:25 |
| → bartek joined | 18:25 |
| ← Jay_Levitt left | 18:26 |
| → ferdna joined | 18:26 |
| ← maqr left | 18:26 |
| → cakehero joined | 18:26 |
| → p3rror joined | 18:28 |
|
jcromartie
| how can I replay the diff between two branches that have no common ancestor? | 18:28 |
| → thirdknife joined | 18:28 |
|
jcromartie
| it would be a rebase if they had anything in common | 18:28 |
|
RichiH
| "replay"? | 18:28 |
| ← bartek left | 18:29 |
| ← t4nkd left | 18:29 |
| → bartek joined | 18:29 |
|
imachuchu
| jcromartie: cherry-pick, and I assume that they have no conflicts (as in two completly seperate histories you are welding together) | 18:29 |
|
jcromartie
| yeah so I have "master" and then an orphan branch created from master | 18:29 |
|
| cherry pick sounds perfect | 18:30 |
|
| I thought it might but I wasn't sure if there was some rebase mode | 18:30 |
|
| RichiH wonders if jcromartie is simply looking for merge | 18:30 |
|
jcromartie
| RichiH: no, I don't want to introduce the parent commits of master into the orphan branch | 18:30 |
|
imachuchu
| jcromartie: well rebase just calls cherry-pick under the hood. And RichiH may be right, are you sure you don't just want a merge commit? | 18:31 |
|
jcromartie
| I'm trying to figure out how to keep an "internal" branch, and an "open source" branch | 18:31 |
|
imachuchu
| RichiH: you wont, if you merge orphan into master then orphan doesn't see the changes | 18:31 |
|
jcromartie
| where the open source branch is pushed to a public open source repository | 18:31 |
|
RichiH
| then merge the open into the internal one | 18:31 |
| ← tmz_ left | 18:32 |
|
jcromartie
| I want to "merge" the internal one into the open one | 18:32 |
|
RichiH
| commit into either as needed | 18:32 |
|
jcromartie
| other way around | 18:32 |
|
| cherry pick I guess | 18:32 |
|
RichiH
| and merge again when you need the changes in internal | 18:32 |
| ← DanyO left | 18:32 |
| ← n00b6502 left | 18:32 |
| ← ipalaus_ left | 18:32 |
|
RichiH
| no, you want to merge the open branch into the closed one | 18:32 |
| ← NTrepid left | 18:32 |
| → tmz joined | 18:32 |
|
imachuchu
| jcromartie: either cherry-pick or merge will work, merging only effects one of the branch pointers (the other stays put) | 18:32 |
|
RichiH
| else, you will have two open ones :) | 18:32 |
|
imachuchu
| jcromartie: really do both, create 2 temporary branches, merge one and cherry-pick the other, see which you like. !tias | 18:33 |
|
gitinfo
| jcromartie: 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://sitaramc.github.com/1-basic-usage/tias.html may help with git-specific TIAS. | 18:33 |
|
jcromartie
| OK wait, so if there are new commits in "master" and none in "open-source" then, from "master": running "git merge open-source" will update open-source? | 18:33 |
|
| yes thanks | 18:33 |
| → blast_hardcheese joined | 18:33 |
|
jcromartie
| I am experimenting too :) | 18:33 |
| → Sebo joined | 18:33 |
| → methods joined | 18:34 |
| ← iori left | 18:36 |
|
cmn
| if there are no commits in open-source, you can't merge anything into it | 18:36 |
|
methods
| why would git push try to push every single branch ? i get issue where i try to push changes i made to 1 branch but it complains that it will not fast forward another branch.. so i switch to that other branch and do a pull | 18:36 |
|
cmn
| methods: see man git config push.default | 18:36 |
|
gitinfo
| methods: the git-config manpage is available at http://git-scm.com/docs/git-config.html | 18:36 |
|
lb
| jcromartie: you always merge into the branch you're currently on | 18:37 |
|
jcromartie
| I think I'm figuring it out. | 18:38 |
| ← fornext left | 18:38 |
| → fornext joined | 18:39 |
|
methods
| the different there between upstream/simple/current isn't very clear | 18:39 |
| ← thansen left | 18:39 |
| → thansen_ joined | 18:39 |
| → shreya joined | 18:39 |
| → mmc1 joined | 18:41 |
| ← shruggar left | 18:42 |
| → shruggar1 joined | 18:42 |
| → pantsman joined | 18:42 |
|
cmn
| read it again, then | 18:42 |
|
| and check what config you have | 18:42 |
| ← micah left | 18:43 |
|
cmn
| and what branches exist on each remote | 18:43 |
| ← boombatower left | 18:43 |
| → thansen joined | 18:43 |
| ← thansen_ left | 18:44 |
| ← methods left | 18:44 |
| → \ology joined | 18:45 |
| → Eridius joined | 18:46 |
| ← fornext left | 18:46 |
| ← xmattdh left | 18:46 |
| → fornext joined | 18:46 |
| ← revagomes left | 18:46 |
| ← ReekenX left | 18:46 |
| ← Sebo left | 18:47 |
| → tommsen_ joined | 18:48 |
| → hashpuppy joined | 18:49 |
|
hashpuppy
| how do i reset everything that's not staged? | 18:49 |
| → Sebo joined | 18:49 |
|
EugeneKay
| I would commit, then reset --hard HEAD | 18:50 |
|
hashpuppy
| i don't want it committed, though | 18:50 |
| → jceb_ joined | 18:50 |
|
hashpuppy
| there's a 10% chance i'll use it | 18:50 |
|
mmattice
| you don't want the staged stuff committed? | 18:50 |
| cpg|away → cpg | 18:50 |
| → n00b6502 joined | 18:50 |
|
hashpuppy
| yeah, i plan on unstaging it | 18:50 |
| ← oogatta left | 18:50 |
|
mmattice
| git stash save --keep-index ; git stash drop ? | 18:51 |
|
EugeneKay
| Then...... use !dashes on checkout HEAD? Or something. | 18:51 |
|
gitinfo
| Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin" | 18:51 |
| ← tommsen left | 18:52 |
| → DeviceZer0 joined | 18:52 |
| → revagomes joined | 18:53 |
| ← _huoxito left | 18:54 |
|
hashpuppy
| mmattice: interesting. thanks | 18:54 |
|
mmattice
| only really useful if you have a lot of stuff not staged. | 18:54 |
| ← Maccer left | 18:55 |
| ← Sebo left | 18:56 |
| → jwmann joined | 18:57 |
| ← jwmann left | 18:57 |
| → jwmann joined | 18:57 |
| ← jwmann left | 18:57 |
| → beneggett joined | 18:58 |
| → jwmann joined | 18:58 |
| ← jwmann left | 18:58 |
| ← marthinal left | 18:58 |
| → private joined | 18:58 |
| → tommsen joined | 18:58 |
| ← tommsen_ left | 18:59 |
| → ninegrid joined | 19:00 |
| ← shruggar1 left | 19:02 |
| → i42n joined | 19:02 |
| → Sebo joined | 19:03 |
| ← tubbo left | 19:03 |
| ← twisted`_ left | 19:03 |
| ← jab416171|Cloud left | 19:03 |
| ← offbyone left | 19:03 |
| ← denysonique left | 19:03 |
| ← beawesomeinstead left | 19:03 |
| ← actel left | 19:03 |
| ← rrxtns left | 19:03 |
| ← nischayn22 left | 19:03 |
| ← xerxas left | 19:03 |
| ← CEnnis91 left | 19:03 |
| → tubbo joined | 19:03 |
| → aisipos joined | 19:04 |
| → velcrobots joined | 19:05 |
| ← Sajaki left | 19:05 |
| ← towski left | 19:05 |
| ← velcrobots left | 19:06 |
| ← vogxn left | 19:06 |
| → beawesomeinstead joined | 19:06 |
| → vogxn joined | 19:06 |
| → rrxtns joined | 19:06 |
| → _huoxito joined | 19:07 |
| → Jay_Levitt joined | 19:08 |
| ← thansen left | 19:09 |
| → thansen_ joined | 19:09 |
| → CEnnis91 joined | 19:09 |
| → Araxia joined | 19:09 |
| ← converge left | 19:09 |
| → twisted`_ joined | 19:09 |
| → converge joined | 19:11 |
| ← ajpiano left | 19:12 |
| → tommsen_ joined | 19:13 |
| → tomislater joined | 19:13 |
| → iocor joined | 19:14 |
| → ajpiano joined | 19:15 |
| jjbohn|afk → jjbohn | 19:15 |
| ← tommsen left | 19:16 |
| → liangent joined | 19:16 |
| ← armenianeagle left | 19:16 |
| → jab416171|Cloud joined | 19:16 |
| → chester_1 joined | 19:16 |
| ← liangent left | 19:16 |
| ← berserkr left | 19:17 |
| ← Sebo left | 19:17 |
| → leila_ joined | 19:17 |
| → duckxx joined | 19:17 |
| ← chester_ left | 19:18 |
| → dhruvasagar joined | 19:19 |
| ← bizhanMona left | 19:20 |
| ← Lgb left | 19:20 |
| ← palm_vue left | 19:20 |
| → nickpresta joined | 19:20 |
| ← bartek left | 19:20 |
| → Lgb joined | 19:21 |
| → palm_vue joined | 19:21 |
| → bizhanMona joined | 19:21 |
| → t4nkd joined | 19:23 |
| ← nickpresta left | 19:23 |
| ← shreya left | 19:23 |
| → nickpresta joined | 19:24 |
| → offbyone joined | 19:24 |
| → xerxas joined | 19:24 |
| → denysonique joined | 19:25 |
| ← leila_ left | 19:25 |
| ← ferdna left | 19:25 |
| Kindari → koen-vespa | 19:27 |
| ← p3rror left | 19:27 |
| koen-vespa → Kindari | 19:27 |
| ← nadavoid left | 19:29 |
| ← t4nkd left | 19:29 |
| → YoMomma joined | 19:30 |
| → EzeQL joined | 19:31 |
| sweet|kid → upasna | 19:31 |
| ← Jay_Levitt left | 19:31 |
| ← maletor left | 19:32 |
|
mikemol
| imachuchu: Indeed. I did take a look at the repo through git-gui and gitk...and was able to show that both branches had identical parent/child relationships in their history. So I was able to simply reset master back. | 19:32 |
| → nadavoid joined | 19:32 |
| ← j416 left | 19:33 |
| → actel joined | 19:33 |
| → nischayn22 joined | 19:33 |
| ← evaned1 left | 19:33 |
| → ourea joined | 19:34 |
| → andygrossman joined | 19:35 |
| gitinfo set mode: +v | 19:35 |
|
imachuchu
| mikemol: just glad it worked out | 19:36 |
| ← private left | 19:37 |
| ← Goplat left | 19:37 |
| ← erynofwales left | 19:37 |
| ← i42n left | 19:38 |
| ← Internet13 left | 19:39 |
| ← ianmcorvidae|alt left | 19:39 |
| → ianmcorvidae joined | 19:39 |
| → p3rror joined | 19:40 |
| ← ourea left | 19:40 |
| → nicoulaj joined | 19:40 |
| → rohan32 joined | 19:41 |
| → yoklov joined | 19:41 |
| ← daethorian left | 19:42 |
| ← subhojit777 left | 19:42 |
| ← rohan32 left | 19:42 |
| → cat_five joined | 19:43 |
| → rohan32 joined | 19:43 |
| → pj joined | 19:43 |
| ← lteo_ left | 19:44 |
| ← thomasfr left | 19:44 |
| ← converge left | 19:45 |
| ← cat_five left | 19:45 |
| ← nadavoid left | 19:45 |
| ← jceb_ left | 19:45 |
| → cat_five joined | 19:45 |
| ← cat_five left | 19:46 |
| → hseg joined | 19:46 |
| → cat_five joined | 19:46 |
| → malex joined | 19:46 |
| → kidsalsa joined | 19:48 |
| ← kidsalsa left | 19:48 |
| → Maccer joined | 19:49 |
| ← lb left | 19:50 |
| gitinfo set mode: +v | 19:51 |
| gitinfo set mode: +v | 19:51 |
| ← naee left | 19:51 |
| → paolooo joined | 19:53 |
| → converge joined | 19:54 |
| ← pj left | 19:56 |
| → dfr|mac joined | 19:57 |
| ← paolooo left | 19:58 |
| ← hseg left | 19:58 |
| ← spaceonline left | 19:58 |
| ← p3rror left | 19:58 |
| → SidGBF joined | 19:59 |
| → sh0ne joined | 19:59 |
| → rcu joined | 20:00 |
| → jwmann1 joined | 20:00 |
| ← jwmann1 left | 20:00 |
| ← txdv left | 20:01 |
| → jwmann1 joined | 20:01 |
| ← jwmann1 left | 20:01 |
| → torjus_ joined | 20:01 |
| → jwmann1 joined | 20:01 |
| ← jwmann1 left | 20:01 |
| ← und3f1 left | 20:01 |
| → txdv joined | 20:02 |
| ← ninegrid left | 20:02 |
| ← malex left | 20:03 |
| → gtrak joined | 20:03 |
| ← gtrak left | 20:04 |
| → Yuuhi joined | 20:04 |
| ← bloony left | 20:04 |
| ← thiago left | 20:04 |
| ← aisipos left | 20:05 |
| → intransit[w] joined | 20:05 |
| ← milli` left | 20:05 |
| → macivy joined | 20:06 |
| ← dwmw2_go` left | 20:06 |
| ← jason237 left | 20:06 |
| → bloony joined | 20:07 |
| → milli joined | 20:07 |
| → jason237 joined | 20:08 |
| ← intransit left | 20:08 |
| ← agileadam left | 20:08 |
| gitinfo set mode: +v | 20:09 |
| → p3rror joined | 20:11 |
| ← vals_ left | 20:11 |
| → anabelle joined | 20:11 |
| → tango_ joined | 20:12 |
| → fly9 joined | 20:12 |
| → dwmw2_gone joined | 20:12 |
| ← FreeArtMan left | 20:13 |
| ← skyf left | 20:13 |
| ← _iron left | 20:14 |
| ← dwmw2_gone left | 20:16 |
| ← codewrangler left | 20:17 |
| → dwmw2_gone joined | 20:17 |
| → codewrangler joined | 20:18 |
| ← Araxia left | 20:18 |
| ← chester_1 left | 20:19 |
| → Araxia joined | 20:19 |
| ← rcu left | 20:21 |
| → RaceCondition joined | 20:23 |
| ← patrick85 left | 20:23 |
| → yitz_ joined | 20:24 |
|
| EugeneKay becomes filled with an urgeto murder msysgit | 20:24 |
| → elux joined | 20:24 |
| ← SidGBF left | 20:25 |
| ← beneggett left | 20:27 |
| → jwmann joined | 20:27 |
| ← jwmann left | 20:27 |
| → jwmann joined | 20:27 |
| ← jwmann left | 20:28 |
| → maletor joined | 20:28 |
| → jwmann joined | 20:28 |
| ← jwmann left | 20:28 |
|
EugeneKay
| Of course reinstalling it fixes it | 20:28 |
| → jwmann joined | 20:28 |
| ← jwmann left | 20:28 |
| → jwmann joined | 20:29 |
| ← jwmann left | 20:29 |
| → tewecske joined | 20:29 |
| ← tewecske left | 20:29 |
|
imachuchu
| EugeneKay: it is a windows program after all | 20:29 |
| ← destinydriven left | 20:29 |
|
EugeneKay
| bash.exe wasn't sourcing /etc/profile, and I could not figure out why for the life of me | 20:30 |
|
_ikke_
| EugeneKay: Busy deploying/ | 20:30 |
|
| ? | 20:30 |
|
EugeneKay
| Oh that? went without a hitch | 20:30 |
| → jwmann joined | 20:32 |
| ← jwmann left | 20:32 |
| ← hashpuppy left | 20:32 |
|
_ikke_
| hehe | 20:32 |
| → stevedomin joined | 20:33 |
| → hakunin joined | 20:34 |
| → Internet13 joined | 20:34 |
|
garo
| i am using "git svn clone", is it normal that it takes about a second for each commit ? | 20:35 |
|
EugeneKay
| Yes. | 20:35 |
|
| Go do lunch or something, you'll be waiting a while | 20:35 |
|
garo
| pff :( | 20:35 |
| ← jcromartie left | 20:36 |
|
_ikke_
| garo: It has to do a checkout for each revision, and svn isn't built for doing many checkouts | 20:36 |
|
haarg
| git svn is very slow. usually when i do an initial clone with it, i create a local mirror of the svn repo first and run it against that. | 20:36 |
| ← tommsen_ left | 20:36 |
|
haarg
| usually ends up going a lot faster. kind of annoying to set up though. | 20:37 |
|
EugeneKay
| What's really annoying is when you discover that you passed the wrong set of flags for the SVN layout and have to restart the four-hour process | 20:37 |
| ← elux left | 20:37 |
|
_ikke_
| auch | 20:37 |
|
yhager
| EugeneKay: four hours is not a lot.. I've been through exactly that process. It's part of the pain of git-svn | 20:39 |
|
imachuchu
| garo: an important point though, it will be much faster after this as it won't need to pull down all of that data again, just whats (if anything) has changed | 20:39 |
| → tommsen joined | 20:39 |
|
garo
| about 1/3-th is done, too late to restart | 20:40 |
|
yhager
| we use a "central" git-svn clone that is updated from crontab, and everybody clones the git repo | 20:40 |
| ← iocor left | 20:41 |
| → iocor joined | 20:41 |
| ← Olipro left | 20:41 |
| → Olipro joined | 20:41 |
| ← fluxdude left | 20:41 |
| → fluxdude joined | 20:41 |
| ← DeviceZer0 left | 20:41 |
| → DeviceZer0 joined | 20:41 |
| ← jaeckel left | 20:41 |
| → jaeckel joined | 20:41 |
| ← blast_hardcheese left | 20:41 |
| → blast_hardcheese joined | 20:41 |
| ← SeySayux left | 20:41 |
| → SeySayux joined | 20:41 |
| → DanyO83 joined | 20:41 |
| ← converge left | 20:41 |
| → chuckharmston joined | 20:41 |
| → rtjure joined | 20:41 |
| ← cat_five left | 20:41 |
| Adys → Guest6684 | 20:42 |
| actel → Guest85743 | 20:42 |
| nischayn22 → Guest2741 | 20:42 |
| jpalmer → Guest49601 | 20:42 |
| Vampire0_ → Guest90847 | 20:42 |
| tubbo → Guest82894 | 20:42 |
| denysonique → Guest68848 | 20:42 |
| offbyone → Guest33807 | 20:42 |
| chrisward → Guest49240 | 20:42 |
| Godslastering → Guest9125 | 20:42 |
| dhruvasagar → Guest79461 | 20:42 |
| → Davey joined | 20:42 |
| → chrisgeorge joined | 20:42 |
| ← chrisgeorge left | 20:42 |
| → wuwoot joined | 20:42 |
| ← wuwoot left | 20:42 |
| → etcetera joined | 20:43 |
| ← andrewhl_ left | 20:43 |
| ← tommsen left | 20:43 |
| → converge joined | 20:44 |
| → tommsen joined | 20:44 |
| → srcerer joined | 20:45 |
| ← _keith left | 20:45 |
| ← stevedomin left | 20:46 |
| → stevedomin joined | 20:46 |
| rudi_s_ → rudi_s | 20:47 |
| → thiago joined | 20:48 |
| ← robins left | 20:48 |
| → kvanderw_ joined | 20:48 |
| → lustucru joined | 20:48 |
| → robinsmidsrod joined | 20:48 |
| kermit → Guest98178 | 20:48 |
| EzeQL → Guest59132 | 20:48 |
| → mike_oalian joined | 20:49 |
| ← mike_oalian left | 20:49 |
| → pppaul joined | 20:49 |
| → erynofwales joined | 20:49 |
| ← Guest90847 left | 20:50 |
| ← martinjl` left | 20:50 |
| → beneggett joined | 20:50 |
| → TheFuzzball joined | 20:50 |
| ← kvanderw_ left | 20:51 |
| → daethorian joined | 20:51 |
| → ppppaul joined | 20:51 |
| ← ppppaul left | 20:51 |
| → ahayweh joined | 20:51 |
| ← kvanderw left | 20:52 |
| → ppppaul joined | 20:52 |
| ← ppppaul left | 20:52 |
| → ppppaul joined | 20:52 |
| ← pppaul left | 20:53 |
| ppppaul → pppaul | 20:53 |
| ← pppaul left | 20:53 |
| ← tabakhase_ left | 20:53 |
| → tabakhase_ joined | 20:53 |
| ← andygrossman left | 20:53 |
| → pppaul joined | 20:53 |
| ← pppaul left | 20:53 |
| ← torjus_ left | 20:54 |
| → brentratliff joined | 20:54 |
| → pppaul joined | 20:54 |
| ← macivy left | 20:54 |
| ← spyro_ left | 20:54 |
| → spyro_ joined | 20:54 |
| spyro_ → spyro | 20:54 |
| jjbohn → jjbohn|afk | 20:54 |
| ← hoschi left | 20:55 |
| → aantix_ joined | 20:55 |
| → j416 joined | 20:56 |
| ← dfr|mac left | 20:56 |
| ← freeed left | 20:57 |
|
blast_hardcheese
| Oh man. git checkout - <--- awesome. | 20:57 |
| ← lustucru left | 20:57 |
| ← snappy left | 20:57 |
| → sanmarcos joined | 20:58 |
| → therealfakemoot joined | 20:58 |
|
_ikke_
| :D | 20:58 |
| → opus joined | 20:58 |
|
sanmarcos
| I need to find which commits added lines with a certain string after a certain date/commit? | 20:58 |
| ← saml left | 20:58 |
|
Droggl
| blast_hardcheese: what does it do? | 20:58 |
| → _keith joined | 20:58 |
|
blast_hardcheese
| Droggl: cd - for commitrefs | 20:58 |
|
sanmarcos
| basically give me a list of all commits that modified files by introducing a string "whatever" in its changes (starting from X commit) | 20:59 |
|
blast_hardcheese
| or commits, rather | 20:59 |
| ← aantix left | 20:59 |
| aantix_ → aantix | 20:59 |
|
Droggl
| ah, nice | 20:59 |
|
blast_hardcheese
| Droggl: "toggle between this and the last commit" | 20:59 |
| jjbohn|afk → jjbohn | 20:59 |
|
therealfakemoot
| I'm having trouble setting up a remote git repo. I've got one git repo I've been working in here on my laptop. I've got a dev server where I want to set up a remote repo for deployment. I've tried several of the guides and followed the instructions. They all went successful with the branches being updated, but there's nothing on the server. | 20:59 |
| ← rwestphal left | 20:59 |
|
blast_hardcheese
| therealfakemoot: ssh backed or using the git protocol? | 21:00 |
|
therealfakemoot
| ssh, preferably. | 21:00 |
|
EugeneKay
| !deploy | 21:00 |
|
gitinfo
| Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html | 21:00 |
|
cmn
| what do you mean there is nothing on the server? if the branches are updated, that's it | 21:00 |
|
blast_hardcheese
| Have you tried just creating a bare repo on a remote server and git remote add-ing it to your repo? | 21:00 |
|
therealfakemoot
| Alright | 21:00 |
| ← thirdknife left | 21:00 |
|
therealfakemoot
| blast_hardcheese: That's what I tried first. | 21:00 |
| ← geekbri left | 21:00 |
|
blast_hardcheese
| oh, maybe that's it; Did you create a bare repo or a working repo? | 21:01 |
|
therealfakemoot
| it seemed every simple. I got successful messages from git all the way. There was just nothing at all on the server. | 21:01 |
| → nor5trom joined | 21:01 |
|
blast_hardcheese
| you might be pushing to the repo, but you haven't checked anything out in that repo | 21:01 |
|
| try git branch on the remote server | 21:01 |
|
therealfakemoot
| "* master" | 21:01 |
|
cmn
| therealfakemoot: again, what do you mean by nothing on the serve? | 21:01 |
|
| all there has to be are the branches | 21:02 |
|
therealfakemoot
| None of my code. Just the .git directory | 21:02 |
|
cmn
| which you say update fine | 21:02 |
|
| there is no reason why the files should be there | 21:02 |
|
therealfakemoot
| And I tried checking out master and got "fatal: This operation must be run in a work tree | 21:02 |
|
cmn
| read the EugeneKay pointed you to | 21:02 |
|
| also !bare | 21:02 |
|
gitinfo
| an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/ | 21:02 |
|
therealfakemoot
| Roger | 21:02 |
| ← guampa left | 21:02 |
| ← project2501a left | 21:02 |
| ← pantsman left | 21:02 |
|
EugeneKay
| cmn accidentally a | 21:03 |
| → jita joined | 21:03 |
|
jita
| how do i resolve this 'Your branch and 'origin/master' have diverged' ? | 21:03 |
| → codeFiend joined | 21:03 |
|
EugeneKay
| jita - git pull | 21:03 |
|
blast_hardcheese
| therealfakemoot: If you're looking for a "real" multi-repo git server, check out gitolite | 21:03 |
| → dys joined | 21:03 |
|
EugeneKay
| And read the !book | 21:03 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 21:03 |
|
cmn
| or git merge origin/master, but it depends on what you want to do | 21:03 |
|
| divergence is not a problem | 21:03 |
| tizzo → tizzo-afk | 21:04 |
| ← uwjesd_ left | 21:04 |
|
blast_hardcheese
| Rewriting history is a problem, I've gotten that message after doing something stupid | 21:04 |
| tizzo-afk → tizzo | 21:04 |
| → torjus_ joined | 21:04 |
| → sebastorama joined | 21:05 |
|
cmn
| it can be, but that's not necessarily what's happened | 21:05 |
|
blast_hardcheese
| right, not suggesting one way or another, just throwing that out there to jog jita's memory | 21:05 |
| tabakhase_ → tabakhase | 21:06 |
| ← Guest59132 left | 21:06 |
| ← iocor left | 21:08 |
| rohan32 → rohan|afk | 21:08 |
| → adamm joined | 21:08 |
| ← tplaner_ left | 21:10 |
|
sanmarcos
| any way to show which file contained the match found by git log -Sword ? | 21:10 |
| → iocor joined | 21:11 |
| ← iocor left | 21:11 |
| ← torjus_ left | 21:12 |
| rohan|afk → rohan32 | 21:13 |
| ← alexchamberlain left | 21:13 |
| ← fly9 left | 21:14 |
| → rweait joined | 21:14 |
| ← hidekin1 left | 21:14 |
| → williamcotton joined | 21:15 |
|
blast_hardcheese
| sanmarcos: --name-only | 21:15 |
| → lustucru joined | 21:15 |
| ← converge left | 21:15 |
|
blast_hardcheese
| maybe? | 21:15 |
|
| Yeah, that looks like it does what you want | 21:16 |
| → kcj joined | 21:16 |
| → andrewhl joined | 21:17 |
| ← Ryback_ left | 21:17 |
|
sanmarcos
| blast_hardcheese: awesome! | 21:18 |
|
blast_hardcheese
| For future reference, most git commands support --help :) | 21:18 |
| → lresende joined | 21:18 |
|
sanmarcos
| git help log | 21:19 |
|
| yes, but it had so many options that I choose not to read it in detail | 21:20 |
|
| TL;DR | 21:20 |
|
cmn
| and now you lost time | 21:20 |
| ← lustucru left | 21:21 |
|
jjore_
| From hanging out in #mercurial I'm learning they've got an idea where the tools by default won't tell you about *every* option because initially you're not on a ramp-up curve to be able to use it yet. | 21:21 |
|
| Kind of an interesting idea. | 21:21 |
| ← sebastorama left | 21:21 |
|
cmn
| the tool won't in git either | 21:21 |
|
sanmarcos
| I wish git reset/revert was a little bit clearer | 21:22 |
| → tworkin joined | 21:22 |
| → Vile joined | 21:22 |
|
blast_hardcheese
| How is it not clear? | 21:22 |
|
cmn
| the workflow is with patches | 21:22 |
|
EugeneKay
| It's plenty clear; you need to learn svn revert ;-) | 21:22 |
|
cmn
| that's how they're named | 21:22 |
|
sanmarcos
| well, with svn one would just do svn revert file, to revert all changes, but since git has the stage thing | 21:23 |
|
blast_hardcheese
| "revert all changes" | 21:23 |
|
| git checkout <commit> <file> | 21:23 |
|
EugeneKay
| The only similarity between svn revert and git revert is the six letter name | 21:23 |
|
sanmarcos
| in fact, I find that I am much more efficient with a GUI on GIT, with SVN a gui is a waste of time since it is so simple | 21:23 |
|
EugeneKay
| !GIT | 21:23 |
|
gitinfo
| Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place. | 21:23 |
|
sanmarcos
| blast_hardcheese: well yes but I dont remember the last commit | 21:23 |
|
blast_hardcheese
| Sounds like you need to learn how to use git | 21:24 |
| → lustucru joined | 21:24 |
|
sanmarcos
| the hash that is, I dont want to copy paste it | 21:24 |
|
| blast_hardcheese: possibly, yes, need more practice | 21:24 |
|
cmn
| you don't need to remember it | 21:24 |
| pdelvo → pdelvo|afk | 21:24 |
|
blast_hardcheese
| whelp, back to work. Good luck sanmarcos :) | 21:24 |
|
sanmarcos
| thanks | 21:24 |
|
cmn
| git defaults to the current commit | 21:24 |
|
| also see man gitrevisions | 21:24 |
|
gitinfo
| the gitrevisions manpage is available at http://git-scm.com/docs/gitrevisions.html | 21:24 |
|
sanmarcos
| cmn: ah, thanks | 21:24 |
|
cmn
| this is why you do read the manual | 21:24 |
| ← tworkin left | 21:25 |
| → tworkin joined | 21:25 |
|
sanmarcos
| no man gitrevisions on OS X | 21:25 |
|
gitinfo
| the gitrevisions manpage is available at http://git-scm.com/docs/gitrevisions.html | 21:25 |
|
cmn
| install you manual pages then | 21:25 |
|
sanmarcos
| cmn: yes, but I believe good software should become instinctive, no need for manuals | 21:26 |
| rohan32 → rohan|afk | 21:26 |
|
cmn
| that's not something that can work | 21:26 |
| ← dov23 left | 21:26 |
|
sanmarcos
| i think its the biggest complaint about git, the "roughness" of it as seen here http://amplicate.com/hate/git | 21:26 |
|
EugeneKay
| .trigger_edit unlearn Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems. | 21:26 |
|
gitinfo
| EugeneKay: Okay. | 21:26 |
|
sanmarcos
| but other than that, it is awesome, so much better than SVN | 21:26 |
|
| I can't go back now | 21:26 |
| gitinfo set mode: +v | 21:26 |
|
cmn
| the nipple is the only thing that's intuitive | 21:26 |
|
tworkin
| I accidentally did `submodule update --init` on a submodule I don't want inited currently (but dont want to remove it form the parent repo). will rm -rf subm_dir appear as a change in the parent repo? how do you "uninit" the submodule? | 21:27 |
|
Nugget
| cmn: and the fist | 21:27 |
| ← Araxia left | 21:27 |
|
EugeneKay
| I won't argue that git's porcelain sucks. It is a product of evolution, not intelligent design. | 21:27 |
| ← Davey left | 21:27 |
|
cmn
| the fist? | 21:27 |
| ← lustucru left | 21:27 |
|
| Nugget punches cmn in the shin | 21:27 |
|
cmn
| nah | 21:27 |
| → Araxia joined | 21:27 |
|
cmn
| that's not intutive | 21:27 |
|
| not doing it properly anyway | 21:27 |
| ← udantee left | 21:28 |
| ← AaronMT left | 21:28 |
| ← intransit[w] left | 21:28 |
| ← hellopat left | 21:28 |
| ← nicoulaj left | 21:28 |
| → juvenal joined | 21:29 |
| → intransit joined | 21:29 |
| ← opus left | 21:30 |
| → opus joined | 21:31 |
| ← les_sylvains left | 21:32 |
| ← varg_ left | 21:32 |
| ← nwest left | 21:33 |
| → lustucru joined | 21:34 |
| ← tommsen left | 21:35 |
|
tworkin
| !submodule_rm | 21:35 |
|
gitinfo
| [!submodules_rm] You want to delete submodules? Excellent choice! All commands are in the superproject. Edit/delete .gitmodules to remove the submodule. Then `rm -rf submodulepath; git rm -f --cached submodulepath; git commit -am "Removed submodules!"` Inspect .git/config for "submodule" entries to remove. Inspect .git/modules for caches to remove "!gitslave" or "!subtree" (type them!) might be alternatives | 21:35 |
| ← mrOrangeChuck left | 21:36 |
| → madewokherd joined | 21:36 |
| → udantee joined | 21:36 |
| ← lustucru left | 21:37 |
| → t4nkd joined | 21:38 |
| ← _keith left | 21:38 |
| ← leeN left | 21:38 |
| ← shawngo left | 21:38 |
| ← juvenal left | 21:39 |
| ← t4nkd left | 21:40 |
|
click
| "rewrite | 21:40 |
|
| !rewrite history | 21:40 |
|
gitinfo
| [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config) | 21:40 |
| → lustucru joined | 21:41 |
| → axl_ joined | 21:42 |
| ← axl_ left | 21:42 |
| ← fornext left | 21:43 |
| → aspotashev joined | 21:43 |
| → iocor joined | 21:43 |
| → _keith joined | 21:44 |
| → axl_ joined | 21:44 |
| ← Element9 left | 21:44 |
| ← axl_ left | 21:44 |
| → axl_ joined | 21:45 |
| ← nickpresta left | 21:45 |
| ← _keith left | 21:46 |
| ← luxurymode left | 21:46 |
| → Orbitrix joined | 21:46 |
| ← lustucru left | 21:47 |
|
sanmarcos
| HUMILIATION | 21:47 |
| → lustucru joined | 21:49 |
| ← sgambino left | 21:49 |
| ← axl_ left | 21:49 |
| ← rtjure left | 21:49 |
|
sanmarcos
| !refs | 21:49 |
| → gfontenot joined | 21:50 |
| → axl_ joined | 21:50 |
| ← \ology left | 21:51 |
| → _keith joined | 21:51 |
| → mutex joined | 21:52 |
|
sanmarcos
| is this a good workflow for working with bundles http://codemonkeydo.blogspot.com/2010/05/git-workflow-using-bundles.html ? | 21:52 |
|
EugeneKay
| .trigger_edit refs @!treeish | 21:52 |
|
gitinfo
| EugeneKay: Okay. | 21:52 |
|
EugeneKay
| sanmarcos - sneakernetting a bundle? | 21:53 |
|
sanmarcos
| yep | 21:53 |
|
EugeneKay
| You can init a bare git repo on a FAT32 USB stick just fine | 21:53 |
| ← ph^_ left | 21:53 |
|
sanmarcos
| well we bundle it and then send it encrypted through dropbox | 21:54 |
|
| bundle is better than a bunch of files, dropbox will probably screw it | 21:54 |
|
EugeneKay
| Oy. | 21:54 |
| ← udantee left | 21:54 |
|
EugeneKay
| Yeah, a bit better. I would advise getting a bitbucket account. | 21:54 |
|
| Or rent a VPS and install gitolite | 21:54 |
|
sanmarcos
| yes, sure, doens't apply to our situation, legal stuff | 21:54 |
|
| but it totally makes sense otherwise | 21:55 |
| The24z → The24z_away | 21:55 |
|
EugeneKay
| Even rsyning the encrypted bundle to a VPS is better than dropbox :-p | 21:55 |
|
cmn
| huh? you're not legally allowed to transfer information over the wire? | 21:55 |
| → psoo joined | 21:56 |
|
sanmarcos
| it woult take too long to set up everything, people dont understand, clearance from legal, management etc, firewalls | 21:56 |
|
| big companies | 21:56 |
|
EugeneKay
| Well, there's a good question. Are you required to encrypt in transit, store encrypted? | 21:56 |
|
sanmarcos
| so I just sneakernet a bundle through dropbox to their technichal contact | 21:56 |
|
| and screw it | 21:56 |
|
EugeneKay
| Heh. That works. | 21:56 |
| ← lustucru left | 21:56 |
|
sanmarcos
| my question was about the workflow of sending differentials | 21:56 |
|
| basically tagging and then bundling from tags, seems like a good approach | 21:57 |
|
tworkin
| cmn: cloud storage means you have to read the EULA really carefully or you could be giving away ownership of your file. people get nervous about it and then force you to use the one crappy process thats been approved | 21:57 |
| ← therealfakemoot left | 21:57 |
|
sanmarcos
| yes I know, dropbox will screw you, they copy your data, but I don't really care, the bundle is encrypted | 21:57 |
|
| just pass it through openssl they can copy all they want | 21:57 |
|
cmn
| tworkin: so don't use cloud storag | 21:58 |
| → Goplat joined | 21:59 |
| ← yoklov left | 21:59 |
| → yoklov joined | 22:00 |
|
sanmarcos
| so, my current procedure for creating a full clone of a github repo as a bundle is $ git clone --mirror; git bundle create --all | 22:02 |
|
| which gets me *everything* | 22:03 |
| → cagedwisdom joined | 22:03 |
| → yatiohi joined | 22:03 |
|
cmn
| yeah, you don't want to mirror github repo, it's full of metadata | 22:03 |
| → Davey joined | 22:03 |
|
cmn
| just change the refspec to be refs/heads/*:refs/heads/* and refs/tags/*:refs/tags/* | 22:04 |
|
| add notes if you use them | 22:04 |
| → FernandoBasso joined | 22:04 |
|
sanmarcos
| cmn: can you give me some docs on that, no idea what a refspec is? | 22:04 |
|
cmn
| see man gitglossary and man git fetch | 22:05 |
|
gitinfo
| the gitglossary manpage is available at http://git-scm.com/docs/gitglossary.html | 22:05 |
|
| the git-fetch manpage is available at http://git-scm.com/docs/git-fetch.html | 22:05 |
|
cmn
| a refspec is what tells git what to download and where to put the refs | 22:05 |
| → drupin joined | 22:07 |
| ← drupin left | 22:07 |
|
sanmarcos
| basically I wanted to give them a copy of the github repo, not sure what extra metadata they got and why that would be bad? | 22:08 |
| → dfr|mac joined | 22:08 |
| ← dfr|mac left | 22:08 |
|
sanmarcos
| just bundlign my working copy would not have been enough as I haven't checked out all the branches available | 22:08 |
| → udantee joined | 22:09 |
| → lustucru joined | 22:09 |
| ← vpetro left | 22:09 |
| ← nor5trom left | 22:09 |
|
cmn
| github stores pull requests there as well | 22:09 |
|
| but if you don't have any, then you can mirror | 22:10 |
| → GameGamer43_ joined | 22:10 |
|
sanmarcos
| ah, ok, yeah I dont think we use them | 22:10 |
|
| github must be doing some magic with git then | 22:10 |
| ← lustucru left | 22:10 |
| ← eijk__ left | 22:11 |
| → eletuchy_ joined | 22:11 |
|
cmn
| no magic | 22:12 |
|
| they add extra refs, which are only really useful in the context of github | 22:12 |
|
| as they refer to the PRs by number | 22:12 |
|
sanmarcos
| refs are some sort of key value store? | 22:12 |
|
cmn
| everything is | 22:13 |
|
| a ref points to git objects | 22:13 |
|
| well, each to one | 22:13 |
| ← eletuchy left | 22:14 |
| ← j416 left | 22:15 |
| ← Guest98178 left | 22:17 |
| The24z_away → The24z | 22:17 |
| → drupin joined | 22:17 |
| ← drupin left | 22:17 |
| → kermit joined | 22:18 |
| ← tqmz left | 22:18 |
| ← Orbitrix left | 22:18 |
| ← giallu left | 22:18 |
| ← gfontenot left | 22:19 |
| → Orbitrix joined | 22:19 |
| → gfontenot joined | 22:22 |
| ← RaceCondition left | 22:23 |
| → lustucru joined | 22:23 |
| ← lustucru left | 22:23 |
| rohan|afk → rohan32 | 22:23 |
| ← tworkin left | 22:25 |
| → lresende_ joined | 22:25 |
| → tworkin joined | 22:25 |
| ← lresende_ left | 22:26 |
| ← chuckharmston left | 22:26 |
| The24z → The24z_away | 22:27 |
| ← lresende left | 22:28 |
| → lustucru joined | 22:28 |
| → Enlik joined | 22:29 |
| ← lustucru left | 22:29 |
| ← Sym3tri_ left | 22:30 |
| → dfr|mac joined | 22:30 |
| ← dvide left | 22:30 |
| ← tomislater left | 22:31 |
| ← revagomes left | 22:32 |
| ← ladder4_ left | 22:33 |
| ← thelazydeveloper left | 22:34 |
| → ladder4 joined | 22:34 |
| ← sh0ne left | 22:34 |
| ← letharion left | 22:35 |
| → zastern joined | 22:36 |
| ← jbub left | 22:36 |
| ← rweait left | 22:36 |
| → Sym3tri joined | 22:36 |
| ← dfr|mac left | 22:38 |
| ← draginx left | 22:38 |
| rohan32 → rohan|afk | 22:40 |
| ← jspiros left | 22:41 |
|
xxiao
| i have a few deleted files and a few changed files, just want to commit the delete ones, how could i do that | 22:41 |
| ← timthelion left | 22:41 |
| → letharion joined | 22:41 |
|
FauxFaux
| xxiao: You can use git rm to stage the removals, or just list them on commit's command line. | 22:41 |
| → jspiros joined | 22:41 |
| → wagle joined | 22:43 |
|
xxiao
| FauxFaux: that worked, thanks! | 22:43 |
| ← _keith left | 22:43 |
| tizzo → tizzo-afk | 22:43 |
| → w09x joined | 22:45 |
| ← w09x left | 22:45 |
| → jbub joined | 22:46 |
|
xxiao
| sigh, i accidentally did 'git add .' which involves quite a lot files, how can I back off? | 22:46 |
| → _keith joined | 22:46 |
| → david1010 joined | 22:47 |
| ← david1010 left | 22:47 |
|
xxiao
| git reset . ? | 22:47 |
|
| git rm --cached each-single-file ? | 22:47 |
| ← GameGamer43 left | 22:49 |
| ← GameGamer43_ left | 22:49 |
| → chuckharmston joined | 22:49 |
|
xxiao
| looks like git reset did it | 22:49 |
| → GameGamer43 joined | 22:50 |
|
EugeneKay
| xxiao - !unstage | 22:50 |
|
gitinfo
| xxiao: To unstage a file from the index(in other words, to undo an accidental `git add foo/bar.txt`), use: git reset foo/bar.txt | 22:50 |
| cpg → cpg|away | 22:50 |
| ← _keith left | 22:50 |
|
xxiao
| EugeneKay: the problem is that i have a long list of them, git reset seems unstage all of them at once | 22:50 |
| ← chuckharmston left | 22:50 |
|
EugeneKay
| It will take a directory name, same as add | 22:50 |
| ← derekpioneer left | 22:51 |
| → lustucru joined | 22:51 |
| ← TheJH left | 22:52 |
| → kvanderw joined | 22:53 |
| → timj joined | 22:53 |
| ← beneggett left | 22:53 |
| → shawngo joined | 22:53 |
| → SeoZ joined | 22:54 |
| ← lustucru left | 22:55 |
| ← FernandoBasso left | 22:57 |
| ← yoklov left | 22:57 |
| → simesy joined | 23:02 |
| ← smw left | 23:02 |
| ← lacrymology left | 23:03 |
| ← stevedomin left | 23:04 |
| → Sebo joined | 23:04 |
| ← zastern left | 23:04 |
| → cooloney joined | 23:08 |
| ← diegovio1a left | 23:09 |
| ← buhman_ left | 23:10 |
| → buhman_ joined | 23:10 |
| buhman_ → buhman | 23:11 |
| ← mmc1 left | 23:11 |
| ← jita left | 23:11 |
| ← iocor left | 23:11 |
| The24z_away → The24z | 23:12 |
| → diegoviola joined | 23:13 |
| → GameGamer43_ joined | 23:13 |
| toothr → toothrot | 23:13 |
| → sinful joined | 23:13 |
| → LucasTizma joined | 23:13 |
| → nightcrawler786 joined | 23:14 |
| → jcao219 joined | 23:14 |
| ← jcao219 left | 23:14 |
| → jcao219 joined | 23:14 |
| ← GameGamer43 left | 23:14 |
| → _keith joined | 23:14 |
| ← jjbohn left | 23:14 |
| ← GameGamer43_ left | 23:14 |
| → GameGamer43 joined | 23:15 |
| ← nightcrawler786 left | 23:15 |
| → nightcrawler786 joined | 23:15 |
| → FernandoBasso joined | 23:16 |
| ← Davey left | 23:17 |
| ← MattRichardson left | 23:17 |
| ← SirCmpwn left | 23:17 |
| gitinfo set mode: +v | 23:17 |
|
lindenle
| Hi all how do i build an rpm from sourc? I tried make rpm and i am getting some doc error on 1.7.11. | 23:17 |
| → MattRichardson joined | 23:18 |
| ← anabelle left | 23:18 |
|
EugeneKay
| lindenle - you would need to consult the docs for the package you're trying to build. | 23:18 |
|
lindenle
| EugeneKay: right, right rtfm | 23:19 |
|
thiago
| lindenle: did you mean from the Git sources? | 23:19 |
| Caelum_ → Caelum | 23:20 |
| ← andrewhl left | 23:21 |
| → kerrick joined | 23:22 |
| ← Guest79461 left | 23:23 |
| ← afuentes left | 23:23 |
| → jjang joined | 23:24 |
| ← cannonball left | 23:24 |
| → dhruvasagar joined | 23:25 |
| → AaronMT joined | 23:25 |
| ← eletuchy_ left | 23:27 |
| → ryez joined | 23:27 |
| → GameGamer43_ joined | 23:28 |
| ← GameGamer43 left | 23:28 |
| ← allquixotic left | 23:29 |
|
lindenle
| thiago: yes, I am looking in Documentation and cannot find it... | 23:29 |
| → allquixotic joined | 23:29 |
| → tensory joined | 23:30 |
| ← kvanderw left | 23:31 |
| ← opus left | 23:32 |
| Marcux83 → Marcux83|away | 23:33 |
| → w09x joined | 23:33 |
| ← tensory left | 23:34 |
| ← Guest9125 left | 23:35 |
| cpg|away → cpg | 23:35 |
| → eletuchy joined | 23:37 |
| ← axl_ left | 23:38 |
| → breck joined | 23:38 |
| → axl_ joined | 23:38 |
| → Esa joined | 23:39 |
| → opus joined | 23:39 |
| ← maletor left | 23:42 |
| → Mjiig joined | 23:43 |
| → nirix joined | 23:44 |
| → lustucru joined | 23:44 |
| → yaymukund joined | 23:45 |
| ← LucasTizma left | 23:45 |
| ← unreal left | 23:45 |
|
lindenle
| thiago: is there a way to skip the documentation in an rpm build | 23:46 |
|
Mjiig
| if i want to move uncommited changes from one repo to another on my local machine, will "git diff > temp.patch" in the first repo followed by "git apply temp.patch" in the second repo work? | 23:46 |
| ← lustucru left | 23:46 |
| → lustucru joined | 23:47 |
| The24z → The24z_away | 23:47 |
| ← w09x left | 23:47 |
| → snappy joined | 23:47 |
| ← snappy left | 23:47 |
| → snappy joined | 23:47 |
|
imachuchu
| Mjiig: and why would you want to? just commit them, slap a tag/branch on them, then sync that. If later you don't want the commit rebase it into another/rebase it out completely | 23:48 |
| gitinfo set mode: +v | 23:49 |
|
yaymukund
| I branched from master and added two commits: m1 < b1 < b2. I've added a commit to master since I branched. All the changes so far have been pushed to remote, so I can't rebase. How do I end up with m1 < m2 < b1 < b2 in a new branch? | 23:49 |
| ← codeFiend left | 23:49 |
|
yaymukund
| (I can fix conflicts as needed) | 23:49 |
|
Mjiig
| imachuchu: you mean commit in the first repo, then push in that repo, then pull in the repo where i want the changes? | 23:49 |
|
| that makes more sense :) thanks | 23:50 |
| ← _keith left | 23:50 |
|
tworkin
| can you add "any symbolic link" to gitignore? | 23:51 |
| → eletuchy_ joined | 23:51 |
|
imachuchu
| Mjiig: commit in your repo, then push or pull it to the other | 23:51 |
| ← ehsan left | 23:51 |
| ← eletuchy_ left | 23:52 |
| ← etcetera left | 23:52 |
| ← eletuchy left | 23:52 |
| → eletuchy joined | 23:53 |
| → luxurymode joined | 23:53 |
|
lindenle
| http://pastie.org/4571259 Can anyone help me with this error when i try make rpm? | 23:53 |
| → etcetera joined | 23:54 |
|
Mjiig
| imachuchu: okay, thanks a lot, got it working now | 23:54 |
| ← metcalfc_ left | 23:54 |
| → yoklov joined | 23:55 |
|
EugeneKay
| lindenle - if you're wanting the latest git for a RHEL/CentOS system you can get it from rpmforge | 23:55 |
|
lindenle
| well that is not exactly what I want but it might work | 23:55 |
| ← Mjiig left | 23:55 |
| ← lustucru left | 23:56 |
| → goshawk joined | 23:58 |
|
yaymukund
| I think actually, I just need to branch from an updated master and merge my original_branch in | 23:58 |
| ← psoo left | 23:59 |
| → psoo joined | 23:59 |