IRCloggy #git 2012-07-14

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2012-07-14

→ sjefen6 joined00:00
← jn_ left00:02
cbreak eddiemoya: also take a look at gitslave, maybe it's more suitable for your situation00:02
but I guess submodules could work well00:02
← kcj left00:03
← ology left00:03
← fayimora left00:03
← tjholowaychuk left00:04
→ kenperkins joined00:05
eddiemoya gitslave huh? yeah i definitly look at that.00:05
did a google search on it, but do you know any particularly good docs for it?00:05
← Targen left00:05
← dreiss left00:05
eddiemoya is it actually a tool of some kind, or just a strategy?00:06
← psoo left00:07
→ mritz joined00:08
← diegoviola left00:08
→ hakunin joined00:09
→ reuf joined00:10
→ gtrak` joined00:10
← reuf left00:10
→ kmurph79 joined00:10
← rideh left00:11
← lu_zero left00:11
→ lu_zero joined00:11
→ xiphiasx_ joined00:12
← metze left00:13
xiphiasx_ i am trying to setup submodules via .gitmodules. the cloned repos should be in src/<their respective name>, but I am having issues with the path00:13
→ metze joined00:13
xiphiasx_ specifically, if a submodule's path is src/ds00:13
← gitinfo left00:14
xiphiasx_ i will get: No submodule mapping found in .gitmodules for path 'ds'00:14
→ gitinfo joined00:15
ChanServ set mode: +o00:15
→ robotmay joined00:16
← gtrak` left00:16
→ wbednarski joined00:16
→ gtrak` joined00:16
← ehsan left00:16
→ jperry2 joined00:16
← SegFaultAX|work2 left00:17
→ ehsan joined00:17
→ iamjarvo joined00:19
← pdtpatrick_ left00:19
→ williamcotton__ joined00:20
← maletor left00:20
← williamcotton left00:21
williamcotton_ → williamcotton00:21
williamcotton → 15SACAX4T00:21
williamcotton__ → 18VAAZHEB00:21
eddiemoya xiphiasx_ why dont you put your .gitmodules contents into a gist so we can see it00:22
← ehsan left00:22
xiphiasx_ ok00:22
← rehat left00:22
→ joshteam joined00:22
xiphiasx_ https://gist.github.com/1dcdcb545b6ed2009ccc00:23
→ subbyyy joined00:24
← subbyyy left00:24
← ToBeFree left00:24
→ subbyyy joined00:24
→ ology joined00:25
← robotmay left00:25
eddiemoya xiphiasx_ how did you add the submodule?00:26
xiphiasx_ git submodule update --init00:26
eddiemoya did you use git submodule add <uri> src/ds00:26
how dod you add it to begin with i mean00:26
xiphiasx_ .00:26
yeah, i think i figured out the problem00:27
hold00:27
eddiemoya you probably didnt actually add the submodule, you just added the declaration00:27
xiphiasx_ yes that is what I did00:27
← Fast2 left00:27
← edude03 left00:28
eddiemoya remove those declarations from .gitmodules00:28
xiphiasx_ dnoe00:28
done00:28
eddiemoya and do did you use git submodule add https://github.com/corks/corc.ds.git src/ds00:28
← project2501b left00:28
eddiemoya or.. whatever your repos uri is00:28
→ Generic joined00:29
eddiemoya oh i copy/pasted.. meant to say you should use?. that line00:29
← SpNg left00:32
← gusnan left00:34
→ mklappstuhl joined00:35
→ nutron joined00:35
→ cakehero joined00:35
← FernandoBasso left00:37
→ ehsan joined00:39
← Generic left00:40
→ ScottE joined00:40
← ISF left00:41
→ mischat joined00:43
← ScottE left00:43
→ kukks joined00:44
→ QaDeS_ joined00:48
→ enmand joined00:48
← pantsman left00:48
→ kcj joined00:49
← chrisgeorge left00:50
→ lresende joined00:51
← QaDeS left00:52
← HyperNerdV2 left00:52
→ boombatower joined00:54
→ BiggFREE joined00:55
← osmosis left00:56
← gtrak` left00:57
→ nobdraisentone joined00:57
→ fosstux joined00:58
fosstux django00:58
oope....00:58
Hi! I had an error in my .gitignore. How can I mark files to be deleted from the remote repo but to be kept locally?00:59
← mwrosen left00:59
GarethAdams fosstux: `git rm --cached file [..]`01:00
← btanaka left01:01
fosstux GameGamer43, I thought git rm also deletes the files locally.....01:01
milki fosstux: notice the --cached01:01
fosstux thx01:01
← lousygarua left01:02
→ peterpan joined01:03
→ gtrak` joined01:06
fosstux but when I then run git push even those files got pushed :-(01:06
→ pdtpatrick_ joined01:07
→ dreiss joined01:08
← pdtpatrick_ left01:08
← lresende left01:09
→ lresende joined01:09
→ htroyack joined01:10
→ ScottE joined01:10
→ rehat joined01:10
← ghvandoorn left01:10
→ rehat_ joined01:11
← iwoj left01:11
→ sam113101 joined01:12
→ Vampire0 joined01:12
frogonwheels fosstux: did you commit the change?01:13
fosstux: if you've already pushed commits with those files in it, you may need to !rewrite those commits without the files in them.01:14
gitinfo fosstux: [!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)01:14
← rehat left01:14
→ iwoj joined01:14
← Vampire0_ left01:15
← enmand left01:15
→ w09x joined01:16
← w09x left01:16
← iamjarvo left01:17
→ intripoon joined01:17
← intripoon_ left01:19
← palm_vue left01:20
← sam113101 left01:21
→ palm_vue joined01:21
fosstux thanks. that worked.01:21
Vinnie_win Why isn't git-subtree in the official Git distro ?01:24
← towski left01:24
← Chaser left01:25
→ notfunk joined01:27
← cakehero left01:27
← mritz left01:29
← yhager left01:29
→ jjbohn joined01:30
← hwrd|work left01:30
← jjbohn left01:30
← jperry2 left01:30
→ HyperNerdV2 joined01:32
← rehat_ left01:34
→ Matt_P joined01:38
Matt_P i have a remote repo checked out on my pc01:39
im trying to add another remote repo (same server)01:39
as a submodule01:39
but its checking out the same repo as the first one01:39
← mocramis left01:40
← yoklov left01:40
→ mocramis joined01:40
← dreiss left01:41
→ iamjarvo joined01:44
→ jperry2 joined01:44
→ rehat joined01:48
← RaceCondition left01:49
→ yaazkal joined01:49
→ mxweas_ joined01:49
← jperry2 left01:50
← mcluskydodallas left01:50
→ friskd joined01:50
← iwoj left01:50
→ Seppoz joined01:51
Seppoz hey, whats the advantage of git over svn?01:52
→ Lord_DeathMatch joined01:52
← vitor-br left01:53
→ apok_ joined01:53
← ehsan left01:54
← apok left01:55
bremner !isgitbetter01:56
gitinfo We think so, but if you don't, please go away and use $YourFavoriteSystem instead. For a comparison to other VCSes, see http://thkoch2001.github.com/whygitisbetter/01:56
← apok_ left01:57
← afuentes left01:58
← kmurph79 left01:58
offby1 Seppoz: the name is easier to type -- letters are on the home row01:58
→ enigmuriatic joined01:58
← enigmuriatic left01:58
← Seppoz left02:00
← fosstux left02:00
← wbednarski left02:00
GarethAdams offby1: lol. except for the 'i' and the 't'02:01
or is that the joke?02:01
→ enigmuriatic joined02:02
Matt_P what have I done :|02:02
C:\Users\Matthew\Projects\merg.it>git push02:02
fatal: Not a git repository: 'C:/Users/Matthew/Projects/merg.server/.git/modules/conn'02:02
→ mritz joined02:02
Matt_P i thought git used the .git inside the directory02:02
i have no idea where it is getting the old stuff from ;\02:03
→ yoklov joined02:04
← joshteam left02:06
← SegFaultAX left02:06
← Lord_DeathMatch left02:06
→ SegFaultAX joined02:07
→ chx joined02:07
chx Hi. Drupal still uses a patch workflow. How can I tell that if I apply patch A, then what other patches would fail?02:08
→ w09x joined02:14
offby1 GarethAdams: it's a lame joke. It'd have been funnier if it were accurate.02:15
But not that much funnier.02:15
enigmuriatic if i'm running a git i made on multiple machines, do I have to make all but one of them forks?02:15
→ hwrd|work joined02:15
→ Lord_DeathMatch joined02:15
offby1 stares blankly02:16
offby1 enigmuriatic: I assume there's a legitimate question in there somewhere, but I sure as hell don't know what you're talking about.02:16
enigmuriatic okay, im brand new to git. I made a repo for my .vimrc file.02:17
i want to use it on my vps, my laptop, and my VM02:17
offby1 sure02:17
!repro02:17
gitinfo 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.02:17
enigmuriatic https://help.github.com/articles/create-a-repo02:18
i followed that tutorial for the first machine and it worked, but i02:18
offby1 but you ...02:18
enigmuriatic m getting errors with the additional machines. is it because i need to fork it or something like that?02:18
offby1 ??02:18
Couldn't tell ya!02:18
If you follow the instructions that gitinfo gave you, that'd help.02:18
enigmuriatic i did, but does that only work for the one "master branch" or something like that?02:19
offby1 Otherwise I have to guess what you did, and what you saw, and how what you saw differs from what you expected to see; and all that guessing makes my brain tired.02:19
I don't mean to be rude, but until you show me a transcript, I will be both unable, and unmotivated, to help you.02:19
→ WillMarshall joined02:20
enigmuriatic okay, i may just venture off and come back if i really cant figured it out, because there are three transcripts and they're all very cluttered with mistakes and confusing02:21
offby1 fair enough02:21
← yaazkal left02:21
offby1 if you're _really_ having trouble, it should be easy for you to repro the problem with a clean transcript :-)02:21
but there's a good chance you'll stumble into success02:22
← bubbles10101 left02:22
offby1 hint: you should probably do "git init" just once, and "git clone" on all the other machines.02:22
enigmuriatic when i try to clone, it says the repo doesn't exist02:23
→ edude03 joined02:23
offby1 enigmuriatic: it would be far more effective for you to tell us what you typed, and what you saw in response, and how that response differed from what you expected.02:24
When you say "I try to clone" we can only guess what you actually did.02:24
Capisce?02:24
For all we know, you shouted "hey git, please clone" at your computer.02:24
enigmuriatic i typed "git clone", then it told me to specify a repo, so i typed "git clone vimrc", and then it told me that there's no such git02:25
but i already added the remote origin02:25
offby1 now we're getting somewhere.02:25
when you type "git clone", the stuff after "clone" should be a URL, not just a word like "vimrc".02:25
Now, you said something about "already added the remote origin", but of course, again, I can only guess what you meant, because you didn't tell me what you actually typed.02:26
← goshawk left02:26
offby1 Are you starting to catch on to my shortcomings?02:26
I need to know _exactly what you typed_.02:26
Telling me anything else wastes both our time.02:26
enigmuriatic "git remote add origin https://github.com/myusername/vimrc02:26
.git02:26
offby1 aha!02:26
enigmuriatic "02:26
offby1 better and better.02:26
OK, so what did you see when you typed that "git remote add" command?02:27
← gtrak` left02:27
← chx left02:27
offby1 (I really recommend that you read the doc about making a transcript)02:27
((and not just because I wrote it))02:27
→ robotmay joined02:27
GarethAdams (if you missed it, the doc was https://gist.github.com/2415442)02:28
SaCu enigmuriatic, you did that in the directory where you did "git init", "git add ..." and "git commit"?02:28
→ byronb joined02:28
enigmuriatic i think i have it working now02:28
yeah02:29
yeah, a month or two ago i read a great tutorial on all of this02:29
buti haven't used git since so ive forgotten most of it02:29
and most of the new ones that have come out in a wave over the past few weeks are like cookbooks02:29
← Matt_P left02:30
enigmuriatic they dont really give you much idea of what you're doing and how git works02:30
→ gtrak` joined02:30
← oriba left02:31
← mxweas_ left02:32
← AaronMT left02:32
← dvide left02:32
← robotmay left02:33
← eletuchy left02:34
← kenneth left02:35
← Eridius left02:36
← orafu left02:36
→ orafu joined02:37
← mritz left02:38
← agile left02:38
← reuss left02:39
← Lulzon left02:39
← QaDeS_ left02:39
→ yaazkal joined02:40
← kcj left02:41
← smw left02:45
enigmuriatic what would be the reason that I committed but it isn't showing up on the repo in github?02:46
← HyperNerdV2 left02:46
enigmuriatic does it just take a while to update or do I have to somehow validate the commit02:46
GarethAdams enigmuriatic: git is a distributed SCM. All the commits you make stay local to your repository until you push them to another repository (or pull the from somewhere else)02:47
← mischat left02:47
GarethAdams so you don't even need to be connected to the internet to commit02:47
← martinjlowm left02:47
enigmuriatic ah right thank you. I will soon read that more comprehensive tutorial i bookmarked somewhere so i stop asking stupid questions like this :P02:48
thanks02:48
← enigmuriatic left02:48
→ rideh joined02:50
→ Eridius joined02:51
sitaram offby1: did he ever, despite everything you said, offer any transcript of any part of the problem? (just curious...)02:52
offby1 pages in his previous discussion02:52
offby1 sitaram: dunno, I lost interest :)02:53
offby1 reads scrollback02:53
offby1 doesn't look like it.02:53
GarethAdams nope02:53
offby1 I assume the customer is always right; and if people don't "get" that they need to provide a transcript, then it's our fault for not properly explaining why it's needed :-|02:53
→ mxweas_ joined02:54
← hwrd|work left02:54
→ uu joined02:54
sitaram you're too nice02:54
offby1 yes. Yes, I am.02:55
offby1 glares at the freeloading neighbourcat02:55
sitaram I disagree with you but I guess it's people like you who gave #git the reputation it seems to have. If it were full of people like me we'd be in flame wars all the time!02:55
offby1 people be throwing Molotov cocktails at github!02:56
funny how each IRC channel has its own tone. This one is polite and helpful, so I'm polite and helpful.02:56
You should see me in #emacs, though; snarky and a S/N of about -30 dB02:57
'cuz that's how they roll in there.02:57
SaCu Well, like plants, some humans operate better in environments where others would have bitten the dust already... :)02:59
milki teh emacs os03:02
← jfelchner left03:02
sitaram offby1: I want to be like you but it's so much fun to mock people who dont listen. (Note: "dont listen", not "dont know")03:03
milki old man sitaram loves being senile03:03
→ kmurph79 joined03:03
sitaram my presumption is they came here to learn, and then they wont listen so -- why are they here then?03:03
milki: did you ever take a look at http://sitaramc.github.com/gitolite/ips.html ? :-)03:04
offby1 they came here for a quick fix.03:05
or, some did.03:05
that's often very different from learning.03:05
milki ya ya its great03:05
we intend for them to learn03:05
at least03:05
whether they like it or not03:05
sitaram offby1: what I said applies to that also. Quick fix, learn, whatever -- if they dont listen, why are they here?03:05
offby1 hm, true03:06
GarethAdams as a random person visiting a freenode channel, you don't know if the person replying to you actually knows anything. so, as someone helping you have to justify your questions to gain their trust03:06
sitaram milki: that page is not linked from the main page on purpose. I dont want anyone *accidentally* offended :)03:06
← etcetera left03:06
milki aha03:06
*gasp* something offensive on teh interwebs03:07
sitaram GarethAdams: oh come on. That's a pretty poor reason. Scepticism, trying it out, is fine, but not supplying a transcript of the error when asked repeatedly?03:07
milki: *double gasp* and from *me*!!!03:07
GarethAdams sitaram: I know, its weak03:07
offby1 sitaram: I assume they figure it's a) a pain to do; and b) won't help much.03:08
GarethAdams in that case I imagine he was embarassed about showing lots of mistakes03:08
offby1 a) is maybe sorta true; but they get b) vastly wrong03:08
my helping average without a transcript is probably 0.200; _with_ a transcript it's probably .90003:08
→ etcetera joined03:09
sitaram GarethAdams, offby1: in combination, it's lack of faith in the person helping. At that point it makes no sense to waste your "breath" so to speak. You're spending more energy convincing him than solving the problem or even thinking about it03:09
→ Yuuhi` joined03:09
offby1 well, I rarely go to much effort.03:09
If they won't help me help then, then ...03:10
← Zenmaker_ left03:10
sitaram there's this guy who came on to the gitolite list asking a silly question while claiming to have been using git for 7 years. (Do the math)03:10
→ Zenmaker_ joined03:10
sitaram several people tried to explain things to him but he couldn't get it into his noggin that the problem he had did not even exist!03:10
← Yuuhi left03:10
offby1 "a cry for help"03:11
sitaram the worst thing is I sent him a very "wow you're far smarter than I am if you understood git in 2005 because I tried twice and failed" and the sarcasm was totally lost. He preened03:11
sitaram learns a lesson03:11
sitaram never use sarcasm and subtlety :)03:11
← codeM0nK3Y left03:12
→ glennpratt joined03:13
→ shawngo joined03:14
→ mritz joined03:14
offby1 or not without inventing new snarky smilies03:16
milki sitaram: thats what the \sarcasm is for03:16
→ DofLeFou joined03:17
→ Lulzon joined03:18
sitaram one can always tell an academic. They say \sarcasm (latex style) instead of </sarcasm> :)03:18
→ linduxed joined03:20
milki lol03:20
offby1 I was considering making a LaTeX joke but didn't have the energy.03:20
← mxweas_ left03:24
milki no energy? im ircing in my nap03:26
→ bubbles10101 joined03:26
← BiggFREE left03:27
offby1 is IRCing in his lap03:28
offby1 that's why they call it a "laptop"03:28
← jast left03:30
← Chibby_ left03:32
← ben_alman left03:32
→ apok joined03:35
→ mxweas_ joined03:36
→ ben_alman joined03:36
→ jast joined03:36
← Sonderblade left03:37
← mxweas_ left03:37
→ neurodrone joined03:38
← neurodrone left03:38
→ neurodrone joined03:38
→ ZephyrLi joined03:39
→ ill1cit joined03:39
→ dreiss joined03:40
EugeneKay What's this about latex bodysuits?03:40
← ZephyrLi left03:40
→ ZephyrLi joined03:41
milki you mean plugsuits?03:41
FauxFaux What /isn't/ about latex bodysuits.03:41
offby1 EugeneKay: weird. I'm watching a documentary about GW Bush 41, and he just said that when he first saw Barbara, she was wearing a rubber bathing suit03:41
← lresende left03:41
→ robertfw joined03:42
← robertfw left03:42
→ w09x_ joined03:42
→ lresende joined03:42
← TomyLobo left03:44
← iamjarvo left03:44
← lresende left03:44
EugeneKay I can't say it surprises me03:44
← glennpratt left03:44
FauxFaux can't work out if milki is making an unobscure anime reference, or an obscure bdsm reference.03:45
← w09x left03:45
← eddiemoya left03:45
EugeneKay Why not both?03:45
sitaram has worked out that offby1 made a not-at-all-obscure "we're all old people" reference03:45
→ glennpratt joined03:45
→ cooloney joined03:45
← apok left03:46
→ towski joined03:46
milki except sitaram is ancient03:47
→ smw joined03:48
← smw left03:48
offby1 ancient, I tell ya03:48
→ smw joined03:49
milki FauxFaux: plugsuits are real??03:49
→ panpainter joined03:49
FauxFaux milki: I'm not sure you want to know.03:50
milki nods03:50
→ igotnolegs joined03:50
→ Sonderblade joined03:51
← w09x_ left03:51
→ w09x joined03:51
← Lulzon left03:51
→ mxweas_ joined03:52
sitaram milki: references to Barbara Bush make me feel like a teenager though. Compared to her, I am...03:52
→ iamjarvo joined03:52
→ dhruvasagar joined03:52
iamjarvo what are .dat files?03:52
FauxFaux Could be anything.03:53
← jast left03:53
iamjarvo i have a bunch of these pull_201207010840.dat03:53
FauxFaux They're certainly not produced by git.03:54
iamjarvo kk03:54
thanks03:54
offby1 what .dat file?03:54
who .dat?03:54
← Eridius left03:54
← thelazydeveloper left03:55
iamjarvo offby1 such a jokester :)03:55
← rideh left03:56
← glennpratt left03:56
→ BiggFREE joined03:58
→ jast joined04:01
→ cybersphinx joined04:03
→ private joined04:04
→ Eridius joined04:04
private → Guest1957004:04
← boombatower left04:06
→ jackh joined04:06
← the_cybersphinx left04:06
← jackh left04:07
← cilly left04:11
← cooloney left04:11
← adamm left04:12
→ renzhi joined04:12
→ cilly joined04:13
→ macrover joined04:14
→ centipedefarmer joined04:17
← DofLeFou left04:18
← mklappstuhl left04:18
← centipedefarmer left04:19
→ joshteam joined04:20
← ill1cit left04:21
← guampa left04:21
→ patrick85 joined04:22
← dhruvasagar left04:22
→ herdingcat joined04:23
← mxweas_ left04:24
← WillMarshall left04:24
← kmurph79 left04:24
→ topi joined04:25
→ WillMarshall joined04:26
→ lresende joined04:26
rhizmoe i've got a problem, the error "unable to find remote helper for 'ssh'" http://pastie.org/425368404:26
defaultro here is what I am thinking and I think it's going to work. I'll do an svn export so it doesn't include the .svn directories. Then from the directory I checked out the svn repo, I will create my git repo04:28
rhizmoe that should work fine04:28
defaultro sweet04:28
rhizmoe you lose history04:28
defaultro yeah, that's the problem04:28
is it possible to import them too04:29
← dreiss left04:29
rhizmoe not from svn export, i don't think :)04:29
defaultro k04:29
rhizmoe or this: http://stackoverflow.com/questions/79165/how-to-migrate-svn-with-history-to-a-new-git-repository04:29
defaultro thanks04:29
I'll check it out04:29
← igotnolegs left04:30
← etcetera left04:30
← imrobert left04:30
← Axsuul left04:36
→ eletuchy joined04:36
→ beautifulmind joined04:36
→ Chamunks joined04:37
← BiggFREE left04:38
→ DofLeFou joined04:38
Chamunks is there a gitextensions type app for debian flavored linux?04:39
rhizmoe just a gui?04:40
Chamunks well just something fairly full featured.04:40
rhizmoe how many features is "full?"04:40
regardless, i like git-cola04:41
Chamunks I just learnt git extensions to get my head around git.04:41
← rehat left04:41
Chamunks now my installation of 64bit win7 failed and i just defaulted to ubuntu kus it was around.04:41
so now i dont know what to use so I'll try git-cola that sounds fun :P04:41
rhizmoe i don't know about fun, but it's fairly straightforward04:42
← htroyack left04:44
→ angelsl joined04:44
→ kmurph79 joined04:46
→ mxweas_ joined04:46
→ etcetera joined04:46
→ andrewhl joined04:47
← Tuna-Fish left04:49
→ HyperNerdV2 joined04:50
← ZephyrLi left04:50
← Eridius left04:51
Chamunks lol well as long as it works ok im happy :)04:51
→ thiago joined04:52
→ mklappstuhl joined04:54
← uu left04:55
→ Tuna-Fish joined04:56
← WillMarshall left04:56
← jast left04:57
→ hwrd|work joined04:58
← Zenmaker_ left05:01
→ Zenmaker_ joined05:01
← mishok13 left05:04
→ olaf_ joined05:07
← etcetera left05:08
→ glennpratt joined05:08
→ reuss joined05:14
← yaazkal left05:14
← towski left05:15
← beautifulmind left05:20
← shigekimorimoto left05:20
← thiago left05:20
← Goplat left05:20
→ shigekimorimoto joined05:21
← Tuna-Fish left05:22
← peterpan left05:23
→ thirdknife joined05:23
← DofLeFou left05:24
→ Tuna-Fish joined05:24
← macrover left05:30
← nicc left05:30
← glennpratt left05:31
→ nicc joined05:31
→ toabctl joined05:34
→ subhojit777 joined05:34
→ LeMike1 joined05:34
→ dc5ala joined05:36
← LeMike left05:36
→ glennpratt joined05:39
← madewokherd left05:39
← Tuna-Fish left05:40
← glennpratt left05:40
← mxweas_ left05:43
← iamjarvo left05:46
→ Tuna-Fish joined05:46
← eletuchy left05:47
→ mxweas_ joined05:47
→ glennpratt joined05:49
← glennpratt left05:49
← Tuna-Fish left05:49
→ etcetera joined05:53
→ Tuna-Fish joined05:53
→ prasannatsm joined05:53
→ pantsman joined05:54
← pantsman left05:54
→ pantsman joined05:54
← edude03 left05:54
→ edude03_ joined05:54
← mritz left05:58
→ chovy joined05:59
chovy i commit a directory that was a git clone into git. And now I get an annoying message everytime I do git status05:59
← patrick85 left06:02
← OOPMan left06:02
→ Sky[x] joined06:04
← gitinfo left06:04
→ ferdna joined06:06
← Chamunks left06:06
← nutron left06:07
rhizmoe having some trouble with remote repos: fatal: Unable to find remote helper for 'svn'06:08
setting up a remote repo, i should say06:08
but i think that error, which comes on push, is local06:09
milki rhizmoe: what do you mean by setting up a remote repo?06:09
and why does it say svn06:09
:o06:09
→ rehat joined06:09
rhizmoe milki: origin is svn://git@server:44444/repos/test.git06:10
oh crap!06:10
prasannatsm git pull shows "Performing inexact rename detection" and consumes all RAM + Swap. How to solve this?06:10
rhizmoe tries again06:10
milki but...it says svn06:10
rhizmoe sorry, i'm transitioning06:10
milki: yes, that's what i just realized :)06:10
milki ooo06:10
:P06:10
prasannatsm: pkill?06:10
rhizmoe: also, the path is relative to /06:11
prasannatsm what is pkill?06:11
milki process kill06:11
prasannatsm what to do with pkill?06:11
milki is this not linux -.-06:11
prasannatsm I need to pull the latest changes but the problem does not let me do that. Even after waiting for 1 hour it continues.06:12
It is linux only. What is the purpose of pkill in this context?06:13
milki you kill git06:13
so git doesnt run06:13
← subhojit777 left06:14
→ jast joined06:15
← hakunin left06:15
→ j342 joined06:18
prasannatsm but the problem is not solved yet. I need to pull the latest version but without running into this trouble.06:18
jkitchen prasannatsm: do you have local changes which need to be preserved?06:18
might be better just to make a new clone06:18
← thirdknife left06:18
prasannatsm I cannot delete and clone the full repository again as it is more than 1GB in size.06:18
No need of local changes (assuming) I will have a back up copy.06:19
→ hakunin joined06:19
jkitchen and 1GB is too much for you to redownload?06:19
prasannatsm doing it daily is too much :)06:19
jkitchen oh, this is a daily occurrence?06:20
prasannatsm mostly (it happens in a couple of days)..06:20
jrdnn Please, what does this mean? "- return result;\n+ return result;" where \n is a newline.06:20
→ ehsan joined06:20
jkitchen prasannatsm: are you making huge amounts of changes in the upstream repo or something? maybe something in your workflow is wonky06:21
prasannatsm What is the meaning of "Performing inexact rename detection" and what is the reason behind it? I would like to understand.06:21
The repository is linux-next (linux kernel repository).06:21
jkitchen wow, you've been dealing with this issue for months it would seem :)06:22
prasannatsm and I am doing this in my home (not office network where unlimited download is available).. So I have to optimize this.06:22
jrdnn prasannatsm: Git compares all the files and ones that are over 50% same lines are counted as renamed files06:22
prasannatsm Exactly.06:22
How to tell git not to do this?06:23
Is it possible to bypass this problem and still pull the latest code?06:23
jkitchen other than pointing you at the answer provided in the thread you posted a while back, I don't know, sorry :(06:24
I'm assuming you've already tried that method06:24
prasannatsm Yeah but nothing fruitful.06:24
← HyperNerdV2 left06:24
→ thirdknife joined06:25
jrdnn prasannatsm: Use resolve instead of recursive mode for git pull06:26
→ harshpb joined06:26
prasannatsm I will give that a try.06:27
← andrewhl left06:31
← jast left06:32
→ dzonder joined06:34
→ und3f joined06:39
prasannatsm jrdnn: do you mean I should resolve things manually? Or what do you mean by "resolve instead of recursive mode for git pull"?06:40
how to do that?06:40
← harshpb left06:42
→ jast joined06:42
→ harshpb joined06:42
← friskd left06:47
← cyphase left06:48
← Tuna-Fish left06:49
← Fretta left06:50
→ longbeach joined06:50
→ Tuna-Fish joined06:51
→ Chib joined06:52
← kukks left06:53
← Tuna-Fish left06:55
← kmurph79 left06:56
← jast left06:56
→ Tuna-Fish joined06:56
← lresende left06:56
← harshpb left06:58
← Tuna-Fish left07:01
→ marthinal joined07:02
→ Tuna-Fish joined07:02
→ flavius joined07:02
→ thiago joined07:03
→ nutron joined07:04
← Guest19570 left07:05
→ cyphase joined07:05
← panpainter left07:05
← w09x left07:06
← Sky[x] left07:06
→ Dave^| joined07:10
→ hoschi joined07:16
← palm_vue left07:20
→ palm_vue joined07:21
← ferdna left07:23
→ aspotashev joined07:25
← gavin_huang left07:28
← thiago left07:29
→ jfelchner joined07:31
→ iwoj joined07:32
→ gitinfo joined07:33
ChanServ set mode: +o07:33
← prasannatsm left07:34
→ jast joined07:34
→ KaLam1ty` joined07:37
→ BiggFREE joined07:38
← yoklov left07:41
← subbyyy left07:43
EugeneKay sitaram - do you have a mailing list for gitolite tag announcements? github is.... spammy.07:44
← hwrd|work left07:47
← jast left07:48
→ jast joined07:48
→ Parabol joined07:51
→ dreiss joined07:53
→ dr_lepper joined07:53
← dr_lepper left07:53
→ dr_lepper joined07:53
← Kulrak left07:58
→ Kulrak joined07:58
← Kulrak left07:58
→ Kulrak joined07:58
← olaf_ left07:58
← jpieper left07:59
→ olaf_ joined07:59
→ w41_ joined07:59
→ ReekenX joined08:01
→ jpieper joined08:01
← jast left08:02
← w41 left08:02
← Davey left08:02
→ robotmay joined08:03
→ ipronin joined08:04
→ rchavik joined08:05
← rchavik left08:05
→ rchavik joined08:05
← jason237 left08:06
← thirdknife left08:06
→ airborn joined08:06
→ mmc1 joined08:06
← laen0k left08:08
→ jast joined08:08
→ d0k joined08:08
→ laen0k joined08:09
→ duckxx joined08:09
sitaram EugeneKay: are you not on the gitolite mailing list?08:10
→ Sky[x] joined08:11
→ skorgon joined08:11
sitaram EugeneKay: https://groups.google.com/d/msg/gitolite/JUohsYg-c48/il9atk2bpJoJ08:12
← dr_lepper left08:13
← jast left08:16
→ mobilegamelabs joined08:17
→ arietis joined08:21
← toabctl left08:22
→ thirdknife joined08:23
← BiggFREE left08:23
← rehat left08:25
→ nioncode joined08:28
→ raporteur joined08:38
← skorgon left08:42
→ martinjlowm joined08:42
← mxweas_ left08:43
→ jast joined08:43
→ blacktulip joined08:45
→ fisted_ joined08:46
← fisted left08:46
→ snearch joined08:46
← jast left08:49
→ __iron joined08:51
→ da_news joined08:53
← da_news left08:53
→ w09x joined08:54
← iwoj left08:54
← Parabol left08:54
→ jast joined08:56
← pantsman left08:59
← ReekenX left09:02
← duckxx left09:03
← thirdknife left09:03
→ TomyLobo joined09:03
← Fandekasp left09:03
← archdori left09:03
→ Fandekasp joined09:05
→ pantsman joined09:05
← pantsman left09:05
→ pantsman joined09:05
→ archdori joined09:05
→ whitman joined09:05
→ Guest10990 joined09:06
← jast left09:07
← jfelchner left09:07
← Guest10990 left09:12
→ skorgon joined09:12
→ jast joined09:12
← j342 left09:13
← troyt left09:14
← Sky[x] left09:15
← jhford left09:15
← txomon|home left09:15
← nyuszika7h left09:16
← SirFunk left09:16
nioncode → nioncode|busy09:19
→ thirdknife joined09:19
← robotmay left09:20
→ troyt joined09:21
→ jhford joined09:21
→ SirFunk joined09:22
→ lixef joined09:22
→ eagles0513875 joined09:22
eagles0513875 hey guys is there a way i can force a merge09:22
back into my master branch09:23
→ tg joined09:24
→ Pupeno_W joined09:24
GarethAdams what do you mean "force a merge"?09:26
cmn force meaning what09:26
git merge will try to merge, and only stop if bad things would happen09:26
→ ISF joined09:28
← Pupeno_W left09:28
← jast left09:28
Marcux83|away → Guest1525809:31
eagles0513875 actually fixed it09:32
← lixef left09:33
→ i42n joined09:36
→ lousygarua joined09:36
→ j342 joined09:37
← airborn left09:37
→ marhaban joined09:38
← blacktulip left09:38
→ subhojit777 joined09:39
→ jast joined09:39
← thirdknife left09:40
→ tomislater joined09:43
→ OOPMan joined09:46
← rchavik left09:47
→ thirdknife joined09:53
← arietis left09:55
→ arietis joined09:56
← ology left09:56
→ khismetix joined09:57
→ mischat joined09:57
→ airborn joined09:57
← airborn left09:57
← TomyLobo left09:59
← ipronin left10:00
→ lixef joined10:01
→ ipronin joined10:01
→ dfr|mac joined10:05
← aspotashev left10:06
→ rchavik joined10:12
← rchavik left10:12
→ rchavik joined10:12
← spyro left10:13
← marhaban left10:13
→ ciao joined10:17
← ciao left10:17
→ n1x joined10:21
← renzhi left10:23
→ patrick85 joined10:24
← OOPMan left10:26
→ jjido joined10:29
→ kevinfagan joined10:29
→ TomyLobo joined10:29
← selckin left10:31
→ caddoo joined10:33
← jjido left10:33
→ jjido joined10:34
→ zastaph joined10:36
→ nyuszika7h joined10:36
← subhojit777 left10:36
→ simplechat joined10:37
← simplechat left10:37
← dfr|mac left10:41
← Dave^| left10:42
→ Dave^| joined10:43
→ d0k_ joined10:43
← jast left10:44
← d0k left10:44
d0k_ → d0k10:44
→ matthiaskrgr joined10:46
→ dfr|mac joined10:51
← dfr|mac left10:53
← AlbireoX` left10:55
→ dfr|mac joined10:55
← patrick85 left10:59
→ patrick85 joined10:59
→ ToBeFree joined11:02
→ Fast2 joined11:03
← khismetix left11:05
→ khismetix joined11:05
← snearch left11:07
← project2501a left11:09
→ vervic joined11:11
→ oriba joined11:11
← herdingcat left11:12
← w09x left11:13
→ herdingcat joined11:14
→ thelazydeveloper joined11:15
→ w09x joined11:15
→ Per4u3e joined11:17
→ spyro joined11:19
← svm_invictvs left11:22
→ svm_invictvs joined11:26
← svm_invictvs left11:26
→ svm_invictvs joined11:26
← mobilegamelabs left11:30
→ SkAzZ joined11:31
← jjido left11:31
← jargon- left11:32
→ blacktulip joined11:35
← patrick85 left11:36
→ spaceonline joined11:36
→ syphar joined11:36
→ Chillance joined11:36
← w09x left11:37
← Chillance left11:40
→ Chillance joined11:41
→ gusnan joined11:42
← bubbles10101 left11:42
→ w09x joined11:43
→ jast joined11:43
→ diegoviola joined11:45
Guest15258 → Marcux8311:45
→ ipalaus joined11:45
→ Seer49 joined11:45
→ Seppoz joined11:46
→ dvide joined11:50
← ToBeFree left11:50
→ quazimodo joined11:50
← jast left11:52
← lixef left11:54
→ enmand joined11:55
→ jast joined11:55
← marthinal left11:59
← Seer49 left12:00
→ robotmay joined12:01
→ AdrienBrault joined12:03
→ marhaban joined12:05
→ marthinal joined12:06
← thirdknife left12:07
← spaceonline left12:08
→ patrick85 joined12:11
→ Seer49 joined12:12
← robotmay left12:13
→ leilaM joined12:14
ChanServ set mode: +v12:20
← n1x left12:21
→ thirdknife joined12:21
→ Parabol joined12:23
→ aspotashev joined12:23
→ ReekenX joined12:24
→ kenneth joined12:27
← kenneth left12:27
← lousygarua left12:27
← ehsan left12:27
→ yorick joined12:28
→ peterpan joined12:28
← marhaban left12:30
← Nibato left12:32
→ newbie joined12:34
← skorgon left12:34
newbie → Guest2875112:34
← vervic left12:35
→ Shusshu joined12:36
axrfnu how to update the list of remote refs on the local system after one did remote-delete a branch?12:36
FauxFaux git remote update12:36
axrfnu hmm, the deleted brach is still shown in "git branch -av"12:37
wereHamster axrfnu: git remote prune origin12:37
← Layke left12:37
axrfnu wereHamster: yeah, that did the trick. thank you!12:38
→ Nibato joined12:39
jast sorry if the bot is slow today. we've got heavy server load.12:40
← tomislater left12:40
jast the website is down for the time being, too12:40
← gitinfo left12:41
← Shusshu left12:42
← marthinal left12:44
→ gitinfo joined12:45
ChanServ set mode: +o12:45
→ andrewhl joined12:46
← __iron left12:53
→ tinti joined12:53
← patrick85 left12:54
→ skorgon joined12:56
← aspotashev left12:57
→ aspotashev| joined12:58
→ chris__ joined13:01
← thirdknife left13:02
→ pantsman- joined13:02
→ frerich_ joined13:05
← pantsman left13:05
← Guerrero left13:09
← frerich_ left13:10
→ Guerrero joined13:12
→ thirdknife joined13:14
→ madewokherd joined13:15
← localhost left13:17
→ Rescue9 joined13:18
→ centipedefarmer joined13:19
→ nickpresta joined13:19
→ localhost joined13:19
→ toabctl joined13:20
← palm_vue left13:20
→ jargon- joined13:21
→ palm_vue joined13:21
→ iamjarvo joined13:23
← nickpresta left13:23
← aspotashev| left13:23
→ aspotashev|| joined13:23
→ dhruvasagar joined13:24
→ vitor-br joined13:24
→ nickpresta joined13:26
→ DofLeFou joined13:26
← dhruvasagar left13:27
→ aspotashev joined13:28
← aspotashev|| left13:28
← nickpresta left13:30
→ wbednarski joined13:32
→ aspotashev| joined13:32
← aspotashev left13:32
← w09x left13:33
→ dhruvasagar joined13:34
→ sq-one joined13:35
→ txomon|home joined13:35
← dfr|mac left13:37
→ btree_ joined13:38
← mischat left13:38
← khismetix left13:38
← wbednarski left13:40
← btree__ left13:41
← aspotashev| left13:42
→ marhaban joined13:43
← marhaban left13:43
← rchavik left13:45
← mmc1 left13:45
← Fast2 left13:45
← daethorian left13:46
→ glennpratt joined13:46
→ w09x joined13:47
← w09x left13:48
→ aspotashev| joined13:50
→ guampa joined13:53
→ Ian334 joined13:57
← Ian334 left13:58
← skorgon left13:59
nioncode|busy → nioncode14:01
→ afuentes joined14:01
← dhruvasagar left14:02
← neurodrone left14:03
← peterpan left14:04
← enmand left14:05
← kevinfagan left14:06
→ kevinfagan joined14:07
→ jperry2 joined14:07
← jperry2 left14:08
→ surfdue joined14:10
→ jjido joined14:11
→ nickpresta joined14:12
→ patrick85 joined14:12
← SkAzZ left14:13
← Milossh left14:15
← bartman left14:16
← philips_ left14:16
→ robert_ joined14:17
robert_ so, I'm getting, 'git-upload-pack: /lib/libc.so.6: version `GLIBC_2.16' not found (required by git-upload-pack)' when I try to execute 'git clone --no-checkout "/home/robert-butler/.bundler/cache/git/sinatra-b525892ea06b9fac17e190c37b6500b2c2378e0b" "/home/robert-butler/.bundler/ruby/1.9.1/sinatra-762967f8aa33"'14:18
jjido what is your glibc version?14:19
wereHamster and how did you install git14:19
→ philips_ joined14:19
← jgoss left14:20
← jjido left14:22
crissi how i can add files to .gitignore using git gui?14:22
offby1 dunno14:22
← Guest28751 left14:22
robert_ Oh. duh.14:23
← patrick85 left14:23
← herdingcat left14:24
← nowhere_man left14:25
→ nowhere_man joined14:25
defaultro since git is distributed in nature, and each developer has his own copy of the repo, what is the ideal way of commiting?14:25
nevyn the only way possible.14:26
locally14:26
so commits are always to your local repo14:27
defaultro i mean, let's say 5 programmers working on the same repo14:28
← leilaM left14:28
nevyn 5 programmers working on the same project each with a repo14:28
yes14:28
and maybe a "cannonical repo" if you want to use a push to centre workflow.14:29
defaultro ok. So every one before starting on it should do a pull? Or should we push to bare setup?14:29
nevyn in group projects you generally want people to clone not init14:29
defaultro: so.. git doesn't mandate any particular workflow14:30
defaultro ok14:30
nevyn you can do anything from a full mesh (which does get unwieldy fast) to core 2 devs + people pushing through them to anything you like14:30
→ cakehero joined14:30
defaultro let's say we're both working on the same project14:31
nevyn yep14:31
defaultro i don't want to update test2.css while you had updates from last night14:31
nevyn why not?14:31
defaultro what I have the not updated version and I start updating it?14:32
what if I ...14:32
nevyn well.. there are a few things that could happen14:32
← Mannequin left14:32
nevyn if the edits you make and the edits I make are independent git will merge them when we each pull14:33
if we edit the same area of the file then it'll cause a conflict14:33
← Tommy[D] left14:33
defaultro ok14:33
nevyn and when one of us attemts to merge it we'll have to fix it up14:33
→ Tommy[D] joined14:34
defaultro so let's say we work on control.css file. You worked on it last night and you modified line 47. Today, I worked on my local copy. I updated line 92.14:34
nevyn yep14:34
← cakehero left14:34
defaultro will it cause conflict?14:34
nevyn nope14:34
defaultro oh. I remember in svn, I won't be able to commit it. I might be wrong14:35
nevyn you're correct.14:35
defaultro are you familiar with svn?14:35
oh ok14:35
nevyn svn won't let you commit if you're not uptodate with the central repo14:35
defaultro got it14:35
that is one neat feature14:35
nevyn but.14:35
no it's not14:35
→ nowhereman joined14:36
nevyn git won't let you push to a remote repo unless you have the current refspec for the head of the branch you're pushing to (same thing effectively)14:36
the probem is.14:36
defaultro k14:36
nevyn commit means something different in git to what it means in svn (kinda)14:36
→ zhulikas joined14:37
defaultro k14:37
← toabctl left14:37
defaultro ideally, what is the best way? Git pull before starting working on local copy?14:37
nevyn defaultro: it depends on requirements14:37
→ Lulzon joined14:37
nevyn in how do you work.14:38
defaultro k14:38
at work, i got used to svn14:38
we svn update every morning14:38
nevyn so emulating svn semantics while still allowing offline commits etc is easy.14:38
defaultro k14:38
nevyn but git doesn't HAVE to work like svn14:39
even tho it can14:39
for this workflow case.14:39
→ _iron joined14:39
← nowhere_man left14:39
defaultro k14:40
nevyn so make a bare repo (or use a central server manager like gitolite)14:40
← centipedefarmer left14:40
nevyn each developer clones it.14:40
they commit locally14:40
and push commits back to the central bare repo14:41
defaultro got it14:41
thanks nevyn14:41
nevyn the push will be disallowed if it rewrites history unless they use force (gitolite or similar can prevent history re-writes)14:42
← Chib left14:42
→ spaceonline joined14:42
nevyn so a normal bare repo will allow anyone with access to it to rewrite it's history using --force14:43
→ Sky[x] joined14:43
nevyn gitolite and similar central server solutions can change this so some or all users can't re-write history14:43
← flavius left14:44
← zastaph left14:44
nevyn defaultro: also look at gitflow14:45
!gitflow14:45
gitinfo The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/nvie/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references14:45
nevyn and !book14:45
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 !parable14:45
defaultro thanks14:45
nevyn book first14:45
then gitflow14:45
← albel727 left14:45
defaultro cool14:46
nevyn gitflow describes a local workflow and how to use branches to best effect14:46
for development14:46
← edude03_ left14:46
→ Goplat joined14:47
defaultro k14:49
→ mischat joined14:49
→ dfr|mac joined14:49
← ReekenX left14:49
→ centipedefarmer joined14:50
→ cakehero joined14:52
→ jgoss joined14:54
→ CannedCorn joined14:54
→ jjbohn joined14:56
→ denom joined14:57
→ bartman joined14:58
→ dhruvasagar joined14:58
← kn330 left14:59
← mischat left14:59
→ nicoulaj joined15:01
← denom left15:01
← jjbohn left15:03
← kpreid left15:04
→ mischat joined15:06
→ Davey joined15:09
← CannedCorn left15:10
← spaceonline left15:11
→ zastaph joined15:12
← brentratliff left15:13
→ abdulkarim joined15:16
→ jperry2 joined15:17
→ lousygarua joined15:17
← thirdknife left15:17
← nickpresta left15:17
→ ferdy_23 joined15:18
nowhereman → nowhere_man15:18
→ ology joined15:18
← ferdy_23 left15:19
→ developernotes joined15:19
← developernotes left15:19
→ gkmngrgn joined15:20
← glennpratt left15:20
← dpwright left15:21
← lousygarua left15:22
← iamjarvo left15:23
→ hwrd|work joined15:24
→ SkAzZ joined15:28
→ leilaM joined15:29
EugeneKay sneezes15:29
← leilaM left15:30
← cakehero left15:30
← DofLeFou left15:30
→ flavius joined15:30
→ imrobert joined15:31
→ leilaM joined15:34
EugeneKay sitaram - I am not; I of course see the links to it now in the "contact" section of the gitolite docs index.html(I always use the TOC)... maybe a reference in the Install or Quick Install pages to "sign up for the announce list" ?15:35
offby1 gesundheit15:35
→ snearch joined15:35
→ JohnBat26 joined15:36
EugeneKay Danke15:36
offby1 that means you get to drink15:36
EugeneKay I'm not even out of bed yet15:37
sitaram EugeneKay: the master TOC has a link15:37
offby1 EugeneKay: and your point is ... ?15:37
oh, I see: someone would have to bring it to you. Don't you have a wife, roommate, or cat?15:38
EugeneKay offby1 - the beer is allllll the way in the kitchen15:38
sitaram says "contact info, mailing list, IRC channel"15:38
EugeneKay God no; heck no; allergies.15:38
offby1 little robot butler?15:38
"Siri, fetch me a Hale's IPA"15:38
EugeneKay sitaram - some of us read faster than we comprehend. :-p15:38
→ kpreid joined15:39
→ j3424 joined15:39
← j342 left15:40
nevyn mmm15:41
"light travelling faster than sound explains how some people appear intelligent until you hear them speak"15:42
offby1 :-)15:43
→ enmand joined15:44
→ pantsman joined15:44
← pantsman left15:44
→ pantsman joined15:44
← dfr|mac left15:45
← pantsman- left15:47
← gusnan left15:48
→ RaceCondition joined15:48
→ cakehero joined15:49
→ yoklov joined15:52
← joshteam left15:52
→ gani joined15:53
→ dfr|mac joined15:54
→ joshteam joined15:55
→ subbyyy joined15:55
← leilaM left15:55
← dfr|mac left15:59
← asakura left16:03
← ology left16:03
← jperry2 left16:04
→ asakura joined16:04
→ edude03 joined16:07
→ iwoj joined16:10
← joshteam left16:11
→ scorpius_ joined16:18
scorpius_ how can get git to provide me something like coogle code web frontend? example: http://code.google.com/p/stan/source/list16:19
(local)16:19
→ jjbohn joined16:20
→ dfr|mac joined16:21
← gani left16:22
→ shawngo_ joined16:22
→ mritz joined16:23
← mklappstuhl left16:24
← jjbohn left16:24
→ SkAzZ1 joined16:25
← shawngo left16:26
shawngo_ → shawngo16:26
← dhruvasagar left16:26
← madsy left16:26
cmn scorpius_: !lol16:26
gitinfo scorpius_: git config --global alias.lol "log --oneline --graph --decorate"16:26
cmn or gitk16:26
← SkAzZ left16:27
← dfr|mac left16:28
→ nadavoid joined16:28
→ RaceCondishun joined16:30
← RaceCondition left16:30
RaceCondishun → RaceCondition16:30
→ Fretta joined16:30
guampa → vtolcow16:31
vtolcow → guampa16:31
← enmand left16:33
→ DofLeFou joined16:33
→ n1x joined16:33
→ codeM0nK3Y joined16:34
→ dhruvasagar joined16:34
→ TheGabspectacle joined16:36
→ khaije|minder joined16:37
→ Milossh joined16:37
khaije|minder Is this statement correct? git grep doesn't allow one to search the working-dir, index, and rev-list all at once.16:38
→ ehsan joined16:38
→ patrick85 joined16:40
→ Sigma joined16:40
← gkmngrgn left16:41
← lekefly_ left16:42
→ LekeFly joined16:44
← snearch left16:46
milki hmmm description says or16:46
so i would agree with that khaije|minder16:47
← ehsan left16:47
milki hmmm16:47
but --untracked says 'In addition' which implies it does index + working tree16:47
er16:47
no...16:47
khaije|minder cool, thanks milki. I appreciate the occasional sanity check16:48
milki working tree + untracked...16:48
← imrobert left16:48
khaije|minder ya I think --tracked is the closest option, but then it seems to ignore the provided rev-list16:48
→ home joined16:48
home guys16:48
how can I revert to a different git revision16:49
also how do I check what revision I am on?16:49
also how do I check what revision I am on?thanks16:49
milki home: man git-reset16:49
gitinfo home: the git-reset manpage is available at http://git-scm.com/docs/git-reset.html16:49
milki home: git status16:49
er16:49
home: man git-status16:49
gitinfo home: the git-status manpage is available at http://git-scm.com/docs/git-status.html16:49
milki home: "revert" means different things in different scm's16:49
→ plazia joined16:49
khaije|minder home: are you asking about changing your version of git, or the version of something tracked by git?16:50
home no, I am trying to revert to a different version of this program16:51
← i42n left16:52
khaije|minder ah ok, that was probably a silly question. :)16:52
← RaceCondition left16:52
→ imrobert joined16:53
→ frerich_ joined16:53
← frerich_ left16:53
→ frerich_ joined16:53
→ dfr|mac joined16:53
→ gani joined16:54
← caddoo left16:54
← j3424 left16:54
→ duckxx joined16:55
home lol16:57
this is gonan be weird16:57
→ jfelchner joined16:57
home \I did git revert master16:57
cmn this is why milki said it means different thing in different scms16:57
milki nods16:58
cmn not that the command would make much sense even if it meant what it does in svn16:58
home what does scms mean?16:58
milki ah16:58
source control uh...16:58
something...16:58
← gani left16:58
→ leilaM joined16:58
cmn either source control management, or source change management or whatever you want, really16:58
milki yes!16:59
← TheGabspectacle left16:59
← abdulkarim left17:00
→ lnostdal joined17:01
← DofLeFou left17:02
← dfr|mac left17:02
← chris__ left17:03
→ ppawel joined17:03
← imrobert left17:03
khaije|minder home: if it helps, you can think of the revision as moving the branch pointer to an early change set. (you can see Sitaram's excellent tut here: http://sitaramc.github.com/gcs/)17:03
milki sitaram++17:04
ppawel I want to squash 5 commits into one so I do "git rebase -i HEAD~5" but in the editor I don't see my top commit (HEAD)17:04
milki should be there o.O17:04
cmn look at the bottom17:04
milki its reversed17:04
cmn or not, depending on how you look at it17:05
milki lol17:05
from the general populace's intuitive view17:05
:o17:05
cmn that is an instruction set, so the things will happen in normal reading/writing order17:05
milki o.O17:05
cmn you think the general puplace has an intuitive view of how a VCS behaves?17:05
milki LOL17:06
← tinti left17:06
ppawel it is a merge commit - does it make a difference?17:06
cmn merges are serialized on rebase17:06
a rebase across a merge is generally a bad idea17:07
ppawel ah sorry, I think it actually is how I wanted it...17:07
gitk just shows the merged branch and I was confused17:07
but these commits are not on the master now17:07
so there is only one (merge) commit17:07
sorry17:07
← tr-808 left17:08
→ tr-808 joined17:08
→ madsy joined17:09
← madsy left17:09
→ madsy joined17:09
← iwoj left17:09
→ maletor joined17:09
← chuckf left17:09
→ RaceCondition joined17:10
← warthog9 left17:10
← khaije|minder left17:11
Remram what happens if you add custom fields in a commit object?17:12
cmn not much17:12
Remram can you push them or does the receiving party checks it somehow?17:12
cmn the receiving party can do whatever they feel like, but I doubt anybody would bother checking the commit header17:13
SaCu I'd guess depending on the position of your fields, git will just think "here starts the commit message".17:13
cmn the header works a lot like an e-mail header17:14
← maletor left17:14
← hwrd|work left17:14
cmn do notice that those fields will be discarded on rebases and other rewrite operations17:14
Remram that's why I'm asking cmn, with email you get a lot of X-Whatever17:14
→ maletor joined17:15
cmn yes, and you can do the same in git17:15
as long as your fields come after the compulsory ones17:15
and as long as all the git implementations along the way support it17:15
← eagles0513875 left17:16
→ hwrd|work joined17:17
← gregrperkins left17:17
← nicc left17:17
Remram that's kind of the issue17:17
it would make sense to ignore unknown headers but...17:17
→ nicc joined17:17
cmn it's not about making sense, that's what you're supposed to do, but not every implementation may support optional headers17:19
← nicc left17:19
← maletor left17:19
→ eagles0513875 joined17:19
← jargon- left17:21
→ TheJH joined17:21
← hwrd|work left17:21
→ ology joined17:22
Remram ok I'll try it17:22
→ project2501a joined17:22
Remram for lulz purposes17:22
and see what happens with the official implementation & dulwich17:22
→ hwrd|work joined17:23
← mritz left17:24
cmn git-core handles it just fine; I'd hope dulwich was made carefully17:25
← hwrd|work left17:25
← aspotashev| left17:27
scorpius_ just git init a directory with couple of source files (mostly C). Now what? (new to git)17:27
nicoulaj What is the simplest way to commit current changes to a new branch ? I often find myself in the situation where I work in master, but want to commit to a separate branch17:28
cmn scorpius_: that depends completely on what you want to do; but first read !book17:28
gitinfo scorpius_: 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 !parable17:28
cmn nicoulaj: !float17:29
gitinfo nicoulaj: 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.17:29
scorpius_ shouldn't be git usable without the need to read a book? shouldn/t it be self explanatory?17:29
→ friskd joined17:29
SaCu at least in theory, the whole world should be self explanatory :-)17:30
→ aspotashev| joined17:30
→ mxweas_ joined17:30
→ Zenmaker__ joined17:30
EugeneKay !simple17:31
gitinfo At its heart git is made up of many concepts that are individually simple. Getting the whole picture right is often tricky, and it is usually about breaking up the complex concept into its simple, individual parts and grokking those. Both !bottomup and !cs will help with that.17:31
EugeneKay Reading the book is a good way to get it all in one big lump instead of plodding around for a week17:31
← friskd left17:31
→ enmand joined17:32
← Davey left17:33
cmn scorpius_: do you drive a car without reading a book? do you do math without learning about it? cooking has books, woodworking doesn't come by divine inspiration17:33
→ jargon- joined17:34
EugeneKay False; marijuana leads to carpentry.17:34
nicoulaj cmn gitinfo: thanks, I'm dumb, I was convinced uncommitted changes weren't preserved when switching branches17:34
gitinfo nicoulaj: you're welcome, but please note that I'm a bot. I'm not programmed to care.17:34
← Zenmaker_ left17:34
→ razi joined17:34
nicoulaj I'm double dumb dumb then :)17:35
cmn EugeneKay: does your stoned carpentry lead do anything useful?17:35
offby1 s/not programmed to/programmed not to/17:35
cmn nicoulaj: there isn't really anything branch-specific17:35
the workdir and the repo aren't that tightly coupled17:35
EugeneKay offby1 - No, jast was just too lazy to import the Emotions CPAN module17:36
cmn - I drink. THAT leads to eBay purchases.17:36
SaCu nicoulaj, actually, it will even try to merge your changes into the new branch, if that's an existing one.17:36
← und3f left17:36
→ patrick8_ joined17:37
← patrick85 left17:37
← patrick8_ left17:37
cmn no, merging is a different thing and you need to tell it to do it17:37
← dreiss left17:37
→ patrick85 joined17:37
← eagles0513875 left17:38
→ dreiss joined17:38
← razi left17:38
offby1 suspects SaCu is used to subversion17:38
SaCu cmn: local, uncommited changes are _not_ merged with the files that come with a git checkout foo?17:39
→ razi joined17:39
SaCu offby1, didn't use svn in ages :)17:39
← arietis left17:39
cmn no17:39
offby1 HECK no.17:39
cmn if you use -m, it will, but by default it will refuse17:39
SaCu hm, let me check; that's not what i read in git.git and not what my memory tells.17:40
cmn you're confusing merging with leaving the files along17:40
alone*17:40
← leilaM left17:40
→ dfr|mac joined17:40
← Chillance left17:40
→ Chillance joined17:41
→ maletor joined17:41
← dreiss left17:43
← razi left17:43
← dfr|mac left17:43
SaCu cmn, uhm, seems you're right. It says "...please commit or stash before switch...". Must have missed the switch handling in git.git code then; I just wonder why it always looked like it would do that17:44
→ rehat joined17:44
← jargon- left17:44
→ ehsan joined17:45
cmn probably because you never had to merge files17:45
SaCu maybe17:46
→ mritz joined17:46
← maletor left17:48
← home left17:48
→ AlbireoX joined17:49
→ RaceCondishun joined17:49
→ tomislater joined17:51
→ chris__ joined17:51
← RaceCondition left17:52
RaceCondishun → RaceCondition17:52
→ hwrd|work joined17:52
→ nadavoid|afk joined17:53
← nadavoid|afk left17:53
→ nadavoid|afk joined17:53
← hwrd|work left17:53
← nadavoid|afk left17:53
← nadavoid left17:54
← vitor-br left17:54
→ hwrd|work joined17:54
→ maletor joined17:56
→ gani joined17:57
← madsy left17:59
← dc5ala left17:59
→ madsy joined18:00
← madsy left18:00
→ madsy joined18:00
← RaceCondition left18:01
← maletor left18:02
← gani left18:02
→ glennpratt joined18:03
← andrewhl left18:03
← Sky[x] left18:07
→ adamm joined18:07
← mritz left18:09
← duckxx left18:09
← plasticle left18:10
→ nax__ joined18:11
← nax__ left18:11
→ enigmuriatic joined18:11
enigmuriatic if i mistakenly initiated a git somewhere, do i use "git rm" to remove it? and if so, what do I use as the file name?18:12
← robert_ left18:12
→ leilaM joined18:12
cmn you remove .git18:12
→ chris___ joined18:12
← chris___ left18:13
← chris__ left18:14
→ gavin_huang joined18:14
← yoklov left18:14
→ albel727 joined18:15
→ lresende joined18:15
enigmuriatic great, thanks. is that single file all there to the init?18:16
EugeneKay It's a folder18:17
→ mishok13 joined18:17
→ tqmz joined18:17
EugeneKay It's what holds the "repo". There's a bit of magic to detect the folder holding a .git/ directory as being a non-bare repository.18:18
← mishok13 left18:18
← centipedefarmer left18:19
→ arietis joined18:19
← patrick85 left18:21
→ mritz joined18:22
→ jargon- joined18:24
← mxweas_ left18:26
→ Wolster joined18:26
→ TeckniX joined18:27
← TeckniX left18:28
← leilaM left18:28
→ bstrds joined18:31
→ psoo joined18:31
→ andrewhl joined18:32
← Goplat left18:32
→ TheRadeonDude joined18:35
→ duckxx joined18:35
← hwrd|work left18:35
→ Chamunks joined18:36
→ leilaM joined18:37
← mritz left18:38
→ bullicon joined18:38
← CpuID2 left18:39
← Parabol left18:44
← etcetera left18:44
→ tinti joined18:44
→ marhaban joined18:45
← tinti left18:45
→ tinti joined18:45
→ nicc joined18:46
→ iamjarvo joined18:47
iamjarvo if i delete a file from all history does that rewrite the hash of every commit?18:48
i followed this tut https://help.github.com/articles/remove-sensitive-data and then i look at my shas and they are different18:48
milki if you actually delete from all history, yet18:48
yes18:48
→ und3f joined18:49
iamjarvo milki hrm so when i push to github it will ask me to do a force push? is that ok? i will be rewriting history write?18:49
milki you will be rewriting history yes18:49
if no one cares, it will be fine18:49
:P18:49
if people care, well....that sucks since its sensitve data you need to delete18:50
>.>18:50
iamjarvo so force push to github is fine. what happens when someone pulls down?18:51
milki their ref is force updated18:51
cmn it will merge both histories18:51
milki and if the merge, bad things will happen18:52
Remram if people already cloned/pulled from your repository you shouldn't do this18:52
milki you want them to do a reset --hard on their branch18:52
Remram if you do, bad things will happen, to them18:52
you should tell them about it anyway18:52
also, if the goal is to make the info disappear, if they have it you're already too late18:52
milki o ya, true that18:53
← bullicon left18:53
iamjarvo well i have the password and i wanted to clear it out18:53
but i guess the easier thing to do is tell him to change it18:53
cmn he has to do that anyway18:53
iamjarvo good call. its not worth it18:54
→ yoklov joined18:55
← tr-808 left18:55
iamjarvo thanks guys18:55
→ Ksg89 joined18:58
→ vervic joined18:58
→ ToBeFree joined18:59
← 15SACAX4T left18:59
→ Targen joined19:01
← psoo left19:03
→ dsirijus joined19:03
→ drizzd_ joined19:05
→ AaronMT joined19:05
← vervic left19:05
← camdenx left19:05
→ gusnan joined19:06
← drizzd left19:08
→ ezl joined19:09
Marcux83 → Marcux83|away19:10
→ pandeiro joined19:10
ezl whats the easiest way to fix that?19:11
i just merged a development branch into my production branch -- it contained 236 commits. i meant to do --no-ff but i forgot.19:11
← pandeiro left19:11
← angelsl left19:11
cmn reset to HEAD@{1}, see !fixup19:11
gitinfo 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!19:11
← Per4u3e left19:12
← aspotashev| left19:13
← martinjlowm left19:13
→ FernandoBasso joined19:15
→ luigi69 joined19:15
→ aspotashev| joined19:16
luigi69 Hi, when i move a Git repo with submodules to diffrent directory i get error 'fatal:not a git repository: x/.git/modules/y' - how can i fix this ?19:16
→ joshteam joined19:18
→ macrover joined19:19
→ etcetera joined19:19
← palm_vue left19:20
← kevinfagan left19:21
← Nibato left19:21
→ palm_vue joined19:21
→ pandeiro joined19:22
← ezl left19:23
← Ksg89 left19:25
← aspotashev| left19:27
→ Nibato joined19:27
→ Jippi joined19:28
cmn luigi69: go into the submodules and and change what dir they point to in .git19:28
→ noscript joined19:29
→ jceb joined19:29
→ aspotashev| joined19:29
→ gani joined19:31
luigi69 cmn: now i've got 'git status --porcelain' failed in submodule x/y19:32
← TheRadeonDude left19:32
← Seer49 left19:32
EugeneKay !repro19:32
gitinfo 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.19:32
→ reuf joined19:32
EugeneKay x/y are meaningless ;-)19:32
cmn what did you change into what?19:32
← philips_ left19:32
cmn what command gave you that?19:33
← reuf left19:33
luigi69 i run 'git status'19:33
x/y i just subdir/dir of my module ('moduls/admin')19:33
cmn then say that19:33
arbitrarily hiding stuff doesn't help19:34
← syphar left19:34
→ centipedefarmer joined19:34
→ philips_ joined19:34
luigi69 don't be mad19:34
← leilaM left19:34
cmn well?19:35
what did you change into what?19:35
luigi69 sec19:35
← centipedefarmer left19:36
luigi69 http://pastebin.com/Qn6xB0jM19:37
← lnostdal left19:38
→ gkmngrgn joined19:38
cmn why did you put in that path?19:39
it doesn't look like it would solve anything19:39
→ leilaM joined19:39
luigi69 Why did I what ? Moved the repo?19:39
cmn that's not what I asked19:39
← ehsan left19:39
cmn why did you put in that path?19:39
→ Sky[x] joined19:40
luigi69 I don't understand what are you asking for :(19:40
← blacktulip left19:40
cmn hm, why is status trying to go to the old dir...19:40
.gitmodules shouldn't have that path, should it?19:41
luigi69 nope, it all refferences to github19:41
cmn you still haven't actually answered the question19:41
→ goshawk joined19:42
cmn what did you change into what?19:42
luigi69 i've moved frepo from D:\projects\foobaz\dev into D:\projects\foobar\dev, and after you said updated in submodule .git this change19:43
← byronb left19:48
→ paysonsc joined19:49
← enigmuriatic left19:49
gitinfo set mode: +v19:49
paysonsc Hello, denizens of #git!19:49
EugeneKay We prefer to call ourself gits19:49
cmn luigi69: the change being...19:50
it may be that .git/modules/whatever/config has a reference to the old worktree19:50
paysonsc Well, gits, I am trying to use git-am to apply patches from an mbox I've exported from my IMAP client. When I do this, it applies the patches in reverse order, resulting in chaos. Any ideas why this would happen?19:51
SaCu luigi69, what does git --version give you?19:51
luigi69 version 1.7.9, cmn: ill check that now...19:51
SaCu luigi69, in the file d:\projects\foobar\dev\modules\admin\.git might be a back link to the .git directory of your submodule19:51
→ Eridius joined19:52
← joshteam left19:52
cmn SaCu: we already did that19:52
SaCu cmn: as i read only the other direction19:53
cmn no, chaning the gitfile so it points to the right place19:53
← onlinegangster left19:53
→ dfr|mac joined19:55
luigi69 cmn now 'git status' works, i hope other commands will work too. Thank you.19:55
→ hwrd|work joined19:55
← pandeiro left19:56
→ resure joined19:58
→ pandeiro joined19:59
← gani left20:00
→ gani joined20:00
← gani left20:00
← glennpratt left20:01
→ LeMike joined20:01
← Samual left20:02
→ Samual joined20:02
← Samual left20:02
→ Samual joined20:02
← LeMike1 left20:03
→ centipedefarmer joined20:03
→ joshteam joined20:03
uman → btv20:06
→ arvind_khadri joined20:06
→ williamcotton joined20:07
← centipedefarmer left20:08
← rehat left20:08
→ ehsan joined20:08
← hwrd|work left20:09
← joshteam left20:09
btv → bv20:10
bv → btv20:10
→ dreiss joined20:10
→ fireh joined20:11
← iamjarvo left20:11
→ developernotes joined20:13
← developernotes left20:14
← tomislater left20:16
← Sigma left20:17
← guampa left20:17
← longbeach left20:17
← pandeiro left20:18
ChanServ set mode: +v20:18
→ enigmuriatic joined20:19
← resure left20:19
← dhruvasagar left20:20
→ DofLeFou joined20:20
enigmuriatic is there a way to cause git to automatically ignore certain filetypes?20:20
→ pandeiro joined20:20
paysonsc enigmuriatic, does this file type always have a certain extension?20:20
cmn put *.whatever in your gitignore file20:20
enigmuriatic paysonsc: yes20:21
thanks20:21
paysonsc enigmuriatic: like cmn says, put *.extension into a file name .gitignore in your repository20:21
← eno left20:21
cbreak enigmuriatic: you'll have to change the configuration20:21
enigmuriatic: man git-config20:21
gitinfo enigmuriatic: the git-config manpage is available at http://git-scm.com/docs/git-config.html20:21
cmn git-config? why?20:22
→ connormai joined20:22
cbreak look at core.excludesfile20:22
set it to something, and put the name pattern in there20:22
cmn ah, I see what you're getting at20:22
← connormai left20:22
cbreak cmn: because he said "automatically"20:22
← Carraway left20:22
cbreak the others are just per repo20:22
→ eno joined20:23
← eno left20:23
→ eno joined20:23
cmn yes, but not putting it in the .gitignore doesn't make it automatic for the rest of the devs20:23
too many negatives, sorry20:23
I mean to say that the per-repo .gitignore makes it valid for other devs who use the repo automatically as well20:23
cbreak there's no way to make everyone everywhere ignore it. It's either per repository (.git/info/exclude), per folder/history (.gitignore) or per account (what I said)20:24
paysonsc Anyone know why git-am would be applying my patches in reverse order?20:24
→ imrobert joined20:24
cbreak paysonsc: wrong names?20:25
paysonsc generated by git-send-email20:25
cbreak maybe wrong order in the mailbox20:25
→ QaDeS joined20:25
cmn e-mail doesn't have any ordering guarantees20:25
cbreak well, what ever, if they apply cleanly, you can change the order with rebase -i20:25
paysonsc cbreak: they often don't20:26
← und3f left20:26
← tinti left20:26
→ und3f joined20:26
→ abacabadabacaba joined20:26
→ developernotes joined20:27
→ fayimora joined20:27
cmn have you looked at the mbox?20:28
← abacabadabacaba left20:29
paysonsc yes, you are correct, they are in the wrong order in there20:30
moderately annoying20:31
looks like it orders by timestamp20:31
and git is sending them in reverse order20:31
cmn it's more likely that one of the mail servers along the way reordered them20:32
← marhaban left20:32
← zhulikas left20:36
→ eletuchy joined20:39
← edude03 left20:41
← Dreamer3 left20:42
← duckxx left20:44
← TheJH left20:44
→ kukks joined20:45
→ TheJH joined20:46
← DofLeFou left20:46
→ Speed joined20:49
← developernotes left20:50
→ snearch joined20:51
← JohnBat26 left20:51
→ wingy joined20:52
wingy hi20:52
← wingy left20:52
→ wingy joined20:53
← wingy left20:53
→ wingy joined20:53
→ marcogmonteiro joined20:56
← yoklov left20:58
← kermit left21:00
→ centipedefarmer joined21:02
← jceb left21:02
← Samual left21:04
← dfr|mac left21:04
→ LeMike1 joined21:06
→ DrNick joined21:07
← LeMike left21:07
← gkmngrgn left21:08
← fisted_ left21:08
→ joshteam joined21:09
→ fisted joined21:09
← asakura left21:13
→ asakura joined21:14
→ kermit joined21:16
→ tophyr joined21:16
tophyr does git have any command aliasing capabilities? ie alias 'co' to 'checkout' etc?21:18
← wingy left21:18
← lresende left21:18
← canapp left21:18
bremner tophyr: man git-config ; look for alias21:18
gitinfo tophyr: the git-config manpage is available at http://git-scm.com/docs/git-config.html21:18
tophyr kk, awesome. git help alias turned up nothin, figured there had to be tho :)21:18
→ Parabol joined21:19
← i7c left21:19
← rednaks left21:20
→ srji joined21:21
← AaronMT left21:22
← dsirijus left21:23
→ srji_ joined21:26
← srji left21:26
→ tomislater joined21:28
← d0k left21:28
← tomislater left21:28
← leilaM left21:30
← srji_ left21:30
→ mritz joined21:31
→ i7c joined21:33
→ canapp joined21:34
← plazia left21:34
← etcetera left21:34
→ etcetera joined21:35
← hoschi left21:35
← diegoviola left21:38
← pandeiro left21:39
→ plazia joined21:40
→ carl1 joined21:40
→ blast_hardcheese joined21:42
← _iron left21:42
→ carl_1 joined21:42
← plazia left21:43
← carl1 left21:44
→ plazia joined21:45
→ plazia_ joined21:46
← und3f left21:46
→ wbednarski joined21:46
gitinfo set mode: +v21:46
carl_1 Just started out with git and have a practical usage question, should I just drop it in here?21:47
← wbednarski left21:47
cmn !as21:48
gitinfo [!ask] Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.21:48
Enlik oh, there is indeed yet another way to get help for git subommand: 'git help whatever' (thanks tophyr :))21:48
→ wbednarski joined21:48
carl_1 Thanks :-)21:48
← ppawel left21:49
→ wbednarski_ joined21:49
← plazia left21:49
← wbednarski_ left21:50
→ wbednarski_ joined21:50
← wbednarski_ left21:50
← whitman left21:50
→ Samual joined21:50
← Samual left21:50
→ Samual joined21:50
← plazia_ left21:51
→ wbednarski_ joined21:51
← arvind_khadri left21:51
→ diegoviola joined21:51
→ plazia_ joined21:51
← wbednarski_ left21:51
carl_1 OK, here's a question: Let's say I committed, edited som files *and added one*, committed again, and want to revert back to the first commit - if I check out the first commit, the added file will still be there (right?). I would expect to get the working directory exactly in the state of my original commit. The mere existance of a file can be a big difference (say, e.g. when it is overloading a function). I can get around this by always r21:52
unning 'git clean' with apropriate options, but it feels like I'm either missing something, or using git in an inconvenient way?21:52
← etcetera left21:52
← wbednarski left21:53
← n1x left21:53
→ Goplat joined21:54
→ tatsuya_o joined21:54
EugeneKay It depends which !revert you're talking about21:55
gitinfo "Revert" is a heavily overloaded term. Do you mean: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard the uncommitted changes in the working tree [git checkout -- .]; c) undo committing [git reset --soft HEAD^, but type !rewriting_public_history] ?21:55
cmn what do you mean by adding a file? did you commit that file or did you just put it in the working directory?21:55
← LeMike1 left21:55
← joshteam left21:55
EugeneKay If you mean to check out the commit before the one where a file was added to git's tracking, then the file will go away when you checkout. It will still be stored in git at the commit you added it, and can be "restored" by checking out that commit.21:56
← Speed left21:56
EugeneKay You probably don't want to checkout any commits directly, but rather checkout a (new) branch at that commit.21:56
If that makes sense21:57
→ iamjarvo joined21:59
carl_1 Just a second, I'll clarify...21:59
← bstrds left21:59
cmn !repro would be best21:59
gitinfo 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.21:59
← Parabol left21:59
← FernandoBasso left21:59
→ Speed joined22:01
← Speed left22:01
→ Speed joined22:01
→ alanp joined22:02
→ wbednarski joined22:02
← wbednarski left22:03
← sq-one left22:05
← alanp_ left22:05
→ pandeiro joined22:05
carl_1 I checked it again by creating a temporary folder and git project. It now works as I'd expected. Must have messed something up when it worked otherwise before.22:07
I'll make sure to provide a terminal transcript with gist the next time, if apropriate, thanks.22:08
← nicoulaj left22:08
carl_1 So, generally, commits are not checked-out (but branches are)? What if I don't have any branches yet, just a line of commits (to be able to get back to an old state), and want to go back to an old state just to have a look at something. Would that be a typical case for checking out a commit?22:09
← marcogmonteiro left22:10
cmn not having any branches probably represents a broken state22:10
carl_1 Well, I meant just having one (master) branch, if that makes any difference.22:10
Enlik git checkout <hash|tag> works well here; also git stash can be useful in your case sometimes22:11
cmn that's having a branch22:11
→ RaceCondition joined22:11
cmn you can use checkout to go back in time, but that means detaching HEAD22:11
← TomyLobo left22:12
carl_1 cmn: and that should be avoided? Or would it be the right way to go back in time?22:13
cmn the right thing depends on why you're doing it22:13
carl_1 Not sure what "detaching HEAD" means, or if it's bad for me...22:14
cmn it means not being on any branch22:14
← fayimora left22:14
cmn so any changes you make won't be saved22:14
carl_1 Let's say I just want to go back in time to check something in the old code.22:14
cmn you'd often be better served by show or some GUI22:14
← dzonder left22:15
cmn because that can show the state of the old file without having to move files around and mess with time metadata22:15
carl_1 I did notice, after having checked-out an old commit, that 'git log' just showed commit up to that old commit, had to use 'git log --all' to get the has of the last commit when I wanted to go back.22:15
→ leilaM joined22:16
→ fayimora joined22:16
carl_1 I see the point in using show or a GUI there. But I could imagine I e.g. would like to do a compile on the old version e.g. to check the compile messages.22:16
← thelazydeveloper left22:16
← tatsuya_o left22:16
cmn checking out an old commit moves you to that commit, there is nothing else log can show22:17
that also depends on why you want to compile the old version; if you're bug-hunting, bisect is often a better option22:17
Enlik fyi, when you want to go back, you can do 'git checkout master' instead of searching for hash of the most recent commit, if that's why the log --all (I don't know any better way but this works fine)22:18
← olaf_ left22:18
cmn and if you want to do a maintenance release, what you want is to create a new branch at that commit, not checkout the commit22:19
you'd then checkout the new branch, but then it doesn't represent anything other than switching branches, which is the way you do things anyway22:19
→ ivali joined22:19
→ etcetera joined22:20
ivali Hello, how can i reply to a specific thread in a mailing list using git sendmail? (I want to reply to a kernel patch with another patch in the same thread).22:20
carl_1 cmn, Enlink, thanks, I get the points.22:21
cmn ivali: --in-reply-to22:22
by default send-email also asks you22:22
← RaceCondition left22:23
carl_1 Sorry, but something's still bothering me: If I just checked out a commit, then adding a new file to the working dir ('touch new'), not running 'git add...' or anything else, and then 'git checkout master', I'd expect to check out the last commit? The one without the file 'new'? But nevertheless it's still there even after checkout master?22:23
← ij left22:23
ivali What should I put there? The subject of the thread or some kind of id?22:24
cmn ivali: the e-mail's ID, see the raw e-mail for it22:24
carl_1: that file is unknown to git, therefore it doesn't touch it22:25
the working dir is different from a branch22:25
carl_1 OK. So if I made a number of changes in the working dir, including creating files (not yet having added them with 'git add'), maybe overloading other functions, and want to discard it all and get back to my last commit, or any other commit... then I have to use 'git clean' or 'add .' and then check out the commit I want to get back to?22:27
cmn add does the opposite of discarding22:28
use checkout -f22:28
if you want to delete unknown files, use clean22:28
← mritz left22:28
→ dozymoe joined22:28
← fireh left22:28
dozymoe → fireh22:29
ivali cmn: This is a legit email id? [email@hidden.address]22:30
carl_1 ok, but 'git checkout -f' still doesn't get rid of the file 'new', but that's probably not what you meant. So, using 'git clean' in this case would be the way to go I guess. Probably with -d -x -f options.22:31
→ kcj joined22:31
→ thiago joined22:32
→ reuf joined22:33
← reuf left22:33
→ thelazydeveloper joined22:34
cmn it would be wrong for checkout -f to delete untracked files; that would cause data loss22:36
← leilaM left22:36
cmn ivali: it can be a valid e-mail, so it can be a valid Mail-Id22:36
const → invariable22:37
cmn the format is pretty free; if that's what you see in the e-mail, that's what it is22:37
ivali thank you22:37
cmn carl_1: if you want to delete that file, just delete it22:37
git won't care22:38
← snearch left22:39
→ Anxi80 joined22:39
→ leilaM joined22:39
carl_1 Right. But with many added files, e.g. overloading functions, checking out a previous commit doesn't really take me back to the state things were when I made that commit. But I guess that's what 'git clean' is used for.22:39
← leilaM left22:40
← oriba left22:40
← Wolster left22:41
← codeM0nK3Y left22:42
cmn git only deals with the files you told it to care about22:42
if you need a pristine copy, use archive or checkout to another dir22:42
→ codeM0nK3Y joined22:42
cmn the working directory is where you put your stuff, and git must keep untracked files intact22:43
carl_1 Makes sense. Thanks for all the help.22:43
→ leilaM joined22:43
→ Seer49 joined22:44
→ SACBCAF joined22:44
→ LeMike joined22:46
← codeM0nK3Y left22:46
→ codeM0nK3Y joined22:47
→ [microwave] joined22:47
← plazia_ left22:48
← pantsman left22:49
← Seer49 left22:49
← [microwave] left22:49
→ Dreamer3 joined22:50
← codeM0nK3Y left22:51
→ codeM0nK3Y joined22:51
← cakehero left22:52
→ threexk joined22:54
← enmand left22:54
threexk hello. Is it possible to see the commit that affected a line prior to the one shown by git blame?22:55
thiago yes22:55
git blame <insert-the-sha1-that-it-shows-here>~ -- filename22:55
don't forget that ~ at the end22:55
threexk ah, I had tried exactly that except with ^. Let me try...22:55
thiago ^ also works22:56
except that ^ is sometimes a shell special. Be careful22:56
threexk thiago: The problem seems to be that the filename has changed.22:56
thiago type the old name22:56
threexk thiago: Got it! Thanks. I had typed the changed name before but left off the changed directory.22:58
→ ciupicri joined22:59
ciupicri I've deleted some braches and I've discovered right now that I've lost a commit in the process that I've forgot to cherry-pick. Is there a way to recover that commit?23:00
thiago do you have the SHA-1 of that commit?23:02
← frerich_ left23:02
SaCu If not, use git reflog and git log to find it. if you have it, you can cherry-pick using the sha-1.23:03
ciupicri thiago, unfortunately not23:03
← Khisanth left23:03
thiago ciupicri: do you have the SHA-1 of any of the later commits in that branch?23:04
did you push it anywhere?23:04
ciupicri I have also rebased a lot :-D23:04
and I've also deleted the branch from github23:04
→ rehat joined23:04
thiago how long has it been since you checked out that branch?23:05
ciupicri checked out?!23:05
thiago yes23:05
how long has it been since the last time you checked it out?23:06
GarethAdams i.e. last had it as your working copy23:06
ciupicri I think around 45 minutes23:06
thiago git reflog then23:06
you just need to figure out which of those commits is one that belongs in that branch23:06
then git log it, you'll see the commits23:06
ciupicri I found it. git reflog was what I need. Thank you!23:07
← leilaM left23:07
→ mritz joined23:08
→ p3rror joined23:10
← subbyyy left23:11
← zastaph left23:11
← fayimora left23:14
→ fayimora joined23:14
→ mgorbach joined23:16
→ thirdknife joined23:16
→ psoo joined23:16
→ Khisanth joined23:17
← nioncode left23:18
→ nadavoid joined23:21
← nadavoid left23:22
→ reuf joined23:22
→ subbyyy joined23:23
← subbyyy left23:23
← ivali left23:24
→ subbyyy joined23:24
← subbyyy left23:24
→ subbyyy joined23:24
← subbyyy left23:24
→ subbyyy joined23:25
← macrover left23:25
→ w09x joined23:25
← tophyr left23:27
← vmiklos left23:28
← carl_1 left23:28
← w09x left23:29
→ nadavoid joined23:31
→ _iker joined23:32
← etcetera left23:33
→ CodeTalks joined23:33
→ k0nichiwa joined23:33
← _iker left23:33
← CodeTalks left23:34
← Eridius left23:34
→ LeMike1 joined23:34
← LeMike left23:35
← Targen left23:36
→ jatt joined23:36
← Jippi left23:37
← tewecske left23:37
← arietis left23:37
→ Seer49 joined23:38
→ VladGh joined23:42
← psoo left23:42
← p3rror left23:44
→ Eridius joined23:45
→ Jippi joined23:45
→ RaceCondition joined23:45
← thirdknife left23:46
← thiago left23:48
← chovy left23:50
→ chovy joined23:51
→ p3rror joined23:57
← Eridius left23:58
← iamjarvo left23:58
← RaceCondition left23:59
→ mobilegamelabs joined23:59

Logs Search ←Prev date Next date→ Channels Documentation