IRCloggy #git 2011-09-30

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.

2011-09-30

sitaram frogonwheels: thanks!00:00
dang`r`us I accidentally did a git checkout -b already_existing_branch ... now I have it twice with the same name. What to do? I want to nuke my new erroneous branch.00:00
→ ymasory joined00:00
→ saysjonathan joined00:00
frogonwheels dang`r`us: nah - you couldn't have that- you sure it's not subtly different? case?00:00
→ dmac1 joined00:00
dang`r`us frogonwheels, warning: refname 'remotes/origin/ChartToolsMenu' is ambiguous.00:01
→ axl_ joined00:01
dang`r`us frogonwheels, http://pastie.org/261410800:01
frogonwheels dang`r`us: lol. ok. rm .git/refs/heads/remotes/origin/ChartToolsMenu probably would do it.00:01
← _psychic_ left00:01
dang`r`us I'd rather not touch .git if I can avoid it, but probably I have to now, eh00:01
frogonwheels dang`r`us: or git branch -d refs/heads/remotes/origin/ChartToolsMenu00:02
dang`r`us I'll do a backup first00:02
← saysjonathan left00:02
dang`r`us ok, sounds better :} will try that.00:02
→ subbyyy joined00:02
frogonwheels your other one will be refs/remotes/origin/ChartToolsMenu00:02
dang`r`us: presumably git branch still lists one of them.00:03
→ fruight joined00:04
← ymasory left00:04
dang`r`us thx. did the trick with rm.00:05
the other command did not work out of the box and I'd rather not wanna experiment00:05
→ saysjonathan joined00:05
← alexim left00:06
→ kermit1 joined00:07
← murilobr left00:08
→ ymasory joined00:09
→ ping-pong joined00:09
← saysjonathan left00:10
nicxvan I'm having a little trouble understanding checkout and push could someone point me to a good source?00:10
→ ehsan joined00:10
→ saysjonathan joined00:10
fruight i have a repo owned by root, but until recently it was no problem to 'git status', 'git log' or 'git diff' as nonpriviledged user. since the last 'sudo git commit' however, those commands all give me 'fatal: index file open failed: Permission denied' i checked and .git/index is 0600 , can i just chmod it to 0644 or would that be a Bad Thing?00:11
nicxvan I've been using git for about a week00:11
← boombatower left00:11
← kermit1 left00:11
→ kermit joined00:11
→ shadowmaster joined00:12
← ymasory left00:12
→ ymasory joined00:14
bremner nicxvan: you already went through man gittutorial?00:14
nicxvan is that the one that is under the help > online documentation?00:14
bremner lives on the command line00:15
← saysjonathan left00:15
→ hyperair joined00:15
stepnem_ → stepnem00:15
→ saysjonathan joined00:15
bremner nicxvan: it's the one that comes up when you type "git help gittutorial"00:15
→ ajt joined00:16
nicxvan in the command line? one sec let me check00:16
← saysjonathan left00:16
← dmac1 left00:17
nicxvan yeah that's one of the pages I looked at00:17
→ Error404NotFound joined00:17
← Error404NotFound left00:17
→ Error404NotFound joined00:17
nicxvan there are only two occurences of checkout on the page, and they don't explain what it does00:17
→ cannonball joined00:18
→ boombatower joined00:18
nicxvan wait after re-reading checkout is like logging into a particular repository then?00:18
bremner not really.00:18
nicxvan damn00:19
bremner nicxvan: maybe look for the "pro git" book online00:19
→ saysjonathan joined00:20
nicxvan so a checkout is like your working copy of a particular repository?00:21
bremner well. kindof.00:21
checkout is a command that updates your working copy00:21
fruight nicxvan: you might find this interesting http://www.cowboycoded.com/tag/git-checkout/00:21
← saysjonathan left00:22
nicxvan fruight: thanks, I'll read that00:22
→ ceej joined00:23
nicxvan oh ok so push and pull are simply accessing remote git databases and committing to them basically00:23
← sorin left00:24
fruight nicxvan: there's also fetch00:24
EugeneKay Pushing/pulling existing objects, not creating new ones(commits)00:24
← ping-pong left00:24
→ replore_ joined00:24
→ bigkm joined00:24
fruight nicxvan: as bremner said, Pro Git is really good, you can read it online here http://progit.org/book/00:25
← digitalfiz left00:25
nicxvan ok now I'm confused again,00:25
→ _psychic_ joined00:25
→ digitalfiz joined00:25
nicxvan fruight: I tried working through that, but after a few of the examples just flat out didn't work even with copy/paste it was a bit discouraging00:25
← baburdick left00:26
jbrokc so with a conflict pushed to say github that looks like http://goo.gl/57EF7 - what happened here? something is out of sync with remote / local and a conflict got pushed?00:26
→ jedahan joined00:27
→ dontpanic joined00:27
→ baburdick joined00:27
← ceej left00:28
→ oc80z joined00:28
dontpanic When I do a 'git merge --log --stat <branch>', the log entry is often truncated. Is there a way to avoid that?00:28
nicxvan fruight: that first link you sent was really interesting and taught me a couple things, but I don't know why it was labelled checkout, He jus tused it without talking about it heh.00:28
→ dmac1 joined00:29
bremner nicxvan: well, of course there is also "git help checkout"00:29
← ilyam left00:29
← ajt left00:29
bremner see in particular the EXAMPLES00:30
→ ilyam joined00:30
nicxvan now I feel dumb00:30
didn't think of that00:30
← jedahan left00:30
nicxvan that's exactly what I needed I was only finding the general help00:31
EugeneKay jbrokc - it's saying that the file vd was conflicted, but you resolved it. Looking at the log( https://img.eugenekay.com/016.png ), it appears that the file vd was unchanged from the first parent, "refactorings".00:31
→ _julian joined00:31
EugeneKay Er. http://img.eugenekay.com/caps/016.png00:31
nicxvan thanks for your help guys00:31
← tystr left00:31
jbrokc EugeneKay: so that's a conflict at HEAD~2, not a branch right?00:32
→ jedahan joined00:32
jbrokc oh, it does look like it's out of sync in that graph. thanks EugeneKay00:32
→ kodie joined00:32
EugeneKay Looking at the diff, it appears to be a poor merge job00:33
→ wilmoore joined00:33
jbrokc EugeneKay: whys' that00:33
also, http://cl.ly/3D1w0R1g2u3B1j1O1a3p kindof helps00:34
→ idlemind joined00:34
→ topeak joined00:34
EugeneKay Because the other commit(b7be24dd) didn't really get "merged" in so much as stepped-on00:34
← eijk left00:34
jbrokc EugeneKay: well that's because it didn't get pulled before right00:34
EugeneKay Correct, but the merge should incorporate changes from both as compared to their common ancestor. I'm not seeing the change that was made having been incorporated.00:35
idlemind hello #git. my team at work could use something to monitor and share changes to a group of files. they need to be available offline. atm they are mostly .xlsx files. would git be as viable as i think it would be for this?00:35
fruight what are the normal filepermissions for .git/index?00:36
← macmartine left00:37
→ sythe joined00:39
← sythe left00:39
→ sythe joined00:39
→ Pupeno joined00:39
← alexs left00:39
← jzellman left00:40
jbrokc EugeneKay: thanks for your help00:41
→ Fandekasp joined00:42
← ehsan left00:42
← xpot-mobile left00:42
→ sikao_lfs joined00:43
→ wabash joined00:43
→ xpot-mobile joined00:43
→ alexs joined00:43
→ dv310p3r joined00:43
wabash General workflow question: I have version 2 of a program. Going to make version 3, which shares some code, but has a very different architecture. In Java, so has very different package hierarchy too. Would it make more sense to do:00:44
a) branch and change incrementally. b) branch, move old stuff at once to old dir, then build incrementally with new dir structure. c) branch, make new dirs, develop there, and when done move to correct location00:45
d) something else thatI've not thought of.00:45
How do you guys deal with this situation?00:45
→ captainramen joined00:46
captainramen is there such thing as a recursive reset?00:46
idlemind wabash: i'm interested in the answer to this but i am very very new to git / scm so if any of you smart folks are on i'd appreciate hearing the answer to that too00:46
captainramen i.e. i want to git reset --hard the repo and all of its submodules00:46
wabash e) make a new repo and copy stuff over if/as I need it?00:47
hm...00:47
→ LekeFly joined00:49
← LekeFly left00:49
← xpot-mobile left00:49
← grekko left00:52
→ solussd_ joined00:52
frogonwheels captainramen: iirc git submodule for-each git reset --hard00:52
→ rchavik joined00:53
captainramen frogonwheels: thanks!00:53
frogonwheels wabash: I'd take door b)00:53
wabash: If you move the structure around, and commit - then any git blame will at least easily detect the fact that you moved everything round.00:54
wabash frogonwheels: ribbit, squeak, squeak, squeak... I mean, thank you.00:54
idlemind frogonwheels: any input on my question (usage case)?00:55
frogonwheels wabash: :) oh, and it won't hurt if you change the package names at the same time :)00:55
← jedahan left00:55
← jbrokc left00:55
→ rabidewok joined00:56
← baburdick left00:56
rabidewok → robertfw00:56
frogonwheels wabash: you should be fine with .xslx - though the problem with anything like that will be merging - and that won't matter which scm you use.00:56
err idlemind ^^^00:56
sory wabash00:56
*rr00:57
idlemind frogonwheels: i understand so the repo would blow up because it would not be able to merge changes it would just replace one copy with another00:57
→ cooloney joined00:57
→ baburdick joined00:57
frogonwheels idlemind: no - it wouldn't blow up. it would just say 'i can't merge this'00:57
idlemind: and leave you to merge it yourself.00:57
idlemind: if you can set up a mergetool to cope with it, that's a great start.00:58
idlemind: I made good progress towards a mergetool in jscript for word documents that loads up/automates word to provide a difference view.00:58
idlemind frogonwheels: excuse my ignorance i will need to research mergetool some. o why did we not maintain iFolder that novell gave us =( ...00:58
← dim_ left00:59
frogonwheels idlemind: if you're happy with a 'mine' or 'theirs' merge strategy, then that's pretty easy to cope with.00:59
idlemind: but whatever you do, if you have offline ability, you will have propblems with merging changes.00:59
idlemind well tbh i'd be happy with most recent file goes to master00:59
but that does open the door for missing data01:00
frogonwheels idlemind: whether that's offline folders or the most wonderful distributed SCM system.01:00
← dmac1 left01:00
idlemind and ya i see where you are coming with01:00
→ Alvo joined01:00
frogonwheels idlemind: with git (and other SCMs) you can set up mergetools &c based on filetype (man gitattrib iirc)01:00
idlemind so it's making a proper merge tool (your's only does .doc correct?) or dealing with a more crude decision engine (not a joke on bing)01:00
frogonwheels idlemind: does excell have a 'compare' option?01:01
.. compare docs that is?01:01
idlemind frogonwheels like in the application itself?01:01
frogonwheels if it does, it's likely you can automate it.01:01
idlemind: yeah, the application itself.01:01
idlemind: (my jscript is just automating the application)01:02
idlemind there is an add-in that does it01:02
→ d0k joined01:02
→ sorin joined01:02
frogonwheels idlemind: well you should be able to start from there - see ifyou can get a cscript script to automate the comparison given two files.01:03
idlemind i wonder if it would be easier to convert to odf (that's a set of xml files at the file level after you un-tar the actual odf)01:03
frogonwheels idlemind: merging would still be tricksy imho01:03
idlemind ya because the merge tool would still have to un-tar the file and look at each file inside then re-tar it back up01:04
← boombatower left01:04
frogonwheels idlemind: it would be interesting to see if hooks could be made that would unwrap/wrap stuff like odf files so that git could store it more efficiently01:05
unzip/zip01:06
→ bosyak joined01:06
→ treshoem joined01:06
idlemind ya and i'm just going off what i remember that they are actually zipped up they may actually not be i'll need to research that01:06
frogonwheels idlemind: i made some xslt scripts to create odf files once - that was entertaining ;)01:06
zip it is.01:06
← Alvo left01:07
→ Targen joined01:07
idlemind what if i switched to something like raw text files. could i script it so when a user powers the machine it checks for internet / server access and pulls down the latest stuff and then on logoff/shutdown update the server with their changes (if any) ... i know the login/logout/shutdown events can be scripted just asking if it makes sense or would it be more sensible to create a script to do git add; git commit; git remote and link it to the users desktop s01:08
o they have to upload to the main repo when they make changes01:08
basically i need to create a system that is easy to use (like really easy) and doesn't get in the way01:08
← bosyak left01:09
← wabash left01:09
frogonwheels idlemind: https://gist.github.com/1252396 here's that (actually it's vbs) script01:10
idlemind sweet01:10
seems easy enough ... i will play with that to see if i can do it with xls too01:11
moltar_net Hi. I did some cleaning in my local repo (removed some files from history). Now I am pushing changes to github. The push goes up to "Writing objects: 81%", and then sits there for like an hour. I've retried multiple times. What to do? Thanks!01:13
→ shiba_yu36 joined01:14
← shiba_yu36 left01:15
→ hynek_ joined01:17
→ jmah joined01:18
← baburdick left01:18
→ zeshoem joined01:21
← zeshoem left01:21
← treshoem left01:22
bremner moltar_net: do you have somewhere else you can try pushing to?01:22
→ Swimming_Bird joined01:22
→ thews joined01:25
→ holybit joined01:26
cjs In the gitolite config file, can I just say "repo *" for something that applies to all repos?01:26
→ kmc_ joined01:27
→ vervic joined01:27
← vervic left01:27
sitaram @all01:28
→ EM03 joined01:28
← EM03 left01:28
→ EM03 joined01:28
→ towski joined01:28
← EM03 left01:29
← towski left01:29
→ Vampire0_ joined01:30
idlemind so you have push/pull ... is push a two part operation like pull is?01:30
jmah idlemind: no01:31
← replore_ left01:32
← gchristensen left01:32
→ shiba_yu36 joined01:32
cjs sitaram: Thanks!01:32
sitaram you're welcome!01:32
idlemind jmah: thanks01:33
kmc_ → kmc01:33
idlemind so is it wise to run my own branch all the time so i am not working in master?01:34
→ replore_ joined01:34
idlemind or is it wiser to be like:01:34
dev 1 -> project lead -> master01:34
dev 2 ->01:34
→ zoran119 joined01:35
idlemind rather the project lead would pull changes into master from the dev repo's?01:35
zoran119 git blame shows some lines as '00000000 not yet commited' but git status doesn't show this file as modified... any ideas?01:36
the file is modified01:36
→ Chib joined01:37
idlemind also when i do a commit it just commits to my local copy of the branch i'm working in (master by default) correct? the actual project wouldn't be updated until i ran a git push?01:38
EugeneKay Correct.01:38
jmah that's true no matter what01:39
→ DjSlash joined01:39
idlemind so i would want to commit frequently locally and maybe only push once and a while or when a feature set is completely done or whatever i was working on01:39
→ f00li5h joined01:39
← holybit left01:39
idlemind that way others that pull off that "central" server would gain the changes when ready but wouldn't see all the little commits on the way to that one change01:40
moltar_net bremner: not setup, but I can't create another repo on my private git server01:40
or try pushing via ssh somewhere01:40
but it'd be a brand new repo with no history ...01:40
→ Samoi joined01:41
moltar_net .. or I guess I can checkout github's repo first01:41
→ holybit joined01:41
→ Chase-san joined01:42
bremner moltar_net: out of curiousity, is it a big repo?01:42
moltar_net $> du -hs .01:42
18M01:42
bremner that is not big01:42
moltar_net would pushing to localhost via ssh be considered pushing somewhere else? :)01:43
bremner it's better than nothing.01:43
→ kcm1700_ joined01:43
idlemind git remote add origin [email@hidden.address]01:43
^^ this command. is origin a system word or could i put whatever i want in there like:01:43
git remote add github [email@hidden.address]01:43
so then i could do a:01:43
git push -u github master01:43
instead of:01:43
git push -u origin master01:43
? or is origin special??01:44
bremner origin is not very special. github would work fine there01:44
← solussd_ left01:44
← robertfw left01:44
idlemind so origin is just a word that the git documentation (progit.org) decided to use or is there a function to the origin keyword?01:44
→ solussd_ joined01:45
jmah no special meaning01:45
idlemind k thanks01:45
jmah just a default name01:45
like "master"01:45
idlemind also files are not automatically moved to staging correct? i always need to git add before a commit01:45
→ ping-pong joined01:45
jmah true01:46
← kcm1700_ left01:47
idlemind jmah: that's a bit annoying outside of writing a script to do say git add *.html is their an easy/fast way to do commits?01:47
→ developernotes joined01:47
moltar_net bremner: so odd, gets stuck on local push too01:47
← developernotes left01:47
jmah git commit *.html01:47
← jalama left01:48
moltar_net oh wait ... NO01:48
it went through, but it did take a while01:48
bremner interesting.01:48
idlemind jmah lastly in committing or adding files or of a file type does git smartly add / commit only the changed files?01:48
← zodiak left01:48
moltar_net it got stuck on 81% again for a few seconds but did eventually push through, however it failed, because repo was not bare01:48
bremner bremner: big binaries or something01:48
err, moltar_net ^ ?01:48
moltar_net I deleted some binaries01:49
someone before me, the other developer, committed entire nginx install into the repo :/01:49
so I was cleaning it out01:49
so technically the binaries were deleted01:49
jmah idlemind: "not committing" means that it would be deleted01:49
don't think of the deltas, think of the states01:49
→ com4 joined01:50
jmah it makes a commit with the *.html files in the new state01:50
← sorin left01:50
→ BiggFREE joined01:50
idlemind ok. so say i have 3 files: 1.html 2.html 3.html01:51
if i edit 1.html and do a git add 1.html and then commit is it lighter/cleaner than doing git add *.html?01:51
jmah no01:51
fruight idlemind: it would be the same if nothing else was changed01:51
jmah there's no difference01:51
fruight idlemind: you could simply do 'git commit -a'01:51
idlemind k sorry very being anal about it i'm just trying to really get a grasp on what not only works but what is the best way01:51
→ warlock_mza joined01:52
→ vervic joined01:52
fruight if you want to commit all changes in your working dir, 'git commit -a' is what i'd do01:52
idlemind ya and then i can setup .gitignore to stop it from dealing with temp files01:53
→ rpg joined01:53
moltar_net bremner: is there some kind of debugging that I can enable to see what's going on?01:54
bremner moltar_net: there is, but I'm afraid I'm not familiar with it.01:54
moltar_net I tried -v, but its rather useless...01:54
bremner there are some environment variables01:54
→ DeviceZer0 joined01:54
← DeviceZer0 left01:55
→ DeviceZer0 joined01:55
idlemind thanks for your time tonight guys. time for me to drive home. have fun / be safe01:55
← bigkm left01:55
← idlemind left01:56
→ gchristensen joined01:56
← gchristensen left01:56
→ gchristensen joined01:56
Chase-san heya01:56
I was wondering if someone could help me setup a git server. I have... tried a few times but there always seems to be issues I cannot resolve.01:57
→ jspiros joined01:58
→ sorin joined01:58
Chase-san I am not as familiar with git or linux as I really should be perhaps. But I have used Git, and I like it. I wanted a private server to handle all the code I write.01:58
→ kurtzhong joined01:59
← gchristensen left02:00
→ Behi joined02:02
moltar_net Chase-san: look into gitolite02:05
there is also #gitolite02:05
← vervic left02:05
← nicxvan left02:07
→ gaurangaggarwal joined02:07
→ Tabmow joined02:08
→ ceej joined02:09
→ murilobr joined02:10
→ kerrick joined02:11
← gaurangaggarwal left02:12
→ kimico joined02:12
→ gnaruag joined02:12
→ krz joined02:15
→ gretch joined02:16
→ vervic joined02:17
← ilyam left02:17
→ frhodes joined02:17
← topeak left02:18
→ flamingspinach joined02:18
← frhodes left02:18
← kenperkins left02:19
zoran119 i want to clone a repo and then remove the origin remote, but keep all the branches as local branches (ie i don't want git prune to remove them)02:19
how do i do this?02:19
→ the_cybersphinx joined02:20
→ segher joined02:21
→ frhodes joined02:22
← subbyyy left02:22
→ xpot-mobile joined02:23
→ jcromartie joined02:23
→ subbyyy joined02:23
→ kanru joined02:26
jcromartie I just did a merge, and git flashed up a "warning" about being unable to merge a binary file02:26
but the merge succeede02:26
succeeded02:26
→ jezuz joined02:26
jcromartie and I lost the warning in the scrollback02:26
→ gaurangaggarwal joined02:27
jcromartie so I have no idea what file it was, or if there might be a real conflict02:27
← Error404NotFound left02:27
→ ISF joined02:28
← gnaruag left02:29
← moltar_net left02:29
→ Modius joined02:29
→ chuck joined02:30
Modius What's the best advocacy article for moving an SVN user to Git? His complaint, simplicity of SVN for what he does. I don't need total buyin, just sugar the pill02:31
→ niloc132 joined02:32
← frhodes left02:34
→ jdong_ joined02:34
← ceej left02:34
→ ceej joined02:34
→ spatulasnout joined02:35
← BiggFREE left02:36
← kerrick left02:37
→ knuckolls_ joined02:39
← ceej left02:39
jcromartie I see... the file didn't change in both branches02:41
→ Error404NotFound joined02:41
jcromartie so there was no conflict02:41
and therefore no error; just a warning02:41
Modius: hmm, I'm not sure... I saw one recently that was good02:41
→ kukks joined02:42
← gaurangaggarwal left02:47
→ mxweas_ joined02:48
→ gaurangaggarwal joined02:48
← gaurangaggarwal left02:49
← ISF left02:49
→ gaurangaggarwal joined02:50
← gaurangaggarwal left02:50
← bartek left02:50
← vervic left02:51
← warlock_mza left02:52
→ gaurangaggarwal joined02:54
← gaurangaggarwal left02:54
→ gaurangaggarwal joined02:54
← gaurangaggarwal left02:55
→ gaurangaggarwal joined02:56
← gaurangaggarwal left02:57
→ alester joined02:57
→ gaurangaggarwal joined02:58
→ ptl joined02:59
→ Kolbsoft joined03:01
→ nardev joined03:01
← jspiros left03:05
← DeviceZer0 left03:05
← jmah left03:06
→ unforgiven512 joined03:06
→ baburdick joined03:09
→ jspiros joined03:11
→ DeviceZer0 joined03:11
→ caseymcg joined03:12
→ rhl joined03:12
← gaurangaggarwal left03:14
→ jspiros_ joined03:15
→ mandric joined03:15
→ envi joined03:16
← dontpanic left03:17
→ zheng joined03:17
← sikao_lfs left03:18
→ kerrick joined03:19
← jspiros_ left03:20
← jspiros left03:20
← cannonball left03:20
→ jspiros joined03:20
→ dankest joined03:21
← alester left03:22
→ catsup joined03:22
← Kolbsoft left03:22
← holybit left03:23
→ macmartine joined03:23
← murilobr left03:23
← mandric left03:24
← kurtzhong left03:24
→ kurtzhong joined03:24
← macmartine left03:26
← antoniojasr left03:27
← Chase-san left03:27
→ macmartine joined03:28
→ jezuz` joined03:28
→ minijupe joined03:29
← kurtzhong left03:29
← zheng left03:29
← cooloney left03:29
→ kenperkins joined03:31
← mxweas_ left03:31
← rpg left03:32
← jezuz left03:32
→ zheng joined03:32
→ jmah joined03:33
→ kurtzhong joined03:33
→ boombatower joined03:34
← friskd left03:36
← minijupe left03:37
→ rsewill joined03:38
→ cooloney joined03:39
→ diegoviola joined03:40
→ daveb_ joined03:40
→ Raging_Hog joined03:40
→ NfNitLoop joined03:40
→ jhford joined03:41
→ zodiak joined03:41
← rsewill left03:42
→ todun joined03:44
← com4 left03:45
← voidx left03:46
→ cmyers joined03:46
→ com4 joined03:47
→ voidx joined03:47
← macabre left03:48
→ mandric joined03:50
← sorin left03:51
← daveb_ left03:52
← caseymcg left03:53
→ caseymcg joined03:53
← kodie left03:54
→ kodie joined03:54
← voidx left03:55
← mandric left03:55
← f00li5h left03:57
← Samoi left03:59
→ mysphyt joined04:00
← cadabra left04:01
→ Samoi joined04:02
→ voidx joined04:03
← sythe left04:03
→ chrisf joined04:03
→ depressed joined04:04
← oc80z left04:06
→ oc80z joined04:06
→ jezuz joined04:07
→ dreiss_ joined04:07
→ LongBeach joined04:08
← chrisf left04:08
← NfNitLoop left04:08
← cooloney left04:08
← envi left04:08
← ptl left04:08
← gretch left04:08
← thews left04:08
← _julian left04:08
← digitalfiz left04:08
← eletuchy left04:08
← Amorphous left04:08
← Liquid-Silence left04:08
← JeffJohnson left04:08
← ASIRINeiluj left04:08
← jhford left04:08
← kenperkins left04:08
← catsup left04:08
← spatulasnout left04:08
← Caius left04:08
← cjs left04:08
← mlncn left04:08
← niloc132 left04:08
← etcetera left04:08
← Samoi left04:08
← mysphyt left04:08
← kurtzhong left04:08
← jspiros left04:08
← DeviceZer0 left04:08
← Modius left04:08
← kanru left04:08
← xpot-mobile left04:08
← krz left04:08
← DjSlash left04:08
← nd___ left04:08
← nb left04:08
← rhl left04:08
← hynek_ left04:08
← fruight left04:08
← mrtazz left04:08
← cbreak-work left04:08
← wolfric left04:08
← kerrick left04:08
← nardev left04:08
← Chib left04:08
← nazgul102 left04:08
← voidx left04:08
← cmyers left04:08
← Raging_Hog left04:08
← jezuz` left04:08
← Vampire0_ left04:08
← iXeno_ left04:08
← toofar left04:08
← lindenle left04:08
← captainramen left04:08
← macmartine left04:08
← kukks left04:08
← subbyyy left04:08
← segher left04:08
← _psychic_ left04:08
← ilteris__ left04:08
← durarara_ left04:08
← surfdue left04:08
← obiwahn left04:08
← guufy left04:09
← shedammit left04:09
→ dotCOMmie joined04:11
→ jmkeyes joined04:11
→ chrisf joined04:11
→ voidx joined04:11
→ Samoi joined04:11
→ mysphyt joined04:11
→ jhford joined04:11
→ NfNitLoop joined04:11
→ Raging_Hog joined04:11
→ cooloney joined04:11
→ kurtzhong joined04:11
→ kenperkins joined04:11
→ macmartine joined04:11
→ catsup joined04:11
→ kerrick joined04:11
→ envi joined04:11
→ DAAEA8T joined04:11
→ nardev joined04:11
→ ptl joined04:11
→ kukks joined04:11
→ spatulasnout joined04:11
→ niloc132 joined04:11
→ Modius joined04:11
→ kanru joined04:11
→ subbyyy joined04:11
→ xpot-mobile joined04:11
→ segher joined04:11
→ gretch joined04:11
→ krz joined04:11
→ DjSlash joined04:11
→ Chib joined04:11
→ Vampire0_ joined04:11
→ thews joined04:11
→ hynek_ joined04:11
→ captainramen joined04:11
→ _julian joined04:11
→ digitalfiz joined04:11
→ _psychic_ joined04:11
→ fruight joined04:11
→ iXeno_ joined04:11
→ eletuchy joined04:11
→ mrtazz joined04:11
→ ilteris__ joined04:11
→ Caius joined04:11
→ nazgul102 joined04:11
→ cbreak-work joined04:11
→ nd___ joined04:11
→ Amorphous joined04:11
→ Liquid-Silence joined04:11
→ toofar joined04:11
→ durarara_ joined04:11
→ cjs joined04:11
→ mlncn joined04:11
→ surfdue joined04:11
→ JeffJohnson joined04:11
→ ASIRINeiluj joined04:11
→ lindenle joined04:11
→ kenyon joined04:11
→ Tianon joined04:11
→ EugeneKay joined04:11
→ lamont joined04:11
→ cylence joined04:11
→ gerard0 joined04:11
→ rphillips joined04:11
→ TheMoonMaster joined04:11
→ wolog joined04:11
→ Dutchy joined04:11
→ LiohAu joined04:11
→ setmeaway joined04:11
→ localhost joined04:11
→ blast_hardcheese joined04:11
→ magcius joined04:11
→ Bass10 joined04:11
→ Xeross joined04:11
→ juvenal joined04:11
→ fedesilva joined04:11
→ codetroll joined04:11
→ jds joined04:11
→ mino joined04:11
→ cyphase joined04:11
→ jelmer joined04:11
→ JonasF joined04:11
→ j0ran joined04:11
→ flexd joined04:11
→ sgronblo joined04:11
→ metze joined04:11
→ tg joined04:11
→ joelpet joined04:11
→ [M]ax joined04:11
→ bluesceada joined04:11
→ Ingmar joined04:11
→ avtobiff joined04:11
→ Cerise joined04:11
→ dsop joined04:11
→ bartman joined04:11
→ Fiouz joined04:11
→ madduck joined04:11
→ AlexanderS joined04:11
→ wanders joined04:11
→ GodEater joined04:11
→ fahadsadah joined04:11
→ WAADX3X joined04:11
→ cwillu_at_work joined04:11
→ dfamorato_ joined04:11
→ joschi joined04:11
→ Lor joined04:11
→ Ksg89 joined04:11
→ iivvoo joined04:11
→ tureba joined04:11
→ Ratler joined04:11
→ unnamedwill joined04:11
→ milli joined04:11
→ hexa2k9 joined04:11
→ MacGyverNL joined04:11
→ lteo joined04:11
→ dfr|work joined04:11
→ orafu joined04:11
→ kst` joined04:11
→ urbanmonk joined04:11
→ kennethreitz joined04:11
→ SicoWork joined04:11
→ krisoijn joined04:11
→ preflex joined04:11
→ robinbowes joined04:11
→ c00kiemon5ter joined04:11
→ pragma_ joined04:11
→ elyob joined04:11
→ crashanddie joined04:11
→ aceofspades19 joined04:11
→ xxthink joined04:11
→ infid joined04:11
→ nb joined04:11
→ wereHamster joined04:11
→ jonanin joined04:11
→ armenb joined04:11
→ robinsmidsrod joined04:11
→ trodrigues joined04:11
→ cytrinox joined04:11
→ magnus_ joined04:11
→ tango_ joined04:11
→ ianmcorvidae joined04:11
→ atdiehm_home joined04:11
→ mjt joined04:11
→ Exposure joined04:11
→ ciscoftw joined04:11
→ iorec joined04:11
→ Octane joined04:11
→ tro joined04:11
→ mjessome joined04:11
→ snow_usa joined04:11
→ paissad joined04:11
→ Praise joined04:11
→ jdav_gone joined04:11
→ rclanan joined04:11
→ cherro joined04:11
→ jason237 joined04:11
→ bgy joined04:11
→ Orphis joined04:11
→ Wooga joined04:11
→ albel727 joined04:11
→ bolt joined04:11
→ slakmagik joined04:11
→ nevyn joined04:11
→ akraut joined04:11
→ AAA_awright joined04:11
→ Dreamer3 joined04:11
→ sjk joined04:11
→ ArseneRei joined04:11
→ wagle_ joined04:11
→ Aikar joined04:11
→ candybar joined04:11
→ madsy joined04:11
→ imarcusthis joined04:11
→ thinice joined04:11
→ coredumb joined04:11
→ sven^ joined04:11
→ makubi_ joined04:11
→ Bombe joined04:11
→ da5id joined04:11
→ Syniq joined04:11
→ RedMercury joined04:11
→ elliottcable joined04:11
→ TTilus joined04:11
→ tazle_ joined04:11
→ Durandle joined04:11
→ godlygeek joined04:11
→ dahl joined04:11
→ jfkw joined04:11
→ mtkd joined04:11
→ orospakr joined04:11
→ dna joined04:11
→ jefferai joined04:11
→ mitsuhiko joined04:11
→ phinze joined04:11
→ mmocny joined04:11
→ arosen joined04:11
→ q0rban joined04:11
→ qwertz_ joined04:11
→ Edulix joined04:11
→ jesk joined04:11
→ aef joined04:11
→ denysonique joined04:11
→ jrockway joined04:11
→ DroidAgent joined04:11
→ Delerius joined04:11
→ alnewkirk joined04:11
→ daleharvey joined04:11
→ NightMiles joined04:11
→ offby1 joined04:11
→ troyt joined04:11
→ thomas_b joined04:11
→ pom joined04:11
→ wolfric joined04:11
→ iff joined04:11
→ UukGoblin joined04:11
→ eno joined04:11
→ dj_tjerk| joined04:11
→ LookTJ joined04:11
→ marienz joined04:11
→ freaky[t] joined04:11
→ batrick joined04:11
→ dudicus joined04:11
→ auke- joined04:11
→ Zenopus joined04:11
→ intchanter joined04:11
→ obiwahn joined04:11
→ etcetera joined04:11
→ bnovc joined04:11
→ Davey joined04:11
→ Internet13 joined04:11
→ Caelum joined04:11
→ lorenl joined04:11
→ hal1on joined04:11
→ Grum joined04:11
→ s0undt3ch joined04:11
→ bottiger joined04:11
→ rue_ joined04:11
→ jordanm joined04:11
→ cube joined04:11
→ stfn joined04:11
→ sitaram joined04:11
→ chrizz joined04:11
→ shad joined04:11
→ ciaranm joined04:11
→ abec0 joined04:11
→ elb0w` joined04:11
→ numbah joined04:11
→ JStoker joined04:11
→ naderman joined04:11
→ deavid joined04:11
→ Orbitrix joined04:11
→ electrogeek joined04:11
→ az joined04:11
→ Nickeeh joined04:11
→ bgerber joined04:11
→ divVerent joined04:11
→ licyeus joined04:11
→ tokkee joined04:11
→ nowhereman joined04:11
→ coopsh joined04:11
→ benizi joined04:11
→ jlilly joined04:11
→ xarragon joined04:11
→ TML joined04:11
→ dnyy joined04:11
→ jab416171|Cloud joined04:11
→ agib joined04:11
→ Atlas joined04:11
→ sigmonsay joined04:11
→ reuss joined04:11
→ ktnarf joined04:11
→ Janhouse joined04:11
→ kloeri joined04:11
→ Zygo joined04:11
→ Drakevr joined04:11
→ bond` joined04:11
→ adri joined04:11
→ Cap_J_L_Picard joined04:11
→ heinrich5991 joined04:11
→ bremner joined04:11
→ LotR joined04:11
→ plopix joined04:11
→ tychoish joined04:11
→ callumacrae joined04:11
→ vlt joined04:11
→ bb-generation joined04:11
→ ska-fan joined04:11
→ tuxx- joined04:11
→ eli joined04:11
→ lu_zero joined04:11
→ youam joined04:11
→ jaeckel joined04:11
→ eMBee joined04:11
→ tmz joined04:11
→ shabble joined04:11
→ G00053 joined04:11
→ jaimef joined04:11
→ mjv joined04:11
→ IcePic joined04:11
→ koki joined04:11
→ markatto joined04:11
→ awallin_ joined04:11
→ up_the_irons joined04:11
→ Kiall joined04:11
→ ezkl joined04:11
→ consumerism joined04:11
→ rfx_ joined04:11
→ teukka joined04:11
→ crakdmirror joined04:11
→ meder joined04:11
→ ricky joined04:11
→ coffeejunk joined04:11
→ BearPerson joined04:11
→ Rhonda joined04:11
→ wcarss joined04:11
→ kokx joined04:11
→ makz- joined04:11
→ janosch joined04:11
→ mike_perdide joined04:11
→ TheFriscoFainter joined04:11
→ el2ro joined04:11
→ magnate joined04:11
→ skoop joined04:11
→ Favorit joined04:11
→ dilfridge joined04:11
→ zizzfizzix joined04:11
→ andyl joined04:11
→ MarcWeber joined04:11
→ cantoma joined04:11
→ henux joined04:11
→ coppro joined04:11
→ Rejinka joined04:11
→ cYmen joined04:11
→ xamanu_ joined04:11
→ sp3ctum_ joined04:11
→ mtx_init joined04:11
→ kflorence joined04:11
← jhford left04:12
← blast_hardcheese left04:12
→ d1b joined04:12
jmkeyes Whenever I do a typical add/commit/push to my git "origin master", followed by a "git svn rebase" and "git svn dcommit", everything works, but "git stat" shows two diverging branches and all future pushes result in non-fast-forward merges04:12
→ rhl joined04:13
jmkeyes If I force the fast forward merge, I get duplicate entries in my Git log, and if I manually try to merge them in with another rebase and the like, I get merge conflicts.04:13
AAA_awright Is git-svn pulling the new SVN commit?04:14
I think that's how it's supposed to work04:14
← voidx left04:15
→ DeviceZer0 joined04:15
→ jhford joined04:15
→ lahwran joined04:16
tango_ jhford: you never commit to origin/master04:16
jmkeyes AAA_awright: I was under the impression that git svn basically just translated what would normally be pushed to a git repository, into a series of SVN-compatible commits04:16
← boombatower left04:16
→ blast_hardcheese joined04:16
→ cmyers joined04:17
→ Heimidal joined04:17
tango_ jmkeyes: it also rebases your repository to the state it would be after the conversion TO and FROM svn04:17
so if you have also a git remote, it's a mess04:17
→ shedammit joined04:17
→ BlankVerse joined04:17
jmkeyes tango_: When i set up my git repository, I did "git remote add origin /path/to/repo04:17
tango_ and what is this remote you have?04:17
→ guufy1 joined04:17
jmkeyes I *also* have a git-svn remote that I use for an additional remote04:18
→ cjs_ joined04:18
tango_ jmkeyes: then you should never ever ever push to your git remote without a git svn rebase first04:18
jmkeyes I do a git-svn rebase, but it causes merge conflicts04:19
tango_ you have merges in your history?04:19
← d1b left04:19
tango_ git svn is not particularly good with merges on the git side04:19
→ d1b joined04:19
tango_ why do you have both a git and svn remote though?04:19
← Swimming_Bird left04:19
→ peper joined04:19
→ jspiros joined04:20
jmkeyes tango_: My coworker actively refuses Git because they've never used version control before and chose to go with SVN.04:20
→ sorin joined04:20
tango_ and the git remote?04:20
→ cytrinox_ joined04:21
jmkeyes tango_: I'm doing development from my development server, pushing to a local repository under /srv/git/project/ (which is a bare git repository, the "master" repository) and I *also* want to push the changes up to the SVN server outside of my devbox so my coworker can see and make changes04:22
← cylence left04:22
← cjs left04:22
jmkeyes I'm probably doing something *very* wrong that I shouldn't be doing, but I haven't found it yet.04:22
niloc132 jmkeyes: this should be doable, but stay off the main branch except for svn rebase and dcommit04:22
tango_ jmkeyes: the whole workflow is very worng04:22
when you have git AND svn remotes, you must always rebase to svn FIRST, because that rewrites history04:23
niloc132 rebase your topics off of the master (i.e. svn branch)04:23
tango_ THEN you can push04:23
→ frhodes joined04:23
tango_ (to the git repo)04:23
jmkeyes Ohhhhh04:23
Well that makes sense.04:23
so I've likely been breaking my local repository for a couple of days now... :s04:24
→ Tommy[D] joined04:24
← cytrinox left04:24
cytrinox_ → cytrinox04:24
tango_ the point is that git -> svn rewrites the git history to match what was managed to be pushed to svn04:24
that's why you see double commits which are not different from each other actually04:24
really, forcing your coworker to use git is the only sane thing to do here04:25
niloc132 you should be able to get back to working state by making new topic branches off of a working master and resetting them to the state you want04:25
you'll lose history though04:25
← Raging_Hog left04:25
← rclanan left04:25
→ mikeyutley joined04:26
jmkeyes tango_: Believe me, I've suggested it. We've encountered many, many problems with SVN, but sadly, explaining why those things wouldn't happen with Git only makes my coworker hold onto SVN even more.04:27
I'm "new guy" who doesn't know "how they do things here".04:28
tango_ burn the place down and look for someplace else04:28
"oops, the svn server caught fire"04:29
← kukks left04:29
← nardev left04:30
← jspiros left04:31
→ jspiros joined04:31
← frhodes left04:32
→ tewecske joined04:33
→ JoeCoolDesk joined04:33
JoeCoolDesk How do you add a previusly untracked file to a just commited commit?04:33
→ leen^| joined04:34
jmkeyes JoeCoolDesk: if you haven't pushed it anywhere else, add the file and recommit with --amend04:34
← Spyro left04:35
→ mxweas_ joined04:35
→ frhodes joined04:36
← codetroll left04:36
JoeCoolDesk How do you list the recent commits?04:36
→ Prasad joined04:36
← jspiros left04:37
→ Spyro joined04:37
← Prasad left04:37
← dreiss_ left04:38
→ orafu3m joined04:38
→ dfamorato joined04:38
← DeviceZer0 left04:40
← dfamorato_ left04:40
jmkeyes JoeCoolDesk: "git log". Try reading the manual.04:41
JoeCoolDesk I did I just haven't in a year.04:42
niloc132 from the command line you can always git help log to bring up the man page while pondering your next attempt to bend git to your will04:44
JoeCoolDesk I like Giggle, you ever use that?04:44
It's just a pain in the ass to use when working over SSH04:44
niloc132 nah, i prefer to know the command line, and make aliases for the stuff i do a lot04:44
JoeCoolDesk And Windows isn't a great setup for Webdev04:45
niloc132 git log --graph --oneline --decorate is one of my favorite sanity checks, aliased as git llog04:45
kevlarman JoeCoolDesk: why would you work over ssh with git?04:45
JoeCoolDesk Because windows isn't a great setup for web dev04:45
I don't feel like getting apache and all that configured just so just to do some local stuff04:46
jmkeyes JoeCoolDesk: fire up an apache instance and throw a cgit installation in a webroot04:46
← solussd_ left04:46
jmkeyes JoeCoolDesk: I'm in a similar situation, so I just 'mkdir /srv/git/project' and 'git init --bare /srv/git/project' and then point the cgit config to scan /srv/git for repositories04:47
← frhodes left04:47
jmkeyes An instant frontend, and it's fast and usable.04:47
JoeCoolDesk I think I also ran into some problem with htaccesses and CI and URL rewriting04:47
→ DeviceZer0 joined04:47
→ jspiros joined04:49
→ mandric joined04:49
← diegoviola left04:49
tango_ also tig is a good ncurses frontend04:50
kevlarman in those situations i tend to just throw the same distro i'm working on into a vm and use that04:52
→ bigkm joined04:52
← Wooga left04:52
← Error404NotFound left04:52
← mandric left04:53
→ minijupe joined04:57
← catsup left04:59
→ catsup joined04:59
JoeCoolDesk kevlarman, I do that too but it slows down my computer too much.05:01
→ mandric joined05:02
kevlarman yeah that's somewhat dependant on having decent hardware05:03
→ gaurangaggarwal joined05:03
← niloc132 left05:04
kevlarman although the most important thing is RAM, and that's relatively cheap/easy to upgrade even in laptops05:04
JoeCoolDesk kevlarman, I have 6GB of ram and an i705:04
kevlarman i ran a linux vm with far less05:04
→ Textmode joined05:05
← Bass10 left05:05
← jmkeyes left05:07
→ HG` joined05:11
→ diegoviola joined05:11
→ dfr|mac joined05:12
← dfr|mac left05:12
→ lorfds joined05:12
→ dfr|mac joined05:13
lorfds i need to revert to a previous commit, and then sync a remote bare repo05:13
back to that commit05:13
how do i do that?05:13
→ Error404NotFound joined05:13
lorfds i can revert my local copy05:13
← HG` left05:13
← depressed left05:13
lorfds but i cant get the remote to go back to that commit05:13
← com4 left05:14
→ depressed joined05:14
← Atlas left05:15
→ com4 joined05:15
← Xeross left05:15
frogonwheels lorfds: you need to use -f05:15
→ Daniel0108 joined05:15
→ squentin joined05:15
← simplechat left05:15
frogonwheels lorfds: wait - did you 'reset' the branch to that point - or di you just check it out?05:15
→ Atlas joined05:16
← JoeCoolDesk left05:17
→ simplechat joined05:17
→ Xeross joined05:17
lorfds git reset b7ea8a5e048cacd2ccf86acf17e5c8593dcb546b --hard\05:17
(no \...i just fat fingered that)05:17
but when i do git push remote -f05:17
it says everything up to date05:17
this is pushing to a bare repo05:17
→ haseeb joined05:17
lorfds on the server05:17
→ stodan joined05:17
frogonwheels lorfds: ;) yeah - that should leave the branch at the correct point..05:18
lorfds: ok - so what makes you say it's not correct then?05:18
lorfds but my remote doesnt update05:18
its fine locally05:18
the problem is the remote doesnt get reset to that commit05:18
← Spyro left05:19
frogonwheels lorfds: git ls-remote <remote> to confirm05:19
→ friskd joined05:19
lorfds eabd451b9f6b21badbfed4d5fb093c188437d9d705:20
i want it at b7ea8a5e048cacd2ccf86acf17e5c8593dcb546b05:20
→ kaimi joined05:20
frogonwheels git push -f {remote} {branch} .. eg git push -f origin master05:21
→ ReekenX joined05:22
← orafu3m left05:22
frogonwheels lorfds: otherwise -f might be treated as a refspec I guess.05:22
→ sebbi joined05:23
lorfds git push origin HEAD:master05:23
← caseymcg left05:24
frogonwheels lorfds: hmm.. if you've reset your local master to the correct place, then you should be able to git push -f origin master05:24
assuming it's all set up correctly.05:24
lorfds: you shouldn't need src:dest format unless you really know what you're doing.05:24
→ amine joined05:25
→ topeak joined05:25
amine Hello05:25
← Daniel0108 left05:27
amine I cloned a repository, then added a .gitignore, then did git add .gitignore, then I did git commit (which committed), and finally I tried doing git push but it says nothing changed05:27
Any idea why it is acting that way?05:27
→ dexter_e joined05:27
frogonwheels amine: what branch are you on? and what does git branch -a give you?05:29
amine It gives me * master and I should be on the main branch05:30
→ Guest59371 joined05:30
→ caseymcg joined05:30
→ LouisJB joined05:30
frogonwheels amine: ok - and does it show remotes/origin/master in git branch -r ?05:30
amine No, it shows nothing05:31
→ dreiss_ joined05:31
← xpot-mobile left05:31
frogonwheels amine: um ok - what about git remote ??05:32
amine It shows 'origin'05:32
frogonwheels amine: what kind of clone did you do?05:32
amine I don't know how to answer that05:32
frogonwheels git clone <url> ??05:32
amine I just did git clone http://*05:32
frogonwheels amine: right - you don't generally push to a http:// remote -wasn't aware you could actually05:33
milki uh huh, smart http05:33
amine hmm I recall pushing to my other repository which is also http05:34
← BlankVerse left05:34
frogonwheels milki: I assumed that if you could, then it would be smart http05:34
← Guest59371 left05:34
milki ah05:34
frogonwheels question is why you don't have the remote branches!?05:34
amine: ^^05:34
→ ehsan joined05:35
milki ya thats weird05:35
amine I'm not sure05:35
→ Wooga joined05:35
milki try cloning again05:35
amine okay, one sec05:35
It says 'warning: You appear to have cloned an empty repository' when I clone05:36
frogonwheels amine: So it's the first time you've cloned it? nobody's pushed anything to it yet?05:36
amine Nobody pushed anything to it yet05:37
frogonwheels amine: you have to specify a branch05:37
← bgerber left05:37
frogonwheels amine: git push origin master05:37
← kerrick left05:37
frogonwheels amine: otherwise you'd be pushing up your local working branches by accident all the time.05:37
amine I don't understand05:38
git push origin master will do what exactly?05:38
→ fisted joined05:38
frogonwheels amine: git push origin will only push branches corresponding to those in refs/remotes/origin/*05:38
amine: git push origin master will push your master branch up to the 'origin' remote.05:39
amine: which is very likely what you wnt to do.05:39
assuming you've committed something of course.05:39
→ Guest59371 joined05:39
amine can you link me to documentation on these brances?05:39
← bigkm left05:40
frogonwheels amine: hm.m. you proabbly want to go through some tutorials. there are some good video ones, or just look on http://git-scm.com/Documentation iirc05:40
← dreiss_ left05:40
frogonwheels amine: the git for computer scientists one is pretty good..05:40
→ beautifulmind joined05:40
frogonwheels as is git from bottom up http://ftp.newartisans.com/pub/git.from.bottom.up.pdf05:40
amine I'll do that, thanks05:40
frogonwheels amine: git takes a bit of getting your head around, but well worth it imho05:41
→ orafu3m joined05:42
→ f00li5h joined05:42
← orafu3m left05:43
wereHamster !book05:43
jast *automatic message* 'Pro Git' is a complete book about git that is available online for free: http://progit.org/book/05:43
wereHamster amine: ^^^05:44
→ orafu3m joined05:44
← orafu3m left05:44
← mandric left05:45
← Heimidal left05:45
lorfds this is driving me nuts05:45
if i reset my HEAD to a specific sha tag05:46
and have a remote05:46
how do i push that commit to the remote?05:46
milki well, you arent pushing a commit since its there05:47
you want to revert the HEAD for a remote branch05:47
im not sure how either...05:48
← mxweas_ left05:48
frogonwheels lorfds: You reset your master branch to a specific sha tag (your HEAD is just where you're checked out)05:48
as in that's what you did.05:48
wereHamster lorfds: what happens if you do git push?05:48
lorfds right...how do i force my remote to go back to that commit?05:49
frogonwheels lorfds: now why don't you show us a pastebin of git branch -rv and git remote and then show us what you've tried05:49
lorfds it says everything is up to date05:49
frogonwheels pastebin the exact commands you are using.05:49
milki http://stackoverflow.com/questions/1270514/undoing-a-git-push05:49
try that?05:49
wereHamster lorfds: you probably have to explicitly tell git which branch to push where05:49
frogonwheels wereHamster: shouldn't have to. he should just be updating the local master and force-pushing itup.05:49
lorfds: ^^05:50
← _psychic_ left05:50
milki lofds tried that05:50
stackoverflow says: git push -f origin cc4b63bebb6:alpha-0.3.005:50
wereHamster frogonwheels: exactly. Assuming he's on master and not detached head or some other branch05:50
frogonwheels noo.. shouldn't need to do that.05:50
milki specifify both the branch and the commit reference05:50
o.O05:50
→ iband joined05:51
← iband left05:51
frogonwheels wereHamster: hence my request for the pastebin info.05:52
→ iband joined05:52
lorfds http://pastebin.com/g3hvaxfH05:52
here's where i'm at (git branch -rv)05:52
I want to reset origin/master to a specific sha tag05:53
← iband left05:53
lorfds but more importantly, i want hgprod to be reset to a specific sha tag05:53
wereHamster checkout masetr, reset to whatever sha you want, push05:53
frogonwheels lorfds: oh damn.. I menat -av .. can you do a git branch -v as well?05:53
→ TomyLobo joined05:53
frogonwheels lorfds: what is your current branch?05:54
→ iband joined05:54
frogonwheels lorfds: oh - and different to origin/master ??05:54
← mysphyt left05:54
← ReekenX left05:55
→ codetroll joined05:56
→ Guest17393 joined05:56
← iband left05:56
→ iband joined05:56
← Guest59371 left05:56
lorfds if i revert a change05:56
← caseymcg left05:57
frogonwheels lorfds: Generally if you're going to have branches pointing to different places in different remotes, then you should have different names for then.05:57
lorfds i want them all pointing at the same place05:57
there is one remote I pasted (web), where i stopped pushing to it05:57
frogonwheels lorfds: right - ok - give me git branch -v05:57
lorfds so it isnt in sunch05:57
→ dfr|mac_ joined05:58
lorfds http://pastebin.com/5qvfHweA05:58
frogonwheels lorfds: lol. ok you're head's detached05:59
lorfds so what do i do05:59
besides shooting myself05:59
frogonwheels lorfds: ok - we first need to know if you've committed stuff to your detached head..06:00
lorfds how do i figure that out06:01
cjs_ That's a slightly surreal comment.06:01
cjs_ → cjs06:01
frogonwheels lorfds: git reflog will tell you I guess06:01
lorfds: browse it with gitk :)06:01
← dfr|mac left06:01
← minijupe left06:01
lorfds http://pastie.org/261526406:01
frogonwheels cjs: it may sound surreal, but in git context it is quite logical ;)06:01
cjs frogonwheels: Perhap's that's what makes git so enjoyable. :-)06:02
frogonwheels lorfds: ok you've only got that revert - I'm not sure that's what you meant.06:03
→ dreiss_ joined06:03
frogonwheels lorfds: you can git tag tmp just in case06:03
→ aminpy joined06:04
frogonwheels lorfds: then git checkout master && git reset --hard {Sha1 you want}06:04
ie git reset --hard b7ea8a5e048cac06:05
lorfds: that will reset master to point to b7ea8a5e048cac06:05
lorfds: then you git push -f <remote> master06:05
which is presumably push -f hgprod master06:06
→ diegovio1a joined06:07
← diegovio1a left06:07
diegoviola → Guest8569906:08
lorfds awesome that worked06:08
thanks guys06:08
frogonwheels lorfds: of course it did ;P no probs.06:08
→ mxweas_ joined06:08
← Guest85699 left06:08
← mxweas_ left06:08
→ ehsan_ joined06:09
← ehsan left06:09
→ nicoulaj joined06:09
→ iXeno joined06:11
→ OOPMan joined06:12
→ phreaknerd joined06:12
← bgy left06:13
→ kadoban joined06:13
← iXeno_ left06:14
→ papegaaij joined06:16
← sorin left06:17
← ehsan_ left06:17
→ ehsan joined06:18
← LiohAu left06:18
← dfr|mac_ left06:18
← gaurangaggarwal left06:18
→ gaurangaggarwal joined06:18
→ boombatower joined06:20
→ mgtsol joined06:20
← tewecske left06:20
← ehsan left06:22
→ ehsan joined06:22
→ MichealH joined06:23
→ caseymcg joined06:23
← mgtsol left06:24
← mikeyutley left06:24
→ shruggar joined06:25
← ehsan left06:25
← ymasory left06:26
→ ehsan joined06:26
← macmartine left06:29
→ mikeyutley joined06:31
← LouisJB left06:32
← ehsan left06:32
→ ehsan joined06:33
→ swombat joined06:33
← swombat left06:34
→ macmartine joined06:34
← shruggar left06:35
← ehsan left06:36
→ ehsan joined06:37
← gaurangaggarwal left06:37
→ bgy joined06:37
← macmartine left06:37
→ ccushing joined06:39
← ehsan left06:39
→ macmartine joined06:39
→ ehsan joined06:39
→ airborn joined06:41
→ Spyro joined06:42
← ehsan left06:42
→ ehsan joined06:42
← ehsan left06:42
← macmartine left06:42
← mikeyutley left06:43
→ ehsan joined06:43
← friskd left06:44
← haseeb left06:45
← d0k left06:45
→ mishok13 joined06:47
← ehsan left06:47
→ ehsan joined06:47
→ thannoy joined06:48
← ehsan left06:48
→ ehsan joined06:48
→ ehsan_ joined06:50
← ehsan left06:50
← wagle_ left06:50
→ mxweas_ joined06:51
→ toabctl joined06:51
→ babbage joined06:51
→ dorisabayon joined06:51
→ flijten joined06:53
← OOPMan left06:54
← Fandekasp left06:54
→ OOPMan joined06:54
→ wagle joined06:55
← lorfds left06:56
→ superdmp joined06:57
→ lorfds joined06:57
← paissad left06:59
→ Sitethief joined06:59
→ ngulden joined06:59
← thursday left06:59
→ Alvo joined07:01
← OOPMan left07:02
→ _pingu joined07:05
→ soc42 joined07:05
← _pingu left07:07
← mxweas_ left07:10
← DroidAgent left07:10
← Chib left07:11
→ berserkr joined07:12
→ eijk joined07:14
→ Prasad joined07:17
→ mxweas_ joined07:18
→ opalka joined07:20
→ psoo joined07:22
→ dc5ala joined07:23
→ drev1 joined07:24
← drev1 left07:24
→ BiggFREE joined07:25
← jdong_ left07:29
→ shurane joined07:29
← guufy1 left07:29
→ swombat joined07:29
← dc5ala left07:29
→ Squarism joined07:30
→ dawkirst joined07:31
← caseymcg left07:34
← Error404NotFound left07:34
→ giallu joined07:36
→ johnathanb joined07:36
→ berserkr1 joined07:37
← berserkr left07:38
→ nd__ joined07:38
→ dc5ala joined07:39
← ngulden left07:39
→ cjs_ joined07:40
→ ngulden joined07:40
→ _kud joined07:41
← nd___ left07:41
← cjs left07:42
iband → iband|away07:43
← axl_ left07:44
→ ph^ joined07:45
→ OOPMan joined07:45
→ denjerec joined07:46
← dawkirst left07:49
→ dominiq joined07:50
→ Error404NotFound joined07:50
→ whitman joined07:51
→ ayanes joined07:53
← Samoi left07:55
→ Samoi joined07:55
← BiggFREE left07:56
→ ziro` joined07:58
iband|away → iband07:59
→ alecat joined07:59
→ EM03 joined08:00
← EM03 left08:00
→ EM03 joined08:00
→ Phylock joined08:00
→ davzie joined08:01
← codetroll left08:02
← Samoi left08:02
→ Samoi joined08:02
← Samoi left08:02
→ Samoi joined08:02
→ afief joined08:04
→ robotmay joined08:06
→ SmartViking joined08:06
→ guardian1 joined08:07
guardian1 → guardian08:08
guardian hello08:08
SmartViking Hi. I don't really understand git. I created a site using github pages, and it's in another "branch" in my project thing, I don't know really what that means. But if I have a file in my master branch, and I also want to have that same file in the gh-pages branch, how can I have that without updating the gh-pages file each time it's updated in the master branch?08:08
→ shruggar joined08:08
guardian is there a way to something equivalent to git log —stat on a merge commit? a merge commit introduced back files in the repo and i would like to double check what that merge brought in08:08
_ikke_ guardian: Why doesn't git log stat just work?08:09
SmartViking _ikke_: Norwegian?08:09
guardian _ikke_: git log —stat sha1 doesn't show any file change for the commit "merge branch 'blah'" for some reason08:10
_ikke_ SmartViking: Nope08:11
SmartViking: It's also a dutch word08:11
SmartViking SmartViking: Ah, ok, germans are almost vikings in my eyes so that's ok :)08:12
→ rclanan joined08:12
→ PigeonFriend joined08:12
← Alvo left08:14
← beautifulmind left08:15
→ thiago joined08:15
→ RichardBronosky joined08:15
← TheMoonMaster left08:16
→ retoryter joined08:16
← mxweas_ left08:17
← denjerec left08:17
→ BlankVerse joined08:17
→ toxico joined08:21
← LongBeach left08:21
← flijten left08:22
← fisted left08:22
← boombatower left08:22
← OOPMan left08:22
← ehsan_ left08:22
← kimico left08:22
← Guest17393 left08:22
← todun left08:22
→ Alien_Freak joined08:23
← afief left08:23
← dominiq left08:23
← baburdick left08:23
← knuckolls_ left08:23
← hobodave left08:23
← retoryter left08:23
← Error404NotFound left08:23
→ Guest54849 joined08:23
→ crass joined08:24
→ retoryter joined08:25
→ caseymcg joined08:25
→ ehsan joined08:28
← BlankVerse left08:28
← Samoi left08:28
← alecat left08:28
← johnathanb left08:28
← psoo left08:28
← dorisabayon left08:28
← TomyLobo left08:28
← jspiros left08:28
← chrisf left08:28
← NfNitLoop left08:28
← cooloney left08:28
← envi left08:28
← ptl left08:28
← gretch left08:28
← thews left08:28
← _julian left08:28
← digitalfiz left08:28
← eletuchy left08:28
← Amorphous left08:28
← Liquid-Silence left08:28
← JeffJohnson left08:28
← ASIRINeiluj left08:28
← kenyon left08:28
← Tianon left08:28
← EugeneKay left08:28
← mino left08:28
← jelmer left08:28
← j0ran left08:28
← urbanmonk left08:28
← kst` left08:28
← orafu left08:28
← lteo left08:28
← MacGyverNL left08:28
← hexa2k9 left08:28
← milli left08:28
← unnamedwill left08:28
← Ratler left08:28
← tureba left08:28
← iivvoo left08:28
← Ksg89 left08:28
← Lor left08:28
← joschi left08:28
← cwillu_at_work left08:28
← fahadsadah left08:28
← GodEater left08:28
← wanders left08:28
← AlexanderS left08:28
← Fiouz left08:28
← madduck left08:28
← bartman left08:28
← dfr|work left08:28
← dsop left08:28
← Cerise left08:28
← avtobiff left08:28
← Ingmar left08:28
← bluesceada left08:28
← joelpet left08:28
← [M]ax left08:28
← tg left08:28
← metze left08:28
← RichardBronosky left08:28
← giallu left08:28
← phreaknerd left08:28
← dexter_e left08:28
← kenperkins left08:28
← spatulasnout left08:28
← Caius left08:28
← mlncn left08:28
← juvenal left08:28
← jds left08:28
← cyphase left08:28
← sgronblo left08:28
← SicoWork left08:28
← crashanddie left08:28
← infid left08:28
← wereHamster left08:28
← trodrigues left08:28
← tango_ left08:28
← Octane left08:28
← Orphis left08:28
← slakmagik left08:28
← AAA_awright left08:28
← sven^ left08:28
← Bombe left08:28
← da5id left08:28
← TTilus left08:28
← jefferai left08:28
← aef left08:28
← iff left08:28
← eno left08:28
← dj_tjerk| left08:28
← etcetera left08:28
← bnovc left08:28
← s0undt3ch left08:28
← hal1on left08:28
← Grum left08:28
← shruggar left08:28
← Squarism left08:28
← wagle left08:28
← bgy left08:28
← papegaaij left08:28
← iband left08:28
← squentin left08:28
← jhford left08:28
← kurtzhong left08:28
← Modius left08:28
← kanru left08:28
← krz left08:28
← DjSlash left08:28
← gerard0 left08:28
← rphillips left08:28
← magcius left08:28
← robinbowes left08:28
← pragma_ left08:28
← nb left08:28
← armenb left08:28
← ianmcorvidae left08:28
← mjt left08:28
← snow_usa left08:28
← Praise left08:28
← sjk left08:28
← Dutchy left08:28
← phinze left08:28
← jrockway left08:28
← troyt left08:28
← electrogeek left08:28
← Nickeeh left08:28
← az left08:28
← ktnarf left08:28
← Zygo left08:28
← Kiall left08:28
← reuss left08:28
← licyeus left08:28
← mmocny left08:28
← up_the_irons left08:28
← awallin_ left08:28
← markatto left08:28
← koki left08:28
← IcePic left08:28
← mjv left08:28
← G00053 left08:28
← shabble left08:28
← tmz left08:28
← jaimef left08:28
← eMBee left08:28
← auke- left08:28
← jaeckel left08:28
← lu_zero left08:28
← eli left08:28
← tuxx- left08:28
← ska-fan left08:28
← bb-generation left08:28
← vlt left08:28
← tychoish left08:28
← plopix left08:28
← LotR left08:28
← callumacrae left08:28
← youam left08:28
← bremner left08:28
← heinrich5991 left08:28
← Cap_J_L_Picard left08:28
← xarragon left08:28
← adri left08:28
← bond` left08:28
← Drakevr left08:28
← EM03 left08:28
← whitman left08:28
← ph^ left08:28
← nd__ left08:28
← berserkr1 left08:28
← hynek_ left08:28
← fruight left08:28
← mrtazz left08:28
← cbreak-work left08:28
← JonasF left08:28
← kennethreitz left08:28
← preflex left08:28
← atdiehm_home left08:28
← nevyn left08:28
← akraut left08:28
← madsy left08:28
← Syniq left08:28
← Durandle left08:28
← dna left08:28
← q0rban left08:28
← qwertz_ left08:28
← denysonique left08:28
← wolfric left08:29
← Internet13 left08:29
← bottiger left08:29
← stfn left08:29
← chrizz left08:29
← shad left08:29
← elb0w` left08:29
← ArseneRei left08:29
← Orbitrix left08:29
← divVerent left08:29
← benizi left08:29
← ngulden left08:29
← Sitethief left08:29
← airborn left08:29
← amine left08:29
← Xeross left08:29
← catsup left08:29
← nazgul102 left08:29
← localhost left08:29
← xxthink left08:29
← robinsmidsrod left08:29
← Exposure left08:29
← albel727 left08:29
← tazle_ left08:29
← wolog left08:29
← ciscoftw left08:29
← iorec left08:29
← arosen left08:29
← offby1 left08:29
← freaky[t] left08:29
← batrick left08:29
← dudicus left08:29
← Davey left08:29
← rue_ left08:29
← ciaranm left08:29
← numbah left08:29
← tokkee left08:29
← nowhereman left08:29
← jlilly left08:29
← ayanes left08:29
← lorfds left08:29
← Spyro left08:29
← kadoban left08:29
← com4 left08:29
← Vampire0_ left08:29
← toofar left08:29
← lindenle left08:29
← lamont left08:29
← setmeaway left08:29
← flexd left08:29
← krisoijn left08:29
← c00kiemon5ter left08:29
← captainramen left08:29
← jdav_gone left08:29
← cherro left08:29
← jason237 left08:29
← candybar left08:29
← imarcusthis left08:29
← coredumb left08:29
← elliottcable left08:29
← dahl left08:29
← jfkw left08:29
← orospakr left08:29
← mitsuhiko left08:29
← jesk left08:29
← Delerius left08:29
← alnewkirk left08:29
← NightMiles left08:29
← thomas_b left08:29
← pom left08:29
← UukGoblin left08:29
← LookTJ left08:29
← marienz left08:29
← Zenopus left08:29
← intchanter left08:29
← Caelum left08:29
← lorenl left08:29
← jordanm left08:29
← cube left08:29
← sitaram left08:29
← godlygeek left08:29
← abec0 left08:29
← JStoker left08:29
← naderman left08:29
← deavid left08:29
← daleharvey left08:29
← coopsh left08:29
← ezkl left08:29
← guardian left08:29
← dc5ala left08:29
← subbyyy left08:29
← segher left08:29
← ilteris__ left08:29
← durarara_ left08:29
← surfdue left08:29
← fedesilva left08:29
← elyob left08:29
← aceofspades19 left08:29
← jonanin left08:29
← magnus_ left08:29
← tro left08:29
← mjessome left08:29
← bolt left08:29
← Dreamer3 left08:29
← thinice left08:29
← makubi_ left08:29
← RedMercury left08:29
← mtkd left08:29
← TML left08:29
← dnyy left08:29
← jab416171|Cloud left08:29
← agib left08:29
← Janhouse left08:29
← kloeri left08:29
← Edulix left08:29
← sp3ctum_ left08:29
← xamanu_ left08:29
← cYmen left08:29
← Rejinka left08:29
← coppro left08:29
← cantoma left08:29
← andyl left08:29
← zizzfizzix left08:29
← dilfridge left08:29
← obiwahn left08:29
← skoop left08:29
← el2ro left08:29
← TheFriscoFainter left08:29
← mike_perdide left08:29
← janosch left08:29
← makz- left08:29
← Aikar left08:29
← BearPerson left08:29
← Rhonda left08:29
← kokx left08:29
← wcarss left08:29
← coffeejunk left08:29
← ricky left08:29
← Favorit left08:29
← meder left08:29
← crakdmirror left08:29
← MarcWeber left08:29
← teukka left08:29
← magnate left08:29
← henux left08:29
← rfx_ left08:29
← sigmonsay left08:29
← consumerism left08:29
← PigeonFriend left08:29
← _kud left08:29
← thannoy left08:29
← cytrinox left08:29
← mtx_init left08:29
← zheng left08:29
← Pupeno left08:29
← shadowmaster left08:29
← unreal left08:29
← Kicer86 left08:29
← ivank_ left08:29
← spearce left08:29
← lacrymology left08:29
← werdan7 left08:29
← JackWinter left08:29
← alanp left08:29
← odin_ left08:29
← robotmay left08:29
← Phylock left08:29
← eijk left08:29
← mishok13 left08:29
← iXeno left08:29
← dfamorato left08:29
← jcromartie left08:29
← zoran119 left08:29
← replore_ left08:29
← oc80z left08:29
← jmcantrell left08:29
← madewokherd left08:29
← stamina left08:29
← SmartViking left08:29
← ziro` left08:29
← Prasad left08:29
← aminpy left08:29
← Atlas left08:29
← depressed left08:29
← DeviceZer0 left08:29
← blast_hardcheese left08:29
← lahwran left08:29
← unforgiven512 left08:29
← ping-pong left08:29
← shiba_yu36 left08:29
← Targen left08:29
← alexs left08:29
← hyperair left08:29
← kermit left08:29
← dang`r`us left08:29
← cbeams left08:29
← fpcfan left08:29
← rclanan left08:29
← cjs_ left08:29
← opalka left08:29
← soc42 left08:29
← superdmp left08:29
← babbage left08:29
← ccushing left08:29
← dreiss_ left08:29
← topeak left08:29
← kaimi left08:29
← stodan left08:29
← leen^| left08:29
← Tommy[D] left08:29
← kodie left08:29
← zodiak left08:29
← chuck left08:29
← the_cybersphinx left08:29
← flamingspinach left08:29
← kmc left08:29
← dv310p3r left08:29
← asakura left08:29
← ldlework left08:29
← demi` left08:29
→ rue joined08:30
→ grekko joined08:30
→ Weiss joined08:35
→ Error404NotFound joined08:35
→ dermoth_ joined08:37
→ angelsl joined08:38
← davzie left08:39
→ OOPMan joined08:39
→ Lisimba2 joined08:39
→ DarkAR joined08:39
→ stealthii joined08:39
→ hyperboreean joined08:39
→ bushwakko joined08:39
→ cods joined08:39
→ siprbaum joined08:39
→ capncodewash joined08:39
→ mediaslave joined08:39
→ shachaf joined08:39
→ joshteam1 joined08:39
→ macmaN_ joined08:39
→ aminpy_ joined08:39
→ sp3001 joined08:39
→ likewhoa- joined08:39
→ fasta_ joined08:39
→ teuf_ joined08:39
→ tty234_ joined08:39
→ aceofspades19 joined08:39
→ karihre_ joined08:39
→ tvw joined08:39
→ masterhumper joined08:39
→ jbalint_ joined08:39
→ nano-_ joined08:39
→ cbz_ joined08:39
→ bwidmer_ joined08:39
→ moqq_ joined08:39
→ spacebat_ joined08:39
→ cmn_ joined08:39
→ lericson_ joined08:39
→ mcfedr joined08:39
→ johnhill_ joined08:39
→ fr| joined08:39
→ alphagod joined08:39
→ prot0n_ joined08:39
→ jargon- joined08:39
→ hobodave_ joined08:39
→ sdjayna1 joined08:39
→ CannedCo_ joined08:39
→ RichardBronosky joined08:39
→ PigeonFriend joined08:39
→ guardian joined08:39
→ SmartViking joined08:39
→ robotmay joined08:39
→ Samoi joined08:39
→ Phylock joined08:39
→ EM03 joined08:39
→ alecat joined08:39
→ ayanes joined08:39
→ whitman joined08:39
→ ph^ joined08:39
→ _kud joined08:39
→ ngulden joined08:39
→ dc5ala joined08:39
→ nd__ joined08:39
→ berserkr1 joined08:39
→ johnathanb joined08:39
→ giallu joined08:39
→ Squarism joined08:39
→ psoo joined08:39
→ Sitethief joined08:39
→ lorfds joined08:39
→ wagle joined08:39
→ dorisabayon joined08:39
→ thannoy joined08:39
→ mishok13 joined08:39
→ Spyro joined08:39
→ airborn joined08:39
→ bgy joined08:39
→ papegaaij joined08:39
→ phreaknerd joined08:39
→ iXeno joined08:39
→ iband joined08:39
→ TomyLobo joined08:39
→ dexter_e joined08:39
→ amine joined08:39
→ Xeross joined08:39
→ squentin joined08:39
→ com4 joined08:39
→ catsup joined08:39
→ jspiros joined08:39
→ dfamorato joined08:39
→ cytrinox joined08:39
→ jhford joined08:39
→ mtx_init joined08:39
→ jstemmer joined08:39
→ Kulrak joined08:39
→ heph joined08:39
→ helgikrs joined08:39
→ rm-rf joined08:39
→ zorzar joined08:39
→ ch077179 joined08:39
→ ew0 joined08:39
→ jcarouth joined08:39
→ balor joined08:39
→ keller joined08:39
→ AstralStorm joined08:39
→ architekt joined08:39
→ Mizar-jp joined08:39
→ saurik joined08:39
→ KRF joined08:39
→ piquadrat joined08:39
→ davidboy joined08:39
→ fujin joined08:39
→ cesario joined08:39
→ IanWizard-Cloud joined08:39
→ tfnico joined08:39
→ eregon joined08:39
→ piti joined08:39
→ Stravy joined08:39
→ majoh joined08:39
→ rook2paw1 joined08:39
→ charon joined08:39
→ ndim joined08:39
→ harv joined08:39
→ theoros joined08:39
→ thoraxe joined08:39
→ Gizmokid2005 joined08:39
→ neuro_damage joined08:39
→ mjsilva joined08:39
→ arnoldB joined08:39
→ rjbs joined08:39
→ ttvd joined08:39
→ catphish joined08:39
→ JEEB joined08:39
→ stamina joined08:39
→ madewokherd joined08:39
→ jmcantrell joined08:39
→ Kicer86 joined08:39
→ ivank_ joined08:39
→ spearce joined08:39
→ lacrymology joined08:39
→ werdan7 joined08:39
→ JackWinter joined08:39
→ alanp joined08:39
→ NAAAMEZ joined08:39
→ odin_ joined08:39
→ unreal joined08:39
→ shadowmaster joined08:39
→ oc80z joined08:39
→ Pupeno joined08:39
→ replore_ joined08:39
→ zoran119 joined08:39
→ jcromartie joined08:39
→ zheng joined08:39
→ chrisf joined08:39
→ NfNitLoop joined08:39
→ cooloney joined08:39
→ kurtzhong joined08:39
→ kenperkins joined08:39
→ envi joined08:39
→ ptl joined08:39
→ spatulasnout joined08:39
→ Modius joined08:39
→ kanru joined08:39
→ subbyyy joined08:39
→ segher joined08:39
→ gretch joined08:39
→ krz joined08:39
→ DjSlash joined08:39
→ Vampire0_ joined08:39
→ thews joined08:39
→ hynek_ joined08:39
→ captainramen joined08:39
→ _julian joined08:39
→ digitalfiz joined08:39
→ fruight joined08:39
→ eletuchy joined08:39
→ mrtazz joined08:39
→ ilteris__ joined08:39
→ Caius joined08:39
→ nazgul102 joined08:39
→ cbreak-work joined08:39
→ Amorphous joined08:39
→ Liquid-Silence joined08:39
→ toofar joined08:39
→ durarara_ joined08:39
→ mlncn joined08:39
→ surfdue joined08:39
→ JeffJohnson joined08:39
→ ASIRINeiluj joined08:39
→ lindenle joined08:39
→ kenyon joined08:39
→ Tianon joined08:39
→ EugeneKay joined08:39
→ lamont joined08:39
→ gerard0 joined08:39
→ rphillips joined08:39
→ wolog joined08:39
→ Dutchy joined08:39
→ setmeaway joined08:39
→ localhost joined08:39
→ magcius joined08:39
→ juvenal joined08:39
→ fedesilva joined08:39
→ jds joined08:39
→ mino joined08:39
→ cyphase joined08:39
→ jelmer joined08:39
→ JonasF joined08:39
→ j0ran joined08:39
→ flexd joined08:39
→ sgronblo joined08:39
→ metze joined08:39
→ tg joined08:39
→ joelpet joined08:39
→ [M]ax joined08:39
→ bluesceada joined08:39
→ Ingmar joined08:39
→ avtobiff joined08:39
→ Cerise joined08:39
→ dsop joined08:39
→ bartman joined08:39
→ Fiouz joined08:39
→ madduck joined08:39
→ AlexanderS joined08:39
→ wanders joined08:39
→ GodEater joined08:39
→ fahadsadah joined08:39
→ WAADX3X joined08:39
→ cwillu_at_work joined08:39
→ joschi joined08:39
→ Lor joined08:39
→ Ksg89 joined08:39
→ iivvoo joined08:39
→ tureba joined08:39
→ Ratler joined08:39
→ unnamedwill joined08:39
→ milli joined08:39
→ hexa2k9 joined08:39
→ MacGyverNL joined08:39
→ lteo joined08:39
→ dfr|work joined08:39
→ orafu joined08:39
→ kst` joined08:39
→ urbanmonk joined08:39
→ kennethreitz joined08:39
→ SicoWork joined08:39
→ krisoijn joined08:39
→ preflex joined08:39
→ robinbowes joined08:39
→ c00kiemon5ter joined08:39
→ pragma_ joined08:39
→ elyob joined08:39
→ crashanddie joined08:39
→ xxthink joined08:39
→ infid joined08:39
→ nb joined08:39
→ wereHamster joined08:39
→ jonanin joined08:39
→ armenb joined08:39
→ robinsmidsrod joined08:39
→ trodrigues joined08:39
→ magnus_ joined08:39
→ tango_ joined08:39
→ ianmcorvidae joined08:39
→ atdiehm_home joined08:39
→ mjt joined08:39
→ Exposure joined08:39
→ ciscoftw joined08:39
→ iorec joined08:39
→ Octane joined08:39
→ tro joined08:39
→ mjessome joined08:39
→ snow_usa joined08:39
→ Praise joined08:39
→ jdav_gone joined08:39
→ cherro joined08:39
→ jason237 joined08:39
→ Orphis joined08:39
→ albel727 joined08:39
→ bolt joined08:39
→ slakmagik joined08:39
→ nevyn joined08:39
→ akraut joined08:39
→ AAA_awright joined08:39
→ Dreamer3 joined08:39
→ sjk joined08:39
→ ArseneRei joined08:39
→ Aikar joined08:39
→ candybar joined08:39
→ madsy joined08:39
→ imarcusthis joined08:39
→ thinice joined08:39
→ coredumb joined08:39
→ sven^ joined08:39
→ makubi_ joined08:39
→ Bombe joined08:39
→ da5id joined08:39
→ Syniq joined08:39
→ RedMercury joined08:39
→ elliottcable joined08:39
→ TTilus joined08:39
→ tazle_ joined08:39
→ Durandle joined08:39
→ godlygeek joined08:39
→ dahl joined08:39
→ jfkw joined08:39
→ mtkd joined08:39
→ orospakr joined08:39
→ dna joined08:39
→ jefferai joined08:39
→ mitsuhiko joined08:39
→ phinze joined08:39
→ mmocny joined08:39
→ arosen joined08:39
→ q0rban joined08:39
→ qwertz_ joined08:39
→ Edulix joined08:39
→ jesk joined08:39
→ aef joined08:39
→ denysonique joined08:39
→ jrockway joined08:39
→ Delerius joined08:39
→ alnewkirk joined08:39
→ daleharvey joined08:39
→ NightMiles joined08:39
→ offby1 joined08:39
→ troyt joined08:39
→ thomas_b joined08:39
→ pom joined08:39
→ wolfric joined08:39
→ iff joined08:39
→ UukGoblin joined08:39
→ eno joined08:39
→ dj_tjerk| joined08:39
→ LookTJ joined08:39
→ marienz joined08:39
→ freaky[t] joined08:39
→ batrick joined08:39
→ dudicus joined08:39
→ auke- joined08:39
→ Zenopus joined08:39
→ intchanter joined08:39
→ obiwahn joined08:39
→ etcetera joined08:39
→ bnovc joined08:39
→ Davey joined08:39
→ Internet13 joined08:39
→ Caelum joined08:39
→ lorenl joined08:39
→ hal1on joined08:39
→ Grum joined08:39
→ s0undt3ch joined08:39
→ bottiger joined08:39
→ rue_ joined08:39
→ jordanm joined08:39
→ cube joined08:39
→ stfn joined08:39
→ sitaram joined08:39
→ chrizz joined08:39
→ shad joined08:39
→ ciaranm joined08:39
→ abec0 joined08:39
→ elb0w` joined08:39
→ numbah joined08:39
→ JStoker joined08:39
→ naderman joined08:39
→ deavid joined08:39
→ Orbitrix joined08:39
→ electrogeek joined08:39
→ az joined08:39
→ Nickeeh joined08:39
→ divVerent joined08:39
→ licyeus joined08:39
→ tokkee joined08:39
→ nowhereman joined08:39
→ coopsh joined08:39
→ benizi joined08:39
→ jlilly joined08:39
→ xarragon joined08:39
→ TML joined08:39
→ dnyy joined08:39
→ jab416171|Cloud joined08:39
→ agib joined08:39
→ sigmonsay joined08:39
→ reuss joined08:39
→ ktnarf joined08:39
→ Janhouse joined08:39
→ kloeri joined08:39
→ Zygo joined08:39
→ Drakevr joined08:39
→ bond` joined08:39
→ adri joined08:39
→ Cap_J_L_Picard joined08:39
→ heinrich5991 joined08:39
→ bremner joined08:39
→ LotR joined08:39
→ plopix joined08:39
→ tychoish joined08:39
→ callumacrae joined08:39
→ vlt joined08:39
→ bb-generation joined08:39
→ ska-fan joined08:39
→ tuxx- joined08:39
→ eli joined08:39
→ lu_zero joined08:39
→ youam joined08:39
→ jaeckel joined08:39
→ eMBee joined08:39
→ tmz joined08:39
→ shabble joined08:39
→ G00053 joined08:39
→ jaimef joined08:39
→ mjv joined08:39
→ IcePic joined08:39
→ koki joined08:39
→ markatto joined08:39
→ awallin_ joined08:39
→ up_the_irons joined08:39
→ Kiall joined08:39
→ ezkl joined08:39
→ consumerism joined08:39
→ rfx_ joined08:39
→ teukka joined08:39
→ crakdmirror joined08:39
→ meder joined08:39
→ ricky joined08:39
→ coffeejunk joined08:39
→ BearPerson joined08:39
→ Rhonda joined08:39
→ wcarss joined08:39
→ kokx joined08:39
→ makz- joined08:39
→ janosch joined08:39
→ mike_perdide joined08:39
→ TheFriscoFainter joined08:39
→ el2ro joined08:39
→ magnate joined08:39
→ skoop joined08:39
→ Favorit joined08:39
→ dilfridge joined08:39
→ zizzfizzix joined08:39
→ andyl joined08:39
→ MarcWeber joined08:39
→ cantoma joined08:39
→ henux joined08:39
→ coppro joined08:39
→ Rejinka joined08:39
→ cYmen joined08:39
→ xamanu_ joined08:39
→ sp3ctum_ joined08:39
→ davzie joined08:40
→ bburhans joined08:40
→ kd35a joined08:40
→ jakob joined08:40
→ jpjacobs joined08:40
→ Martin_ joined08:40
→ mquin joined08:40
→ Azrathud joined08:40
→ tomaw joined08:40
→ jhoepken joined08:40
→ RokSteady joined08:40
→ malesca joined08:40
→ Nibato joined08:40
→ zeom joined08:40
→ CareBear\ joined08:40
→ ruskie joined08:40
→ SJS joined08:40
→ awx joined08:40
→ cehteh joined08:40
→ eboyjr joined08:40
→ cxreg joined08:40
→ paparent joined08:40
→ kandinski joined08:40
→ dropdrive joined08:40
→ mfb joined08:40
→ dcelix joined08:40
→ alip joined08:40
→ Khisanth joined08:40
→ k-man joined08:40
→ elhadr joined08:40
→ hsb joined08:40
→ eightyeight joined08:40
→ tharkun joined08:40
→ phantomcircuit joined08:40
→ luka12345|wiik joined08:40
→ anildigital_work joined08:40
→ matthiasgorgens1 joined08:40
→ BinGOs joined08:40
→ mattp_ joined08:40
→ nick_h joined08:40
→ resmo_ joined08:40
→ ketas-av joined08:40
→ BeerSerc joined08:40
→ foocraft joined08:40
→ roue joined08:40
→ spb joined08:40
→ andres joined08:40
→ skyjumper joined08:40
→ Marquel joined08:40
hubbard.freenode.net set mode: +v08:40
→ felipe joined08:40
→ Will| joined08:40
→ Gate joined08:40
→ blueyed joined08:40
→ Blackshark joined08:40
→ guide joined08:40
→ speakman joined08:40
→ Soliton joined08:40
→ twem2 joined08:40
→ Guest17735 joined08:40
→ harleypig joined08:40
→ cjackson joined08:40
→ Bucciarati joined08:40
→ seanius joined08:40
→ pizza_ joined08:40
→ tabakhase joined08:40
→ larva joined08:40
→ egs joined08:40
→ bjornbjorn joined08:40
→ cbreak joined08:40
→ xrogaan joined08:40
→ biz joined08:40
→ MAAIB3B joined08:40
→ coldboot joined08:40
→ eijk joined08:40
→ NChief joined08:40
→ todun_ joined08:40
→ afief_ joined08:40
→ duvcxk joined08:40
→ wolf_ joined08:40
→ mirage33- joined08:40
→ flijten1 joined08:40
→ ben_alman_ joined08:40
→ Kyle joined08:40
→ baburdick1 joined08:40
→ rclanan joined08:40
→ cjs_ joined08:40
→ opalka joined08:40
→ superdmp joined08:40
→ babbage joined08:40
→ ccushing joined08:40
→ dreiss_ joined08:40
→ topeak joined08:40
→ kaimi joined08:40
→ stodan joined08:40
→ leen^| joined08:40
→ Tommy[D] joined08:40
→ kodie joined08:40
→ zodiak joined08:40
→ chuck joined08:40
→ the_cybersphinx joined08:40
→ flamingspinach joined08:40
→ kmc joined08:40
→ dv310p3r joined08:40
→ ldlework joined08:40
→ asakura joined08:40
→ EricInBNE joined08:40
→ R4p70r joined08:40
→ tty2 joined08:40
→ mfischer joined08:40
→ Gitzilla joined08:40
→ Araxia joined08:40
→ Anubisss joined08:40
→ Fudge joined08:40
→ fir31ight joined08:40
→ hurikhan|Work joined08:40
→ dhruvasagar joined08:40
→ flaguy48 joined08:40
→ __main__ joined08:40
hubbard.freenode.net set mode: +v08:40
→ tchan joined08:40
→ jailbox joined08:40
→ joeytwiddle joined08:40
→ Adys joined08:40
→ dkannan joined08:40
→ eliasp joined08:40
→ ahf joined08:40
→ ShooterMG-away joined08:40
→ atdiehm joined08:40
→ ThiefMaster joined08:40
→ zivester joined08:40
→ reuteras joined08:40
→ puff joined08:40
→ SRabbelier joined08:40
→ _W_ joined08:40
→ Fissure joined08:40
→ agile joined08:40
→ Danielpk joined08:40
→ mutex joined08:40
→ Zephyrus joined08:40
→ jonmasters joined08:40
→ Zeelot joined08:40
→ demi` joined08:40
→ Zyrkon joined08:40
→ resixian joined08:40
→ ice799 joined08:40
→ sordina2 joined08:40
→ Sonderblade joined08:40
→ ls|james joined08:40
→ jeppy joined08:40
→ sunny256 joined08:40
→ grumbel_ joined08:40
→ gonzzor joined08:40
→ JP joined08:40
→ bitslip_ joined08:40
→ yrlnry joined08:40
→ koolout joined08:40
→ Veejay joined08:40
→ felher joined08:40
→ fisted joined08:40
→ VAABF3I joined08:40
→ OPK joined08:40
→ Arrowmaster joined08:40
→ haseeb joined08:40
→ przemoc joined08:40
→ tonyj joined08:40
→ ziro` joined08:40
→ Prasad joined08:40
→ Atlas joined08:40
→ depressed joined08:40
→ DeviceZer0 joined08:40
→ blast_hardcheese joined08:40
→ lahwran joined08:40
→ unforgiven512 joined08:40
→ ping-pong joined08:40
→ shiba_yu36 joined08:40
→ Targen joined08:40
→ alexs joined08:40
→ hyperair joined08:40
→ kermit joined08:40
→ dang`r`us joined08:40
→ cbeams joined08:40
→ fpcfan joined08:40
→ haarg joined08:40
→ Nikoli joined08:40
→ ramsey joined08:40
→ metellius joined08:40
→ glennpratt joined08:40
→ RobertLaptop joined08:40
→ jettero joined08:40
→ Nugget joined08:40
→ ericmuyser joined08:40
→ nullvariable joined08:40
→ claudiu__ joined08:40
→ hotswaphdd joined08:40
→ jepler joined08:40
→ ijuma_ joined08:40
→ lemonchicken joined08:40
← ahf left08:41
← joeytwiddle left08:41
← hobodave_ left08:41
→ hobodave_ joined08:41
→ ahf joined08:41
masterhumper → Guest9705108:41
hyperboreean → Guest608308:41
Kyle → Guest9273508:41
→ joeytwiddle joined08:42
→ dermoth|work joined08:42
→ shruggar joined08:42
Vampire0_ → Vampire008:42
→ ijuma joined08:42
fisted → Guest9991308:43
felher → Guest7332108:43
← eijk left08:43
→ eijk joined08:43
← Guest97051 left08:44
← bburhans left08:45
→ tatsuya_o joined08:45
→ bburhans joined08:46
→ MissionCritical joined08:46
→ kR15t0 joined08:47
→ brian_g joined08:48
← guardian left08:48
capncodewash When cloning a large repo, I'm getting "fatal: out of memory, malloc failed (tried to allocate 905574791 bytes) / fatal: index-pack failed". This is on a 32-bit Debian VM with 384MB of RAM and Git 1.7.2.5. Is there anything I can do to make the clone succeed, without modifying the contents of the repo or giving the VM more RAM?08:49
→ mklappstuhl joined08:50
→ sejo joined08:50
Silex how to ignore files that starts and ends with a #? I tried #*# in .gitignore but it doens't seem to work08:52
grumbel_ Silex: \#*#08:54
→ EyesIsServer joined08:54
Silex thanks08:54
capncodewash Silex: \#*#08:54
grumbel_ otherwise # starts a comment line08:54
capncodewash lol :D08:54
← replore_ left08:54
Silex ah right08:54
← elyob left08:55
← JackWinter left08:55
→ elyob joined08:56
→ JackWinter joined08:57
→ Alvo joined08:58
← RichardBronosky left08:58
iband → iband|away08:59
→ rendar joined09:00
→ Vile joined09:02
→ TheMoonMaster joined09:04
→ talios joined09:05
wereHamster capncodewash: no09:09
→ cortana joined09:09
m1sc capncodewash: check man git-config - there are some config parameter affecting memory / threads /etc09:09
← zheng left09:11
← Guest6083 left09:12
→ hyperbor1ean joined09:12
capncodewash m1sc: thanks - any idea which parameters I should be adjusting? At first glance, reducing core.packedGitLimit looks promising, but basically I have no idea what I'm looking for09:12
← toabctl left09:13
← hyperair left09:13
→ Spockz joined09:15
m1sc capncodewash: no09:18
← jds left09:18
→ Fanda joined09:18
m1sc capncodewash: maybe you can find something in the mailing list archive09:18
capncodewash m1sc: OK thanks09:19
← rendar left09:20
→ toabctl joined09:21
← toabctl left09:22
← lericson_ left09:23
→ jds joined09:23
← Prasad left09:24
→ stoffus joined09:24
→ QKO|Work joined09:25
→ babilen joined09:26
← ivank_ left09:27
charon capncodewash: maybe. i think junio had some "streaming (de)compression" patches in newer gits. but no guarantees whatsoever that this fixes your issue09:30
← orafu left09:30
charon capncodewash: but in any case, running git on a machine having less (virtual at least) memory than 1-2 times the biggest file you want to manage is not well supported09:30
→ vmil86 joined09:33
capncodewash charon: cool - do you know which version(s) the streaming decompression patch would be present in? I agree, Git doesn't support this well as things stand.09:33
→ radarek joined09:34
← Khisanth left09:35
charon capncodewash: look at the history of 6b6cab3; i think that's the series. it's in the 1.7.7-rc tags, but not released yet, so you'll have to compile git from source09:36
→ orafu joined09:36
→ Khisanth joined09:36
capncodewash charon: okay, thanks.09:36
cbreak-work just don't use big files :)09:37
640k of memory should be enough for code...09:37
← catphish left09:37
→ dfr|mac joined09:38
ChanServ set mode: +v09:38
← Alvo left09:38
← phreaknerd left09:42
teuf_ → teuf09:43
← jargon- left09:43
← QKO|Work left09:43
→ QKO|Work joined09:43
→ jabular joined09:43
QKO|Work hi09:44
.gitignore doesn't seem to work09:44
wereHamster I can assure you, it works fine09:44
→ noisebleed joined09:44
QKO|Work git add --all is still staging supposedly ignored files here09:44
wereHamster that's what it does if the files are still tracked09:45
QKO|Work I'm talking about untracked files09:45
wereHamster can you pastebin your gitignore file and the output from git status?09:45
← vmil86 left09:46
QKO|Work wereHamster: http://pastebin.com/UrpJNH6C09:48
← JackWinter left09:48
← EM03 left09:51
→ dvaske joined09:51
hyperbor1ean → hyperboreean09:51
wereHamster what's inside dev/src/ComponentBase/bin/ for example?09:52
→ cybersphinx joined09:52
QKO|Work Debug and a bunch of dlls and pdbs09:52
err09:52
bunch of dlls and pdbs are inside the debug folder09:52
→ JackWinter joined09:53
← haseeb left09:53
→ hyperair joined09:54
← jds left09:54
← Fanda left09:54
← the_cybersphinx left09:56
← OOPMan left09:56
← Textmode left09:56
→ sirdancealot joined09:57
→ greggyNapalm joined09:57
← ldlework left09:58
greggyNapalm Hi All, tell me please is it possible to make automaticly git put a revision number in source file when I clone repo ?09:58
← Squarism left09:58
FauxFaux It is, but you shouldn't.09:58
wereHamster greggyNapalm: do that as part of the build process09:58
iivvoo bla09:58
greggyNapalm for example09:59
iivvoo ah.. I can speak again09:59
← stoffus left09:59
greggyNapalm 1) clone sourrce code09:59
2) place revision num in code09:59
3) build09:59
→ jds joined09:59
greggyNapalm like that ?09:59
wereHamster greggyNapalm: 1) clone source code, 2) build; where build does: 1) generate file and put revision code into it, 2) build10:00
greggyNapalm ok, thx10:00
→ bushwakko_ joined10:00
→ jargon- joined10:01
← cjs_ left10:01
← dexter_e left10:01
← bushwakko left10:03
bushwakko_ → bushwakko10:03
← babbage left10:05
← fruight left10:07
← kenperkins left10:08
shruggar you could also configure a smudge filter10:09
but I expect you're wanting something without any additional set-up required10:09
← kurtzhong left10:09
← talios left10:11
→ OOPMan joined10:11
→ Textmode joined10:12
→ xiong joined10:12
→ Daniel0108 joined10:13
← aminpy_ left10:13
← dorisabayon left10:14
→ empity joined10:15
→ cesc joined10:15
→ LouisJB joined10:19
← OOPMan left10:19
← bushwakko left10:20
← Textmode left10:21
← Guest92735 left10:23
→ kylebk joined10:23
→ chepre joined10:24
← babilen left10:26
← elyob left10:27
← subbyyy left10:29
→ babilen joined10:29
opalka → opalka|lunch10:32
← greggyNapalm left10:32
→ subbyyy joined10:33
→ fruight joined10:36
← gerard0 left10:36
→ dexter_e joined10:39
→ kephas joined10:39
→ gerard0 joined10:40
← Nikoli left10:40
→ Nikoli joined10:40
← todun_ left10:40
shruggar ls10:41
_ikke_ .10:41
..10:41
file_not_found10:42
← nowhereman left10:42
→ martinjlowm joined10:42
← radarek left10:43
iband|away → iband10:43
→ Textmode joined10:45
→ Fullmoon joined10:48
→ jatt joined10:48
← giallu left10:48
→ mxweas_ joined10:50
← fruight left10:52
→ fruight joined10:52
← shruggar left10:54
← _kud left10:54
← mxweas_ left10:54
← ijuma left10:54
← dfr|mac left10:55
→ davi_ joined10:55
→ ijuma joined10:56
← topeak left10:57
← ijuma left11:00
→ Squarism joined11:01
→ bartek joined11:02
opalka|lunch → opalka11:03
→ Seb joined11:04
Seb hi fellows11:04
dang`r`us hi seb11:05
→ Rvl joined11:05
→ bgerber joined11:05
→ vinnix joined11:06
Seb is there any way to use variables in a commit template file ?11:07
i use a plain file now, but would like it to have for instance "[${branch}]" instead of me having to manually fill in the branch name inside the brackets for each commit :)11:07
→ RichardBronosky joined11:10
← caseymcg left11:11
→ bauruine joined11:11
← flijten1 left11:13
→ ijuma joined11:15
wereHamster make an alias which generates the template file before calling commit -F11:15
→ Yuuhi joined11:15
→ Prasad joined11:16
→ flijten joined11:17
← Targen left11:17
→ caseymcg joined11:17
← vinnix left11:20
→ vinnix joined11:20
→ omid joined11:20
→ elyob joined11:23
iband → iband|away11:24
→ shruggar joined11:28
← gretch left11:29
← Sitethief left11:29
iband|away → iband11:30
→ BlankVerse joined11:30
Seb wereHamster: good idea11:31
← caseymcg left11:32
→ sonnym joined11:33
→ cenuij joined11:35
← cenuij left11:35
→ cenuij joined11:35
← DarkAR left11:37
← sdjayna1 left11:37
→ cggaurav joined11:38
← krisoijn left11:38
→ krisoijn joined11:40
→ beautifulmind joined11:42
→ johnkpaul joined11:43
← RichardBronosky left11:45
← R4p70r left11:45
→ beatak joined11:45
→ iXeno_ joined11:46
→ mandric joined11:46
→ [tla] joined11:47
← glennpratt left11:47
→ mcdebugger joined11:48
← iXeno left11:49
→ sdjayna joined11:49
[tla] hi. http://paste2.org/p/1680944 git is high performance 99.9+% of the time for me but "git gc" on the linux source tree just took 21 hours to run on my Intel P3 / 256MB server. the issue for me seems to be the huge amount of virtual memory consumed by the command that causes loads of swap. is there any way to make this thing run more efficiently on machines with 256MB RAM? thx.11:50
← dv310p3r left11:51
→ gebi joined11:51
→ radarek joined11:52
← shruggar left11:53
← madewokherd left11:53
cbreak-work yes11:54
→ cannonball joined11:54
cbreak-work you can play around with the repack window sizes or so11:54
← bartek left11:54
→ murilobr joined11:55
← mcdebugger left11:55
thiago [tla]: also, don't repack big repositories on old machines.11:56
→ Alvo joined11:58
← tatsuya_o left11:58
→ tatsuya_o joined12:00
→ kerrick joined12:00
→ canton7 joined12:01
← ehsan left12:02
← Dreamer3 left12:03
iband → iband|away12:04
← swombat left12:05
← canton7 left12:06
→ _kud joined12:07
← tatsuya_o left12:09
← Squarism left12:10
→ warlock_mza joined12:12
← jds left12:12
→ gretch joined12:12
→ mcdebugger joined12:13
← Seb left12:15
[tla] i guess my point is that the way the code has been written seems outside -what i perhaps naively - assume to be linux principles of small and fast and working on all types of hardware. it may be this might have been developed on a modern server with a few GB of RAM and it wasn't an issue. many people (including me) use linux because of these features and it's a shame in this respect git...12:15
...falls down. the P3 in question runs an exim email gateway, postgres db server, ftp server etc without any problems.12:15
→ sikao_lfs1 joined12:15
→ iXeno joined12:15
← iXeno_ left12:17
→ spaceonline joined12:17
bremner [tla]: try running g++ on modern C++ on the same system12:18
→ [intra]lanman joined12:19
bremner git is a software development tool.12:19
← sdjayna left12:19
← BlankVerse left12:19
bremner of course, less resource hungry would be nice, but everything is a tradeoff.12:20
thiago [tla]: the algorithm requires lots of memory to run. You can do what cbreak-work suggested to limit the algorithm.12:20
[tla]: it will also limit the efficiency.12:20
← krz left12:21
→ Jon47 joined12:22
→ ehsan joined12:23
→ Targen joined12:25
→ kumbayo joined12:26
← wilmoore left12:27
→ AaronMT joined12:30
← murilobr left12:31
← Spockz left12:32
← Fullmoon left12:32
→ Spockz joined12:33
← squentin left12:34
→ murilobr joined12:35
← Alvo left12:35
→ squentin joined12:35
→ masterhumper joined12:35
← masterhumper left12:35
→ ajt joined12:38
← papegaaij left12:38
← kerrick left12:39
→ endy_c joined12:40
endy_c how do I create a branch in a bare repo?12:40
mklappstuhl endy_c: you can't (i'd say)12:41
→ tommyvyo joined12:41
_ikke_ endy_c: What do you want to achieve?12:41
→ Chib joined12:41
← __main__ left12:41
endy_c I have a bare repo that I use as a 'server'12:42
→ Bass10 joined12:42
→ mario-goulart joined12:42
capncodewash endy_c: create the branch on your local clone, then push to the bare repo.12:42
→ glennpratt joined12:43
→ __main__ joined12:43
_ikke_ endy_c: You should not directly work on a bare repository12:43
← QKO|Work left12:43
endy_c ok so I create branch on my working repo, commit some, then push to bare12:44
← warlock_mza left12:44
capncodewash endy_c: yes12:44
→ Anubisss_ joined12:45
→ EM03 joined12:45
← EM03 left12:45
→ EM03 joined12:45
gonzzor Is it possible to reference a commit in a submodule that isn't reachable by the normal refs/heads/* references?12:47
wereHamster gonzzor: no12:47
← Anubisss left12:48
gonzzor :(12:49
→ bartek joined12:49
gonzzor Is it possible to change the default refspec used when cloning the submodule?12:49
So that I can include the gerrit refs/changes/...12:50
← Guest73321 left12:50
→ Alvo joined12:50
→ BlindOracle joined12:51
→ tatsuya_o joined12:51
→ LiamH joined12:51
→ felher joined12:52
← endy_c left12:53
→ TeckniX joined12:53
← rchavik left12:54
← cesc left12:56
nevyn is there a simple way to list branch's by most recent commit?12:57
→ endy_c joined12:57
→ bibinou joined12:58
wereHamster nevyn: git log12:59
→ BlankVerse joined13:00
← ehsan left13:00
← berserkr1 left13:00
→ sar4j joined13:02
← sar4j left13:02
← sonnym left13:02
← ajt left13:02
→ ajt joined13:02
→ GunArm joined13:04
← mario-goulart left13:04
← mandric left13:04
→ alberto56 joined13:04
← tatsuya_o left13:04
← cenuij left13:06
→ st joined13:06
← BlindOracle left13:07
← mlncn left13:08
→ saschagehlich joined13:08
→ kerrick joined13:12
← Modius left13:12
→ yorick joined13:12
→ tatsuya_o joined13:13
← tatsuya_o left13:13
→ tatsuya_o joined13:14
→ sorin joined13:15
← kermit left13:15
→ kermit joined13:15
sorin → Guest4824013:15
→ OOPMan joined13:15
→ dv310p3r joined13:15
→ cenuij joined13:19
endy_c capncodewash: it worked, thanks!13:21
capncodewash endy_c: glad to hear it :D13:21
← SmartViking left13:21
← martinjlowm left13:21
← endy_c left13:22
→ canton7 joined13:22
← cooloney left13:25
← albel727 left13:26
→ jds joined13:28
→ albel727 joined13:28
← Prasad left13:29
iband|away → iband13:30
→ gusnan joined13:30
→ the_cybersphinx joined13:31
← [tla] left13:32
→ shruggar joined13:32
← tvw left13:34
→ Sico joined13:34
← cybersphinx left13:34
← SicoWork left13:35
→ niloc132 joined13:35
← kerrick left13:35
← bauruine left13:38
← spearce left13:38
→ rioch joined13:39
→ bauruine joined13:39
rioch I've started doing some work in the master branch, and now I realise it'd be better for these changes to be in a new branch. Is there any easy way to do that without copy files/branching/copying back?13:40
→ amcsi_work joined13:41
amcsi_work hello13:41
wereHamster rioch: git checkout -b <yournewbranchname>13:41
← baburdick1 left13:41
amcsi_work I'm using git svn, and I did git svn clone, I ckecked out to a new branch, I made a commit, I checked out back to master, I merged with the new branch and then did git svn dcommit13:42
rioch wereHamster, I normally do that before making changes. Is git smart enough to leave master at HEAD if I do that?13:42
→ Fandekasp joined13:42
→ whit537 joined13:42
amcsi_work it worked great, but my log shows that master is on a different commit than the new branch, even though the files are the same. is this normal?13:42
wereHamster rioch: yes13:43
amcsi_work am I supposed to delete the branch now that isn't along the svn's line?13:43
wereHamster rioch: well, 'leave master at HEAD' does not make sense. checkout -b will create a new branch and swithc to it.13:43
so it will change HEAD13:43
→ gchristensen joined13:44
← gchristensen left13:44
→ gchristensen joined13:44
→ cakehero joined13:44
rioch wereHamster, but master should remain at its HEAD13:44
→ holybit joined13:44
wereHamster rioch: there is only one HEAD in a git repo. And that's the commit or branch you currently have checked out13:44
jast master doesn't have a "HEAD". the repository as a whole has a "HEAD". HEAD means: the currently checked out thing13:44
rioch ooooh...that's probably a good thing to know. Thanks.13:44
← juvenal left13:45
jast I added a trigger for this, ! + HEAD13:46
wereHamster rioch: and generally git won't let you do destructive actions unless you explicitly tell it to (using --force etc)13:46
jast oh, actually uppercase triggers don't work right now13:46
iband → iband|away13:46
jast triggers are now case-sensitive ;)13:46
rioch ok. what can I say, we use sourcesafe normally so I've been trained to be scared :)13:46
→ trupheenix joined13:47
→ axl_ joined13:48
→ subbyyy1 joined13:48
← nano-_ left13:49
← subbyyy left13:49
→ baburdick joined13:50
← flijten left13:53
← bburhans left13:54
→ bburhans joined13:54
← cggaurav left13:54
← baburdick left13:54
→ spearce joined13:55
→ Swimming_Bird joined13:55
→ hellofoo joined13:55
→ spearce_ joined13:55
← trupheenix left13:55
→ RevoOf joined13:55
← shiba_yu36 left13:55
RevoOf hi. how can i diff with colores lines AND colored words?13:56
s/colores/colored/13:56
hellofoo i cloned a repo from github, then did a git checkout r2.0.0 (to checkout to a tag) - then it gave me a notice with some detahced HEAD text. how do i go back to the top again ? the latestt commit ?13:56
→ BlindOracle joined13:56
hellofoo also how do i knmow my current commit and tag ?13:56
RevoOf hellofoo: git checkout <branchname>13:57
hellofoo i dont know what to type instead of <branchname> :P13:57
wereHamster master13:57
← spearce left13:57
hellofoo that will take me to latest commit ?13:57
wereHamster no, it will take you to the master branch13:57
→ spearce joined13:58
hellofoo why was i in a detached head ?13:58
RevoOf hellofoo: you can find other branches using git branch13:58
wereHamster because you checked out a tag13:58
← alexs left13:58
RevoOf hellofoo: that's nothing bad though - your working copy is at the state of the tag13:58
hellofoo and a tag is a detcached head ? it does point to a commit13:58
i see13:59
→ jonshea joined13:59
hellofoo how do i go to the latest commit tho ?13:59
RevoOf hellofoo: it doesn't point to the tip of a branch13:59
wereHamster no. if you checkout something that is not a brnach, git detaches HEAD13:59
→ akosikeno joined13:59
hellofoo aah13:59
yes, been quite sometime since i have messed with git. neither was a good at it back in those days :P14:00
wereHamster it hasnt' changed much. Only the cli is easier to use14:01
← spearce_ left14:01
→ sonnym joined14:01
→ baburdick joined14:02
← canton7 left14:02
→ heptadecagram joined14:03
← Guest48240 left14:03
← subbyyy1 left14:03
← gebi left14:04
→ sorin joined14:04
→ flijten joined14:04
→ mgtsol joined14:04
← Alvo left14:04
→ ceej joined14:05
→ Alvo joined14:06
→ ehsan joined14:07
→ ssquires joined14:08
← mgtsol left14:08
← fruight left14:09
→ Squarism joined14:10
← likewhoa- left14:14
→ likewhoa joined14:16
→ dotnull joined14:16
← blueyed left14:16
→ whit537_ joined14:16
→ Myth17 joined14:16
← beautifulmind left14:17
→ macmartine joined14:18
→ w0bni joined14:18
→ dot_null joined14:18
← whit537 left14:18
whit537_ → whit53714:18
← dot_null left14:18
→ alexs joined14:18
→ blueyed joined14:18
→ krosenvold joined14:19
← jelmer left14:19
→ mlncn joined14:20
← ssquires left14:20
← joshteam1 left14:21
← spearce left14:22
→ canton7 joined14:22
← w0bni left14:22
← alexs left14:23
→ w0bni joined14:24
→ magmatt joined14:25
→ alexs joined14:26
→ _psychic_ joined14:26
magmatt Can I fetch a branch from one remote and push to another without making a local branch?14:26
→ Noctifer joined14:26
← jonshea left14:27
→ DofLeFou joined14:27
wereHamster yes. But not without making a local ref14:28
← superdmp left14:28
← Targen left14:29
→ superdmp joined14:29
magmatt wereHamster: how does it go? I'm trying: git push remote2 origin/mybranch:mybranch14:29
wereHamster and what is it doing?14:29
→ spearce joined14:30
magmatt error: unable to push to unqualified destination:14:30
hellofoo so, i checkout to a tag, make a change in codebase, create a new branch commit. get back to master branch and that tag is there in git tag -l but not in the git log ?14:30
wereHamster origin/mybranch:refs/heads/mybranch14:30
→ mandric joined14:30
→ archis joined14:30
wereHamster hellofoo: please explain how you did 'create a new branch commit'14:30
→ jelmer joined14:30
← Sico left14:31
magmatt wereHamster: that worked; thank you! Why did that work?14:31
wereHamster because the destination was unqualified14:31
→ Semikolon joined14:31
← archis left14:31
hellofoo git checkout -d test && git commit -am 'issue fix'14:31
wereHamster oh wait. That's what git told you14:31
hellofoo umm, git branch -d test14:31
← Araxia left14:31
→ SicoWork joined14:31
wereHamster I guess -b, right?14:31
hellofoo git checkout -b test_brnach., just confgiemd14:32
git checkout -b test_branch, just confirmed14:32
wereHamster so, now why did you expect that commit to be in the master branch?14:32
← cenuij left14:32
← opalka left14:32
wereHamster you made it on the test branch, and that's where it is14:32
→ cylence joined14:32
hellofoo i didnt expect this commit to be there in the master but the one before this.14:32
the one to which the tag r2.0.0 pointed to14:32
← jds left14:32
→ juvenal joined14:33
← blueyed left14:33
hellofoo make change in codebase -> git checkout r2.0.0 -> git checkout -b test_branch -> git commit -am 'issue fix' -> git checkout master -> i cant find the r2.0.0 taggin in git log14:33
→ blueyed joined14:33
hellofoo maybe i am doing something wrong :/14:33
wereHamster was the tag in masetr before you started?14:33
hellofoo yep14:34
← ayanes left14:34
wereHamster what does git status say?14:34
hellofoo on branch master nothing cto comit14:34
← Jon47 left14:34
→ ayanes joined14:34
← ayanes left14:35
→ ayanes joined14:35
wereHamster take a graphical history viewer and see if you can figure out where the tag is14:35
← alexs left14:35
hellofoo hmm14:35
btw, mergin test_branch to master should add the fix to r2.0.0 ? :P14:36
for master branch14:36
so that i can get rid of test_branch then, heh.14:36
← cylence left14:36
→ DarkAR joined14:37
→ Dave^|| joined14:37
→ jds joined14:38
hellofoo not really14:39
← saschagehlich left14:39
→ saschagehlich joined14:40
← Semikolon left14:40
← grekko left14:40
→ emptyflask joined14:41
← leen^| left14:41
→ alexs joined14:42
← alexs left14:42
→ alexs joined14:42
← alexs left14:42
→ alexs joined14:42
← alexs left14:42
→ alexs joined14:42
← alexs left14:42
→ topeak joined14:42
→ alexs joined14:42
← alexs left14:42
→ alexs joined14:42
← alexs left14:42
→ alexs joined14:43
→ codebeaker joined14:44
← alexs left14:44
→ superdmp_ joined14:44
← jargon- left14:46
→ LekeFly joined14:46
wereHamster hellofoo: !book14:46
jast hellofoo: *automatic message* 'Pro Git' is a complete book about git that is available online for free: http://progit.org/book/14:46
→ alex__c2022 joined14:47
← superdmp left14:47
superdmp_ → superdmp14:47
→ nyuszika7h joined14:47
rudi_s Hi. Is it possible to prevent git diff from displaying all lines as removed when a file was deleted and instead just display something like "file x deleted"?14:48
→ bitkiller joined14:48
→ moltar joined14:49
← superdmp left14:49
→ superdmp joined14:49
→ RaceCondition joined14:50
iband|away → iband14:50
offby1 if the man page makes no mention, then probably not14:51
← airborn left14:51
offby1 --diff-filter might be handy14:51
wereHamster --name-status also14:52
charon rudi_s: -D, --irreversible-delete14:52
offby1 will that show a regular patch in most cases?14:52
offby1 never heard of --irreversible-delete14:52
charon me neither but man git-diff-tree has it14:52
offby1 huh14:52
charon (and it works! yay)14:52
→ ksawicki joined14:53
offby1 must be new; my man page doesn't have it14:53
rudi_s charon: Thank you, I overlooked that in the man page.14:53
hobodave_ → hobodave14:53
charon v1.7.6 is the first release that has it14:54
→ jonshea joined14:54
charon 467ddc14 seems to imply that neither git-apply nor patch will accept it as input14:54
moltar Is there a way to rewrite contents of previous commits with filter-branch or some such? I need to remove the password from the commits, but don't want to remove the whole file, as it's a config file and it is needed. Thanks.14:55
FauxFaux moltar: Sure, you can do whatever you want during tree-filter.14:55
→ kadoban joined14:55
wereHamster moltar: yes, and sometimes rebase is easier14:55
FauxFaux Or, y'know, just change the password.14:55
moltar FauxFaux: I'll change the pwd too, but want to replace it with XXXXXX in the commits14:55
so I guess I can run a sed on it?14:55
rudi_s moltar: git rebase -i HEAD~ should be easier in this case.14:56
→ Jon47 joined14:56
moltar what does that do?14:56
rudi_s Use edit and then re-"git add" the file and the result will replace the old commit.14:56
→ cggaurav joined14:56
rudi_s (Won't work for public commits of course.)14:56
moltar nah it goes way back14:56
not one commit14:56
there is history + branches etc14:57
rudi_s Then don't use HEAD~ but target-sha~14:57
moltar target-sha being the first time this was introduced?14:57
rudi_s (Oh, and for the last commit git commit --amend would be even simpler ...)14:57
→ JohnBat26 joined14:57
rudi_s moltar: Yes.14:57
← RevoOf left14:58
moltar then going forward it will change all further commits?14:58
→ jedahan joined14:58
moltar I guess yes, because git stores diffs, so it won't see the diff14:58
rudi_s moltar: Yes, unless there are conflicts which you have to resolve.14:58
→ alextheger joined14:58
hellofoo how would you actually make a fix to an old version of your codebase (that was tagged as say v2.0.0) ?14:58
wereHamster moltar: keep in mind that rebase won't really work if you have merges14:58
moltar I had merges14:58
that's why I think a simple history rewrite is easier14:58
← moqq_ left14:58
moltar im the only way that maintains this repo anyways14:58
wereHamster hellofoo: make a new branch based off of v2.0.0, make the fix there, publish the new branch14:59
moltar so others of no concern, but the repo is on github and client has access14:59
so don't want to share my passwords with others14:59
rm-rf how can i grab a specific file out of my repo, based on commit hash?14:59
wereHamster show <sha>:<path>14:59
hellofoo wereHamster: i guess thats what i have done ? checkout to v2.0.0 then checkout a new branh and made the issue fix commit ?14:59
wereHamster hellofoo: then you're done14:59
hellofoo can i somehow not merget aht into master ? :P hard to explain15:00
umm, like..15:00
wereHamster you can. But why didn't you make the fix in master in the first place?15:00
← stodan left15:00
rm-rf wereHamster: sorry for my ignorance, but what is <sha>?15:00
the hash?15:00
wereHamster rm-rf: yes. sha stands for sha1 which stands for secure hash 115:00
moltar rm-rf: yeah hash, aka the unique name of your commit15:00
wereHamster secure hash algorithm 115:00
hellofoo issue is not fixed in the master, but i want to send the fix to the old version too, that was tagged v2.0.0 like 2 months ago.15:01
now fixed*15:01
wereHamster hellofoo: the make a new branch off of v2.0.0, make the fix there, publish that branch or even tag it v2.0.1, then merge that brnach into master15:02
er. wait. if it's fixed in master, why do you want to merge it?15:02
hellofoo i want to like send the fix to v2.0.0 while have it in the master branch. so that when you click that tag in master branch from github you have the fix :P15:03
← ceej left15:03
rm-rf awesome, thanks15:03
wereHamster when you click which tag?15:03
→ ceej joined15:03
hellofoo the v2.0.015:03
alextheger hi there.15:04
→ Jackneill joined15:04
hellofoo or when you do git checkout v2.0.0 on master branmch in cli you have the fix15:04
wereHamster that would require rewriting the tag, which is considered bad. Make the fix, then tag it v2.0.115:04
→ jds_ joined15:04
→ trupheenix joined15:04
wereHamster that's what tags are for. And version numbers.15:04
→ eijk_ joined15:04
alextheger any idea why "git log --find-copies --numstat" yield different results than "git log --follow <commit> -- path/to/file"?15:04
hellofoo hmm15:05
← flijten left15:05
← EricInBNE left15:05
← Jon47 left15:06
iband → iband|away15:06
hellofoo wereHamster: so merge the fix branch with master branch and tag it 2.0.1 ?15:06
wereHamster hellofoo: no, not merge it with anything. You said that the fix already is in master. So you don't need to touch master at all15:07
← jds left15:07
→ Jon47 joined15:07
← eijk left15:07
hellofoo true15:07
← JohnBat26 left15:07
→ drev1 joined15:08
→ wilmoore joined15:08
hellofoo wereHamster: wait. in 2 months lots of coding has been done, so i cant tag the latest code as 2.0.1. latest code has already been tagged 2.2.0 (and 2.1.0 before).15:09
so are you asking me to tag 2.0.1 in the fix branch ?15:09
telling me*15:10
→ tjholowaychuk joined15:10
hellofoo maybe i am misunderstanding something15:11
→ mikeyutley joined15:11
→ robertfw joined15:11
→ swombat joined15:11
→ gaurangaggarwal joined15:12
← gaurangaggarwal left15:12
→ gaurangaggarwal joined15:12
← cbreak-work left15:13
← gaurangaggarwal left15:13
alphagod → Unknown[NF]15:13
hellofoo putting it simply, my software is tagged 2.2.0 (2.1.0 2.0.0 1.9.2 ... ) on master branch and i need to send a fix to 2.0.0 tag on the master branch.15:13
← radarek left15:13
← ayanes left15:14
→ tshauck joined15:14
← sebbi left15:14
← magmatt left15:15
← RaceCondition left15:15
→ HG` joined15:16
→ multi_io joined15:16
multi_io how can I find out all heads, including those with no branches/tags pointing to them?15:17
hellofoo wereHamster: i merged the fix branch with master, seems like it has done the trick ?15:18
maybe i can delete 2.0.0 tag and now retag the new commit as v2.0.0 ?15:18
canton7 multi_io, git fsck --unreachable will give you all unreachable objects15:18
→ RaceCondition joined15:20
→ zen1th joined15:20
← Guest54849 left15:20
← zen1th left15:20
→ necromancer joined15:21
← hellofoo left15:21
necromancer hey guys15:21
is it possible to set the "default" remote when i clone a git URL?15:21
like if i want the remote to be renamed to "hub" instead of "origin"15:21
canton7 necromancer, look at -o for git-clone15:22
necromancer THANKS15:22
err15:22
thanks :)15:22
← dc5ala left15:23
← retoryter left15:23
→ alvaro_o joined15:23
Nickeeh I had a derp! I did a very nice atomic stage (git add -p) and then (git commit -am) :( How do I undo my error?15:23
→ retoryter joined15:23
→ Raging_Hog joined15:24
charon Nickeeh: commit -am (--all plus a message) or --amend?15:24
→ Ryback_ joined15:24
→ xpot-mobile joined15:25
→ kvanderw joined15:25
→ kukks joined15:26
multi_io canton7: hm, the head I was looking for wasn't any of the commits listed by git fsck --unreachable15:26
canton7: but:15:26
canton7: I did find it in git reflog15:26
asedeno_work Nickeeh: You 'git reset HEAD~', and then stage the commit you wanted to make again.15:26
← alecat left15:27
asedeno_work (I'm assuming you meant what you said, -am not --amend)15:27
→ minijupe joined15:28
→ iElectric joined15:28
→ codeshah joined15:28
← psoo left15:28
← bauruine left15:28
iElectric git add -i somehow screws readline and enter procudes ^M15:28
any tips how to fix it?15:28
← Adys left15:28
← hynek_ left15:29
← cbeams left15:29
asedeno_work iElectric: I'm about to go afk, but to help everyone else why don't you tell us about the OS and shell you are using.15:29
→ flijten joined15:29
multi_io canton7: now that I've found the head, how do I create a new branch pointing to it? git branch <branchname> <sha1> ?15:29
iElectric ubuntu linux, bash shell15:30
→ GreekFreak joined15:30
iElectric asedeno_work: cc15:30
← amcsi_work left15:30
← macmaN_ left15:30
← retoryter left15:31
Nickeeh charon, -am, asedeno_work: thanks :)15:31
multi_io ok, git branch <branchname> <sha1> works.15:31
GreekFreak hi. I created a branch, edited, created and deleted files. I decided that I went completely wrong and wanted to restart. So I deleted the branch and... all the unedited and untrached files are still there. I did "git pull" on the branch, and it says "up to date". How do I get all my files to before my changtes?15:32
← OOPMan left15:32
→ tystr joined15:33
← xpot-mobile left15:33
← codeshah left15:33
→ jalama joined15:33
← niloc132 left15:34
Nickeeh GreekFreak, are you on a branch? Check with "git branch"15:34
← moltar left15:34
Nickeeh GreekFreak, if yes, check where you are, with gitx/gitg/gitk15:35
GreekFreak Nickteeh: I've deleted the branch I was working on so now I only have the master branch, which I'm on15:35
← Behi left15:37
GreekFreak I meant to say Nickeeh15:38
← mmocny left15:38
Nickeeh and git status doesn't show any changed files?15:39
git diff also doesn't?15:39
GreekFreak, ^15:39
← jatt left15:39
GreekFreak Nickeeh: git status shows a whole lot of midified files and added files, that I want reverted back to what they were before the branch15:39
Nickeeh GreekFreak, git reset --hard15:40
BUT15:40
before that15:40
please make sure you are willing to lose *all* those changes.15:40
they're gone.15:40
→ warthog9 joined15:40
GreekFreak Nickeeh, yes I do so I'll give it a try15:41
Nickteeh: ok done. and for the files that were untracked? I assume I delete those manually15:43
Nickeeh nope, untracked files can be deleted with git clean15:43
take a look at its manpage, it's pretty straightforward.15:43
(as in, few options, not so hard to understand)15:43
GreekFreak Nickeeh, thank you. For some reason I look online before checking the man. Thank you very much for your help15:44
→ xpot-mobile joined15:45
← Fandekasp left15:45
Nickeeh GreekFreak, you're welcome15:46
← lorfds left15:48
← mishok13 left15:48
← Jon47 left15:49
← RaceCondition left15:50
← chepre left15:50
→ SimonNaa joined15:52
→ friskd joined15:53
← BlankVerse left15:53
→ cwang joined15:55
← xpot-mobile left15:55
← alvaro_o left15:56
→ muzone joined15:56
← johnathanb left15:56
← GreekFreak left15:57
→ Destos joined15:57
muzone I got this custom version of this repo. Is need to know whenever some of the files I've customized has been updated. Is this how I'd put it all in a script? (especially the commented lines - how'd I do those?) https://gist.github.com/125419715:57
→ axolx_ joined15:58
→ bittin joined15:58
→ cylence joined15:58
← bittin left15:59
→ bittin joined15:59
← nicoulaj left16:00
sitaram hi all; what man page does git tell you the allowed characters in a refname?16:00
I cant seem to remember16:00
iband|away → iband16:01
← flijten left16:01
→ slonopotamus joined16:02
← dreiss_ left16:02
← whitman left16:03
← vinnix left16:03
← cylence left16:03
→ vinnix joined16:03
← glennpratt left16:04
→ dstufft joined16:04
bremner check-ref-format16:05
dstufft What's the easiest way to get a list of local branches that arn't being tracked on origin? I deleted some remote branches using git push origin :branch, but apparently that still leaves the branch in "git branch", I tried git remote prune origin, but apparently that only works if someone else deleted the remote branch :/16:05
→ RaceCondition joined16:05
← mcfedr left16:06
← capncodewash left16:06
← Alvo left16:07
← saschagehlich left16:07
← alextheger left16:08
sitaram bremner: thanks!16:08
→ RichardBronosky joined16:09
→ dfr|mac joined16:09
bremner thank my collaborator who put that note in the bash script we wrote together ;)16:09
sitaram bremner: erm... which one?16:10
→ niloc132 joined16:10
← mfischer left16:11
→ ReekenX joined16:12
← mklappstuhl left16:13
bremner sitaram: ron lee, debian guy16:13
← RichardBronosky left16:14
→ tatsuya__ joined16:14
← tatsuya_o left16:14
→ cesc joined16:14
→ Araxia joined16:15
→ RichardBronosky joined16:15
→ marienz_ joined16:15
→ nixmaniack joined16:15
muzone is now playing: http://home.no/mritz/mrender1.mp316:15
← omid left16:16
→ antoniojasr joined16:16
iElectric git add -i somehow screws readline and enter procudes ^M (using Linux and bash shell)?16:16
← RichardBronosky left16:16
slonopotamus if that's a question, the answer is: no16:17
← Error404NotFound left16:17
→ cybersphinx joined16:17
→ ddkilzer joined16:17
← cwang left16:17
← empity left16:17
→ zackiv31 joined16:17
← Arrowmaster left16:18
→ Arrowmaster joined16:18
iElectric slonopotamus: the questions is how to fix that or read more about it16:18
→ _psychic__ joined16:20
bremner iElectric: what terminal emulator are you using?16:20
← the_cybersphinx left16:20
← trupheenix left16:20
← simplechat left16:20
→ Kagee joined16:20
→ flowenol joined16:20
iElectric bremner: tmux16:20
→ glennpratt joined16:20
→ lorfds joined16:20
← robotmay left16:20
→ SethRobertson joined16:21
bremner iElectric: try without tmux?16:21
flowenol heya, im writing some shell scripts, and i need to do a git add without being in the repository directory how can i do it?16:21
→ xpot-mobile joined16:21
flowenol already tried --git-dir16:21
iElectric bremner: that works16:21
← canton7 left16:21
Kagee Can i push a .gitingore backwords in commit history, so if i checkout an old commit it will have the same .gitignore? I've just added a configfile w. passwords to .gitignore, and want to prevent a possibly readittion if someone checksout a old commit16:22
bremner iElectric: so some confusion about terminal types with tmux I guess.16:22
← marienz left16:22
← _psychic_ left16:22
_psychic__ → _psychic_16:22
iElectric hmm, that sux.16:23
→ nicxvan joined16:23
→ Adys joined16:24
→ soc42 joined16:25
← lorfds left16:26
→ booginga joined16:26
muzone is now playing: http://home.no/mritz/bts_2006.mp316:26
← ziro` left16:27
slonopotamus muzone: do you really think anyone cares?16:27
muzone slonopotamus: im really sorry16:27
its not me16:27
well, i made the track16:27
← xiong left16:27
muzone but its not me posting it, fucking mirc..16:27
slonopotamus :/ so fucking configure it16:27
muzone i will bro16:28
bremner points to #irssi16:28
marienz_ → marienz16:28
→ Heimidal joined16:28
← whit537 left16:29
← Adys left16:29
← cggaurav left16:30
→ joshteam joined16:30
← angelsl left16:30
iband → iband|away16:30
→ Error404NotFound joined16:30
flowenol anyone?16:31
iband|away → iband16:31
→ Adys joined16:31
→ slackstation joined16:31
← kumbayo left16:31
← _psychic_ left16:31
← cesc left16:31
→ _psychic_ joined16:32
← jalama left16:34
← bitkiller left16:34
← ajt left16:35
→ bitkiller joined16:35
→ ajt joined16:35
→ Jon47 joined16:35
← _psychic_ left16:35
← ajt left16:35
→ cbeams joined16:35
← Vile left16:36
→ ajt joined16:36
→ cylence joined16:36
→ btanaka joined16:36
→ _psychic_ joined16:37
← ramsey left16:37
→ alvaro_o joined16:37
→ jalama joined16:37
← alvaro_o left16:38
→ airborn joined16:38
← jalama left16:38
→ ramsey joined16:38
← iivvoo left16:38
→ iivvoo joined16:39
→ mrevd joined16:39
← jstemmer left16:39
← kR15t0 left16:39
← DarkAR left16:40
→ xiong joined16:40
← Guest99913 left16:40
→ Guest99913 joined16:40
Guest99913 → fisted16:40
← mrevd left16:40
→ stliu joined16:41
← _kud left16:41
→ trupheenix joined16:42
← glennpratt left16:42
← dankest left16:42
→ glennpratt joined16:42
← ASIRINeiluj left16:43
← _psychic_ left16:44
← crashanddie left16:44
← LouisJB left16:45
→ orafu3m joined16:45
← lacrymology left16:45
→ dreiss_ joined16:45
← orafu3m left16:45
→ _psychic_ joined16:46
→ j416 joined16:46
← wilmoore left16:47
← Myth17 left16:47
→ ivank_ joined16:48
→ kenperkins joined16:48
← ReekenX left16:48
→ ReekenX joined16:49
← ivank_ left16:49
→ ivank joined16:49
ivank how do i discard unstaged changes?16:49
→ RichardBronosky joined16:49
j416 ivank: git checkout or git reset16:50
← CannedCo_ left16:50
j416 with appropriate options.16:50
slonopotamus beware, working copy data loss possible16:50
→ cenuij joined16:50
← cenuij left16:50
→ cenuij joined16:50
→ CannedCorn joined16:50
ivank well, i have one file. i opened it with emacs tramp, but then end got all corrupted in network transfer16:51
all the changes are earlier in the file though16:51
← sikao_lfs1 left16:51
ivank i've staged the bits i want to keep16:51
j416 suggest you commit them16:51
← iXeno left16:51
slonopotamus so git checkout file (that'll restore working copy contents to what index has)16:52
→ wilmoore joined16:52
j416 (it's easy to undo a commit, but not easy to undo a reset working tree / index)16:52
ivank ok16:52
→ MADMADAWAR joined16:53
← ajt left16:54
→ the_cybersphinx joined16:55
← flowenol left16:55
← elyob left16:56
→ camilasan joined16:56
← noisebleed left16:57
→ radarek joined16:57
← nicxvan left16:58
← slonopotamus left16:58
← thannoy left16:58
→ gebi joined16:59
← cybersphinx left16:59
→ nicxvan joined16:59
← codebeaker left17:00
← davzie left17:00
← nicxvan left17:01
← JackWinter left17:01
→ saschagehlich joined17:03
← tonyj left17:03
← krosenvold left17:03
→ krosenvold joined17:04
← captainramen left17:04
→ dankest joined17:04
→ nicxvan_ joined17:05
→ mfischer joined17:05
← dreiss_ left17:06
→ nurey joined17:07
← robertfw left17:07
→ JackWinter joined17:07
→ nicxvan joined17:07
← localhost left17:08
iband → iband|away17:09
← werdan7 left17:09
← nicxvan_ left17:09
→ captainramen joined17:09
← RaceCondition left17:09
← duvcxk left17:10
← rfx_ left17:10
→ localhost joined17:10
← dfr|mac left17:11
← nicxvan left17:12
← Rvl left17:13
← dexter_e left17:13
← stliu left17:14
elliottcable albel727 › ಠ_ಠ17:14
albel727 › you don’t have to leave just because you disagree with me!17:14
← zodiak left17:14
iband|away → iband17:14
→ Rvl joined17:15
← johnkpaul left17:15
albel727 elliottcable: that was just to avoid highlighting. b/c I need some concentration now )17:15
→ metcalfc joined17:15
elliottcable <3 albel72717:15
→ dominiq joined17:16
elliottcable albel727 › good luck!17:16
albel727 thanks )17:16
→ dreiss_ joined17:16
→ _kud joined17:16
→ robotmay joined17:18
← ngulden left17:19
→ mordof joined17:19
← mordof left17:20
→ mordof joined17:20
mordof so.. I've got a development branch and a main branch. my development branch is, obviously, quite a bit further ahead then the master17:20
i was wondering how I would go about updating the master branch with what's currently in development?17:21
→ sar4j joined17:21
→ kerrick joined17:21
→ ColKurtz joined17:21
← kerrick left17:22
→ tatsuya_o joined17:22
→ kerrick joined17:22
← tatsuya__ left17:23
jmah mordof: git checkout master; git merge dev17:23
→ LiohAu joined17:23
mordof jmah: and that'll just put a new commit basically into master?17:23
← ReekenX left17:24
← PigeonFriend left17:24
→ primeras joined17:25
jmah if the dev branch is a child of master, master will point at the last dev branch commit (a "fast-forward")17:25
if there are commits on master since the dev branch was made, it will be merged17:25
← trupheenix left17:25
mordof ok, and then my dev commits after that won't mess with master still right?17:25
jmah right17:26
mordof awesome :) thanks17:26
jmah (once you git checkout dev)17:26
mordof right17:26
← baburdick left17:27
← resmo_ left17:27
mordof jmah: that... may have been bad..17:28
jmah: :\ my other branch is completely gone now17:28
← tatsuya_o left17:28
→ tatsuya__ joined17:28
primeras hi. my english isn't very well.17:28
i write on terminal17:28
git remote add17:29
jmah nothing i said would remove anything17:29
primeras but fails17:29
mordof jmah: nevermind, gitk just sucks :\17:29
primeras http://pastebin.com/hefZMCCB17:29
→ minijupe_ joined17:29
jmah primeras: what do you want to do?17:29
mordof jmah: checked it with git log and it's fine17:29
jmah mordof: yeah, gitk only shows the current branch by default (but you can twiddle that in the "view" menu iirc)17:30
primeras jmah: my git to file17:30
git server *17:30
← minijupe left17:30
mordof jmah: ohh, yeah.. there it is17:31
jmah: whew, that scared me, heh17:31
→ LouisJB joined17:31
→ churp joined17:31
jmah primeras: I don't understand. What language is good for you?17:31
primeras Turkish17:31
← sar4j left17:31
← axolx_ left17:31
mordof jmah: that also included all of the older commits to development :\17:32
→ tatsuya_o joined17:32
→ cybersphinx joined17:32
← tatsuya__ left17:32
jmah mordof: I thought that's what you wanted ("updating the master branch with what's currently in development")17:33
iband → iband|away17:33
mordof jmah: is that normally how things are supposed to be done? (i'm new to using git, sorry)17:33
jmah did you just want a single commit from the dev branch?17:33
mordof jmah: well, effectively it updates master to the current stable that's in development, but i didn't really want all that history in master17:34
that's only relevant to the development branch..17:34
jmah ok, first undo the merge17:35
← the_cybersphinx left17:35
jmah do you still have master checked out?17:35
mordof i checked out into development, but i'm going back17:36
does that work?17:36
jmah yep17:36
mordof so, git reset --hard ORIG_HEAD ?17:36
jmah I'm not sure about ORIG_HEAD, I'd look at the reflog17:36
git reflog show master17:36
shows what master has pointed at most recently17:37
then git reset --hard master@{<before-the-merge>}17:37
mordof jmah: yeah, the merge development is the last17:37
ohh ok17:37
ok, and do i need to commit that at all?17:37
→ Vile joined17:37
mordof or does it just go ahead and do that change..17:38
jmah nope, that changes "master" to point at a different commit17:38
mordof ok17:38
jmah (it's already a commit)17:38
mordof nods17:38
→ tewecske joined17:38
← MADMADAWAR left17:39
com4 is there a way to get a custom config option that a user has set in his repository on the centralized repository that he's pushing to?17:39
← dominiq left17:39
jmah mordof: so you can do a "squash" merge, which merges the files from the branch and records it as a single commit (throwing away the actual history)17:39
com4 in say, post-receive in particular17:39
← minijupe_ left17:39
jmah or probably better is "no-ff", which makes a true merge commit17:40
(which makes it easier to merge future changes from dev if you're keeping that branch around)17:40
mordof hm17:40
← Vile left17:40
mordof i'm going to continue working on development, and i'd like to just have a single commit essentially to master17:41
so i think the squash merge sounds about right17:41
← tureba left17:41
jmah no-ff sounds more like what you want17:41
mordof ok17:41
← cakehero left17:41
jmah I think of it like a database commit17:41
← tewecske left17:41
← Rvl left17:41
← CannedCorn left17:41
→ iXeno joined17:42
jmah (on master, it was at this state, then it jumped to the end state… the intermediate history is recorded, but master was never in that intermediate state)17:42
mordof jmah: hm, my friend just came back adn told me i should be using a rebase17:42
jmah but y'know, try one, reset, try the other17:42
← Phylock left17:42
← antoniojasr left17:43
→ Chillance joined17:43
← tatsuya_o left17:43
jmah mordof: I didn't think that was appropriate, but feel free to play (the reflog will be there if you need it)17:44
mordof jmah: i'm gonna try the rebase first, because he's had a huge amount of experience with git.. and quite frankly if i make a mess of things he'll be like "NOO LIKE THIS!!!" lol17:44
jmah :)17:44
→ tureba joined17:44
mordof jmah: from what i've seen so far, all actions can essentially be undone right?17:44
it's not like if i do something i can't fix it..17:44
→ johnathanb joined17:44
jast almost all of them17:44
jmah yeah17:44
mordof right17:44
i'm assuming there are some critical ones that will actually delete something17:45
jmah the most dangerous is working with uncommitted changes17:45
mordof ahh, yeah i can see that17:45
mess something up and it's gone17:45
jast git reset --hard destroys uncommitted changes17:45
git clean destroys untracked files17:45
jmah com4: not that I know of17:45
jast deleting a branch removes the log of changes to the branch, so commits can become unreferenced17:46
mordof ooh17:46
good to know17:46
jast running 'git gc' or something to the same effect can remove old objects when they are no longer referenced17:46
jmah (but if you'd checked out that branch recently, it'll be in the reflog for HEAD)17:46
← Kagee left17:46
mordof ok17:46
jast those are the important ones I can think of right now17:46
com4 jmah: I have one of those gut feelings that it's possible, because github has you set a hash as github.token and github.user which i reckon they read on the server side17:46
mordof thanks :)17:46
→ ajt joined17:47
mordof my master now says it's behind by 5 commits because of the merge and reset..17:47
i'd like to make sure those go away entirely17:47
← axl_ left17:47
mordof is that possible?17:47
→ axl_ joined17:48
mordof (if i make another commit, will they go away?)17:48
← johnathanb left17:49
→ ISF joined17:49
jmah com4: hmm. what do they do with github.token?17:49
← dreiss_ left17:49
← cortana left17:49
jmah mordof: did you push master after the first merge?17:49
com4 jmah: it's the api token. i'm not sure what they'd do with it17:49
← robotmay left17:49
mordof jmah: i put it back to before the merge with the reset17:50
← xamanu_ left17:50
jmah what's it behind of?17:50
iband|away → iband17:50
mordof jmah: everything that was in development when i did the merge17:50
→ xamanu_ joined17:50
← xamanu_ left17:51
jmah can you paste the message that says it's behind?17:51
mordof 1 sec17:52
→ DarkAR joined17:52
← alberto56 left17:52
mordof jmah: the rebase seems to have had the same effect as the merge17:52
jmah: but i don't know if that's because the rebase fast forwarded it17:53
→ pl0sh joined17:53
mordof jmah: the sha is the same for both the merge and the rebase, that's why i think that might've happened..17:53
jmah: did you want the reflog for master?17:53
jmah rebase re-writes the current commits so they're on top of the given branch17:54
mordof ah17:54
jmah if master was: A -> B -> production-fix17:54
→ alberto56 joined17:55
jmah and dev started at B -> workC -> workD17:55
then rebasing master on dev would make it17:55
mordof jmah: master has no new commits overtop of development17:55
jmah A -> B -> workC -> workD -> production-fix17:55
← _psychic_ left17:55
jmah right, so it just fast-forwarded it17:55
mordof ok17:55
jmah: is there any point to not having that history in master ?17:56
jmah what do you mean?17:56
mordof like.. all the commits to development, with either a rebase or a merge - it's going to include all of the commits in development17:56
is there any point trying to AVOID that and only bring the latest development commit into master?17:57
→ saysjonathan joined17:57
jmah it's kinda personal preference, but I don't think there is17:57
← bolt left17:57
→ zodiak joined17:58
mordof ok17:58
jmah if I find a problematic line, I'd rather have the full history than see that it came from a single giant commit17:58
mordof true17:58
i suppose that makes sense, master is supposed to be the full project17:58
→ centipedefarmer joined17:59
→ dexter_e joined18:00
pl0sh how can I remove a commit from my repo?18:00
→ dreiss joined18:00
→ derpadurr joined18:00
jmah pl0sh: can you describe your situation a bit more?18:00
→ tonyj joined18:00
pl0sh i have a repo which is forked from another one, so, I don't know why when I did a git fetch upstream; git merge upstream/master; it generated a commit for that merge, which is undesirable by the owner of the upstream repo18:02
← fisted left18:03
← _kud left18:03
← wilmoore left18:03
→ jalama joined18:04
jmah you can use reset to move your branch back to before the merge18:05
kevlarman probably easier to just flatten it with a rebase18:05
pl0sh look, this is the pull req I made, https://github.com/dragoonis/ppi-framework/pull/76/commits18:05
but we don't want the 2nd commit, which I didn't18:06
iband → iband|away18:06
→ linuxNewb joined18:06
→ bane_killgrind joined18:07
bane_killgrind hello18:07
can I just git add . before each commit to be lazy about it?18:07
jmah pl0sh: is your branch currently on 0bd61973?18:07
milki bane_killgrind: git commit -a does the trick18:07
o, but not for untracked right..18:07
→ fisted joined18:07
pl0sh git status shows: nothing to commit (working directory clean)18:07
bane_killgrind milki: it will find new files, deleted files?18:08
→ krz joined18:08
milki not -a18:08
pl0sh jmah: how can I check the hash?18:08
← airborn left18:08
bane_killgrind milki: another commit flag will though?18:08
jmah the most recent one of git log18:08
sp3001 → sp300018:08
milki bane_killgrind: try git add -A?18:09
jmah pl0sh: also, do you want your branch to have the changes from upstream or not?18:09
pl0sh my last commit is: 70203b18:09
→ wilmoore joined18:09
pl0sh jmah: of course18:09
jmah oh sorry, I was reading the log on GitHub backwards :/18:10
pl0sh but as they are on the upstream, I may not push them again, right?18:10
bane_killgrind milki i'll make a note to. just did my initial commits so it'll be a couple hours18:10
milki: i'll read about that though18:10
→ shintaku joined18:12
jmah pl0sh: we'll have to handle the commit(s) before the merge separately to the one after the merge18:12
← alberto56 left18:13
jmah those two commits are the only ones not in upstream/matser, is that right?18:13
← mordof left18:13
pl0sh I see, I know exactly what changes I made, is it easier if we just reset and let me do the changes again?18:14
jmah: correct18:14
jmah you could, but it's not that hard18:14
git checkout -b straighten 0bd6197318:14
→ alberto56 joined18:14
jmah (we'll work on a differently-named branch for now)18:15
git rebase upstream/master straighten18:15
← Chib left18:15
jmah git rebase --onto straighten master^ master18:15
→ shiba_yu36 joined18:16
→ subbyyy joined18:16
pl0sh Ok, I'll follow your instructions18:16
jmah (assuming all went cleanly, you can delete the straighten branch: "git branch -d straighten")18:16
pl0sh done, went cleanly18:17
so, what's next?18:18
→ ymasory joined18:18
jmah you probably want to just push to GitHub18:19
you'll need to push with -f, since we did some history re-writing18:19
← spaceonline left18:19
← wilmoore left18:20
pl0sh alright, that's cool, thank you so much :D18:20
→ bolt joined18:20
pl0sh https://github.com/dragoonis/ppi-framework/pull/76/commits18:20
jmah looks good!18:20
pl0sh thank you :)18:21
jmah no problem :)18:21
← booginga left18:21
→ Wizek joined18:21
→ baburdick joined18:22
← topeak left18:22
→ german joined18:22
← LouisJB left18:23
→ boombatower joined18:23
→ spaceonline joined18:23
← ArseneRei left18:23
← spaceonline left18:23
→ booginga joined18:24
→ whit537 joined18:25
← booginga left18:25
← kvanderw left18:27
→ kvanderw joined18:27
→ Jay_Levitt joined18:27
→ sh_sh joined18:28
← tango_ left18:29
← envi left18:29
→ tango_ joined18:30
→ dSebastien joined18:31
→ the_cybersphinx joined18:32
→ berserkr joined18:32
← saschagehlich left18:33
← cybersphinx left18:34
→ mekapses joined18:37
→ saschagehlich joined18:37
← soc42 left18:38
→ SmartViking joined18:38
SmartViking → Guest621618:39
Jay_Levitt So I'm updating my rails app from 3.0 to 3.1. On master, I did git checkout -b rails31, made a bunch of changes on the rails31 branch, committed, pushed to a new origin/rails31, and made rails31 a tracking branch. Meanwhile, we've made a bunch of changes on master. So back on rails31, I said "git rebase master", and when I'm done fixing conflicts, it tells me I've diverged from upstream. How could that be, and how should I fix it?18:39
→ whyking joined18:39
→ alexim joined18:39
→ CannedCorn joined18:40
kevlarman Jay_Levitt: don't rewrite published history18:40
Jay_Levitt kevlarman: oh, duh. you're right.18:40
I'll just merge instead.18:41
I wasn't thinking of it as published, because I don't know why because.18:41
cbreak Jay_Levitt: rebase the changes onto rails31 if you want to only have them there18:41
Jay_Levitt cbreak: I don't follow? isn't that what "git rebase master" would do?18:42
cbreak no18:42
git rebase rails3118:42
while on master18:42
just the ones that are not public18:43
but of course, if the commits are ok to stay on master, that's not something to do18:43
Jay_Levitt yeah, they're ok on master, it's published, and rails31 isn't ready for master yet. I don't need to rebase, we don't keep clean git histories, I was just teaching myself18:43
← alberto56 left18:43
← baburdick left18:43
iband|away → iband18:43
→ alberto56 joined18:44
ChanServ set mode: +v18:44
← alberto56 left18:44
mekapses If I have a remote project, but it has some files with local settings, what's the best way to do version control on the settings locally, but have the main files pushable to the server. I'm currently just ignoring them, (git rm --cached SETTINGSFILES) Thanks.18:45
→ baburdick joined18:45
Jay_Levitt Let's say I did want to keep histories clean, though, for the eventual merge onto master - and while origin/rails31 was "published", it was only to share code with a co-worker. Is the workflow to just git push -f rails31 and tell the co-worker to rebase?18:46
i.e. what's the workflow to keep clean, rebased histories with a hierarchy of shared repositories?18:47
← primeras left18:48
← j416 left18:48
← saschagehlich left18:49
→ minijupe joined18:50
→ saschagehlich joined18:50
→ gfto joined18:52
→ guufy1 joined18:53
← gfto left18:54
cbreak Jay_Levitt: or tell the coworker to reset18:54
Jay_Levitt cbreak: reset to where, though?18:55
cbreak the new head of the branch18:55
Jay_Levitt ah, ok18:55
somehow I thought if commits diverged there were two heads. It's Friday.18:55
cbreak there are18:57
one on your current system18:57
the other on the origin repo18:57
which is the same as the pulling coworker, presumably18:57
you force push, overwriting origin's head with your18:57
and if the coworker resets, he overwrites his head with yours18:57
of course, if he had local changes, they get nuked18:57
→ knifed joined18:57
Jay_Levitt oh, yes, so I still have to force push.18:58
cbreak in that case, rebasing is better18:58
Jay_Levitt ok, that's what I was missing.18:58
← friskd left18:58
← whyking left18:58
← akosikeno left19:01
→ sterlo joined19:01
← hyperair left19:02
→ hyperair joined19:02
← minijupe left19:03
← Jon47 left19:04
Jay_Levitt Thanks!19:05
← Jay_Levitt left19:05
← nurey left19:07
← tango_ left19:07
→ Octalot joined19:07
→ caseymcg joined19:08
→ tango_ joined19:08
→ leandrosansilva joined19:08
← german left19:10
← gebi left19:11
iband → iband|away19:13
→ ericdc joined19:13
→ johnkpaul joined19:14
← baburdick left19:14
← Swimming_Bird left19:14
→ baburdick joined19:15
→ Jon47 joined19:15
← [intra]lanman left19:15
← dexter_e left19:16
← Spyro left19:16
← berserkr left19:17
→ minijupe joined19:17
→ macabre joined19:18
← dvaske left19:20
← jspiros left19:22
← knifed left19:23
← leandrosansilva left19:25
→ leandrosansilva joined19:25
← JeffJohnson left19:27
← Squarism left19:27
→ cggaurav joined19:27
→ jspiros joined19:28
← gusnan left19:28
→ acl_ joined19:28
→ JeffJohnson joined19:28
← JeffJohnson left19:28
→ JeffJohnson joined19:28
iband|away → iband19:29
→ _psychic_ joined19:29
← joshteam left19:30
→ Squarism joined19:31
← Jon47 left19:33
← minijupe left19:33
→ glennpratt_ joined19:35
← Jackneill left19:36
← kerrick left19:37
→ linusoleander joined19:37
→ minijupe joined19:37
← multi_io left19:38
→ joshteam joined19:38
→ celestius joined19:38
← glennpratt left19:38
← ciscoftw left19:39
→ binarychef joined19:40
→ ilyam joined19:40
← niloc132 left19:40
→ [intra]lanman joined19:41
← [intra]lanman left19:41
→ [intra]lanman joined19:41
→ Dreamer3 joined19:41
→ niloc132 joined19:42
→ booginga joined19:43
← baburdick left19:44
→ baburdick joined19:46
→ Targen joined19:47
→ MrSoundless joined19:47
→ airborn joined19:48
→ Lemon|work joined19:49
Lemon|work what is the command to see the pull and fetch url's of a remote?19:49
→ lacrymology joined19:49
thiago git remote -v19:50
lacrymology I made a mess, I named a branch -t900 and now I cannot rename it because it thinks -t is an option19:50
→ Kream joined19:51
Lemon|work thanks19:51
← davi_ left19:51
bremner lacrymology: try: git branch -d -- -t90019:51
or rm .git/refs/heads/-t90019:51
← niloc132 left19:51
→ Spyro joined19:52
lacrymology bremner: great, thanks19:52
Kream Hi all. Even though ~/.gitignore has lines specifying .*.swp and *.swp, and even though git config contains core.excludefiles=/home/username/.gitignore, a file called static/css/.main.css.swp is not being ignored. What do I do to make git ignore the file?19:52
→ MrSoundless- joined19:53
← ajt left19:54
← vinnix left19:54
→ ajt joined19:55
← MrSoundless left19:55
rane_ are you tracking the file?19:55
→ wilmoore joined19:55
thiago Kream: what is the heading in git status under which this file appear?19:55
← ilyam left19:55
rane_ tracked files can't be ignored19:55
thiago "Modified"?19:55
or "Untracked"?19:55
→ macmaN joined19:55
Kream Untracked, thiago19:55
rane_ cool19:56
→ starlays joined19:56
starlays how can i "recursivly" update all the branches in git?19:56
Kream http://pastebin.com/9X7VTerX19:56
← Squarism left19:56
← iband left19:56
thiago Kream: then my guess is that the core.excludefile isn't taking effect19:57
← ajt left19:57
thiago starlays: do you mean update all local branches by pulling their remotes?19:57
starlays thiago: yes19:57
Kream thiago: and how would I fix that?19:57
→ cybersphinx joined19:57
← caseymcg left19:57
← jmah left19:58
thiago starlays: no, there's no command to do that19:58
← radarek left19:58
thiago Kream: I don't know what exactly is wrong19:59
starlays thiago: really?19:59
thiago starlays: pulling is a user-interactive operation19:59
starlays: it requires checking out each of those branches and each pull may fail due to conflicts19:59
starlays thiago: :(((20:00
← the_cybersphinx left20:00
starlays thiago: i will do it with -f20:00
thiago starlays: pull doesn't have an -f option20:00
starlays thiago: are you shure?20:00
Kream thiago: I made a .gitignore file in static/css containing *.swp and .gitignore* and it's ignored20:00
iheffner starlays: https://github.com/TyeMcQueen/whitepages-git-utils/blob/master/git-bs20:01
Kream yeah, it doesn't look like the core.excludefiles directive is working20:01
wtf... have i found a bug?20:01
thiago starlays: it does, but it's for git fetch -f and you'd usually never need to use it.20:01
Kream: or you made a typo in "core.excludesfile"20:02
← Error404NotFound left20:02
starlays thiago: i`m using it to ignore changes because i`m so far behind the project20:02
thiago: my work is outdated20:02
→ apok joined20:03
thiago starlays: that has nothing to do with git fetch -f20:03
→ fraggeln joined20:03
Kream core.excludefiles=/home/username/.gitignore20:03
thiago Kream: core.excludesfile20:03
starlays thiago: i said pull -f20:04
thiago starlays: yes, git fetch -f20:04
Kream jesus20:04
fraggeln does anyone know if there is some sort of ircbot that can track commits to github?20:04
starlays thiago: ok, thankyu for yout help20:04
← cenuij left20:04
thiago starlays: the -f option is passed to fetch20:04
starlays thank you*20:04
Kream brb head<--brick20:04
starlays thiago: aaa, ok ok then20:04
thiago: thank you20:04
← Daniel0108 left20:05
starlays iheffner: thank you, i`ll have a look at that20:05
← MrSoundless- left20:06
← CannedCorn left20:07
← minijupe left20:08
→ whyking joined20:09
lahwran man git init20:09
no?20:09
man git-init20:09
sadface.20:09
→ lorfds joined20:09
lorfds I want to make a past commit the current head20:09
how do i do that20:09
or, alternatively, merge a specific commit with the HEAD, which will add back some files that were removed by a specific commit20:10
← ramsey left20:10
thiago lahwran: website is down20:10
lahwran well darn it, now I'll have to actually use the man command20:10
life is cruel20:10
→ ASIRINeiluj joined20:10
Mpenz hi sitaram: A question, does it make sense to disallow setting the C on repos that are non-wild?20:11
→ ramsey joined20:11
→ whartung joined20:12
← shintaku left20:12
← camilasan left20:13
→ gusnan joined20:13
jast lorfds: you can re-add a commit by using 'git cherry-pick' on it (optionally you can make it just apply the changes instead of creating a new commit from them)20:13
→ friskd joined20:13
→ alberto56 joined20:14
→ jmah joined20:15
← baburdick left20:15
fir31ight hi, does anyone know if it's possibly to re-write history on an already pushed commit?20:15
to possible ammed that commit?20:15
→ Daniel0108 joined20:15
Kream thiago: the only thing that worked is setting a .gitignore file in that particular directory. Nothing else worked.20:16
thiago Kream: not even spelling right?20:16
→ baburdick joined20:16
→ codebeaker joined20:16
jaeckel fir31ight: you can amend the commit in your local repo and add -f to force the push, but you should not do that20:17
Kream thiago: not even.20:17
and believe me, I've been trying to fix this little shit of a problem for about 45 minutes20:17
jaeckel you can do it if you're 100% sure that the repository has not been merged by someone else20:17
← SimonNaa left20:17
fir31ight jaeckel: so checkout the commit and ammend it?20:17
jaeckel you should simply revert the comit20:18
fir31ight jaeckel: test environment so it's ok20:18
jaeckel ah ok20:18
fir31ight revert?20:18
hmm20:18
jaeckel then you can read man git rebase20:18
on how to manipulate the tree effectively :D20:18
→ niloc132 joined20:18
← bibinou left20:19
fir31ight but I have to some how delete that commit from the server20:19
← mekapses left20:19
jaeckel to delete the whole commit you should rebase the repo20:19
fir31ight ok thanks.20:20
→ jargon- joined20:20
codebeaker Is there any way to merge two commits (already pushed to a remote) into one, some nicer version than `interactive rebase`, format patch (correct, merge two commits), 2x revert (HEAD and ~1) and reapply the patch20:20
→ MUILTFN joined20:21
← heptadecagram left20:21
jaeckel codebeaker: you can squash these 2 commits in the rebase process20:21
codebeaker right, but then I'll have to force-push the branch (master)20:22
which would be ok, actually - nobody is relying on it, and anyone who pulled it… (open source) - well that's their problem20:22
← mikeyutley left20:22
← Targen left20:22
jaeckel but why would you do it?20:22
codebeaker but I've been drilled that this is considered /really/ bad form20:22
jaeckel just fix it and commit it20:22
yeah it's bad20:22
codebeaker mostly because I want to offer an upstream one coherent patch, normally I'd rebase -i, format the patch and email them20:23
→ mikeyutley joined20:23
codebeaker … but in this case, they'll pull directly20:23
jaeckel uhm20:23
SethRobertson I strongly recommend against rewriting publicly shared history.20:23
jaeckel +120:23
SethRobertson However, you can create a second branch representing second level upstream and write the public-history on that.20:23
Or use StGit or the like20:23
glennpratt_ → glennpratt20:24
codebeaker ok, so totally with you guys on not rewriting history20:24
how about deleting the remote branch, and reputing it with a different history20:24
is that just as bad ?20:24
repushing*20:25
← macmaN left20:25
SethRobertson It is just as bad. To the external user who might have the problem it is indistingusable from rewriting history20:25
← binarychef left20:25
→ asimpletest joined20:26
codebeaker ah, ok -20:27
→ greggyNapalm joined20:28
→ Targen joined20:28
codebeaker that's quite interesting, at least in my head it seems like there should be a way to create a "compound commit" of HEAD~1, as one whole unit… incorporating the previous two20:28
SethRobertson You can do it if you really need to, but some aesthetic is probably not a good enough reason. All other users have to do special stuff (`git pull --rebase`) and if they tagged or branched from the original history, they will be really unhappy.20:28
codebeaker but I can't explain myself better than that20:28
greggyNapalm Hi All, tell me please, is it possible to make a "link" from one git repo to another?20:28
SethRobertson There is. You just can't do it without rewriting history. You can create *new* history which looks like that just fine (the second branch thing I was talking about).20:29
greggyNapalm to make some file from one repo to be a link to file which stored to another20:29
← krz left20:29
codebeaker ah, SethRobertson thanks for the advice (sorry if i seemed like I was being awkward)20:29
← ISF left20:29
→ cro5point joined20:29
SethRobertson greggyNapalm: You probably want git-submodules or gitslave, with the file in question being a symlink into the subproject20:30
→ cenuij joined20:30
← cenuij left20:30
→ cenuij joined20:30
→ macmaN joined20:30
→ soulcake joined20:30
greggyNapalm ok, thx20:30
← cro5point left20:31
→ ziggles joined20:32
← iXeno left20:32
← Textmode left20:33
→ CannedCorn joined20:33
← axl_ left20:33
→ iXeno joined20:33
→ bj0rn2 joined20:34
→ Vortex34 joined20:34
bj0rn2 I used git-filter-branch and now I have duplicate commits in the history.. is this to be expected? can they be merged?20:35
→ minijupe joined20:36
← boombatower left20:36
thiago bj0rn2: yes. no20:36
→ boombatower joined20:36
bj0rn2 bummer. but thanks for the info.20:38
→ robertfw joined20:38
→ Jay_Levitt joined20:38
→ Joefish joined20:38
fir31ight jaeckel: man this is a lot of work ;)20:39
← asimpletest left20:39
→ asimpletest joined20:39
← asimpletest left20:40
→ asimpletest joined20:40
→ pteague joined20:41
← asimpletest left20:42
pteague in git log messages for merges between branches it lists the 2 sha strings for the 2 versions... anybody know which is the older & which is the newer version? i.e. commit 8d585ea6faf99facd39b55d6f6a3b3f481ad0d3d \ Merge: 3cbb6aa 3ac015d \ ... do i need to `git diff 3cbb6aa 3ac015d` ?20:42
fraggeln does anyone know if there is some sort of ircbot that can track commits to github?20:42
→ NoiseEee joined20:42
← Heimidal left20:42
thiago pteague: git log on each and look at the date20:43
esc fraggeln: look into github service hooks20:44
← murilobr left20:44
cannonball fraggeln: https://github.com/mmueller/supybot-git , never messed with it though.20:44
← whyking left20:44
fraggeln cannonball: thanks, ill have a look20:45
esc: I can't code :)20:45
cannonball fraggeln: Go ask in #repoforge, they have an irc bot that posts commits to the IRC channel.20:45
→ HG`` joined20:45
esc fraggeln: um, its a webinterface, you just click on what channel you want and some other stuff, and it works20:45
← baburdick left20:45
→ RaceCondition joined20:46
→ cakehero joined20:46
cakehero → savant20:46
→ axl_ joined20:46
fraggeln esc: well, I want an ircbot, not a webinterface :)20:46
← Martin_ left20:46
fraggeln cannonball: ill bug them and ask :)20:46
→ Lars_G joined20:47
→ baburdick joined20:47
esc you can just configure the ircbot on github20:47
Lars_G Can I remove a file from my git clone (without removing the file only the tracking), without pushing that removal to my parent?20:47
← Lemon|work left20:48
esc fraggeln: or did you want something that works for arbitrary git-repos, not just ones on github?20:48
kevlarman Lars_G: no20:48
apok Lars_G: .git/info/exclude might work20:48
Lars_G kevlarman: thanks20:48
hmmm20:48
apok: Good idea too.20:48
kevlarman Lars_G: you can't ignore a tracked file20:48
fraggeln esc: I want our private repos to be notified in a ircchannel :)20:49
← HG` left20:49
kevlarman and you can't have local changes that don't get pushed20:49
esc fraggeln: oh, sorry, i misunderstood20:49
fraggeln esc: no worries mate :)20:49
→ Heimidal joined20:50
→ drizzd joined20:50
→ Swimming_Bird joined20:53
← alexim left20:55
→ antoniojasr joined20:55
← fpcfan left20:56
← bartek left20:57
→ fpcfan joined20:57
← minijupe left20:57
→ cher joined20:58
→ alexim joined20:58
← Jay_Levitt left20:58
← gchristensen left20:59
→ minijupe joined20:59
→ issa joined20:59
← axl_ left21:00
→ EricInBNE joined21:00
← greggyNapalm left21:00
← jalama left21:01
← kadoban left21:01
→ diegoviola joined21:01
← glennpratt left21:02
← tommyvyo left21:02
← fpcfan left21:02
← jcromartie left21:02
← MUILTFN left21:02
← sonnym left21:02
→ glennpratt joined21:02
→ murilobr joined21:02
floppyears how well do git flow and gerrit work together?21:04
→ workmad3 joined21:05
→ SixEch0 joined21:05
→ fpcfan joined21:05
← cannonball left21:06
← mlncn left21:06
← juvenal left21:06
→ StuckMojo joined21:07
← Dave^|| left21:07
StuckMojo is there a "master" gitignore?21:07
← bj0rn2 left21:07
← Lars_G left21:07
StuckMojo i'd like to always ignore *.swp21:07
stoopid vim swap files21:07
→ ilyam joined21:08
← sorin left21:08
→ kpreid joined21:10
→ talios joined21:11
← johnkpaul left21:12
← alex__c2022 left21:13
← leandrosansilva left21:14
StuckMojo nm, got it21:15
?21:15
hmm21:15
sorry21:15
← NoiseEee left21:16
StuckMojo yeah so: ~/.giconfig: core.excludesfile = ~/.gitignore21:16
thx21:16
← baburdick left21:16
← StuckMojo left21:16
→ baburdick joined21:17
→ wbednarski joined21:17
← ping-pong left21:17
→ mekapses joined21:17
← Swimming_Bird left21:20
← issa left21:21
← Raging_Hog left21:22
→ sorin joined21:22
← eijk_ left21:22
→ eijk joined21:23
← CannedCorn left21:24
← murilobr left21:24
← Spockz left21:25
→ mxweas_ joined21:25
← codebeaker left21:26
← mfischer left21:26
← dSebastien left21:26
← HG`` left21:27
→ CannedCorn joined21:27
→ mlncn joined21:27
← guufy1 left21:28
← shiba_yu36 left21:28
← dv310p3r left21:28
→ mordof joined21:28
armenb hello...is it possible to push from one bare repository to another?21:29
linusoleander How do i print the current changes? I want to be able to diff the not yet committed code and the current commit21:29
← mordof left21:29
→ sythe joined21:31
← TeckniX left21:31
→ pantsman joined21:32
← pantsman left21:32
→ pantsman joined21:32
← Noctifer left21:33
← depressed left21:33
iheffner man git-diff21:33
→ dexter_e joined21:34
→ depressed joined21:34
← minijupe left21:35
← mlncn left21:36
niloc132 linusoleander: git diff --cached21:36
linusoleander Yeah, thanks!21:37
Hehe, just found this snippet to figure out the most used command on the system.21:37
history | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl | head -n1021:37
→ jutaro joined21:38
linusoleander 18% of all my commands are used for git21:38
niloc132 linusoleander: save some finger milage, and make alias, and possibly set up git bash autocomplete21:39
← ASIRINeiluj left21:40
linusoleander niloc132: My most used git command is 'gg'21:41
← eijk left21:41
linusoleander Second 'gp'21:41
niloc132 what do you have those aliased to?21:41
→ tatsuya_o joined21:41
→ ginabc joined21:41
→ minijupe joined21:41
→ Francisc joined21:41
← wbednarski left21:42
linusoleander niloc132: https://github.com/oleander/dotfiles/blob/master/bash/aliases#L321:42
ChanServ set mode: +v21:42
→ eijk joined21:42
← jedahan left21:42
Francisc Evening.21:42
← DarkAR left21:42
← SixEch0 left21:42
linusoleander Hmm, gg are just pointing at another bin, anyhow, gg is just git add . && git commit -v -a -m "$*"21:43
niloc132 hmm, i prefer a little more control, `git add -p` to queue up changes21:43
Francisc If I stage a file, but not commit. Then change that file and not stage it again. What happens when I commit?21:43
← whit537 left21:43
← ginabc left21:44
niloc132 give me a chance to review my own changes before someone else whines about my mistakes21:44
Francisc: it will commit the staged changes only21:44
you can verify this with git diff (what is different staged/committed vs working dir) and git diff --cached (what is different committed vs staged)21:44
Francisc And if I run git status I should see the unstaged file right?21:44
niloc132 status will show you staged and unstaged, so you know what is queued jup21:45
Francisc So it commits the staged one, and leaves the unstaged one as unstaged modified, yeah?21:45
niloc132 you can use this to see that a file has some staged and some unstaged changes21:45
← LiamH left21:46
niloc132 i'd encourage you to experiment and see, but yes, i think you have the gist of it21:46
Francisc OK, thank you.21:46
← baburdick left21:46
→ baburdick joined21:47
← savant left21:47
← ph^ left21:48
← mxweas_ left21:50
← afief_ left21:52
← Spyro left21:52
→ Spyro joined21:53
← Spyro left21:53
→ Spyro joined21:53
← prot0n_ left21:54
← ColKurtz left21:54
jcarouth → zz_jcarouth21:55
← Samoi left21:55
→ axl_ joined21:56
← joshteam left21:56
→ Samoi joined21:57
← tmz left21:58
→ tmz joined21:58
→ interopcop joined21:59
← axl_ left21:59
→ qknight joined21:59
→ ColKurtz joined21:59
← starlays left21:59
← drizzd left21:59
← ericmuyser left22:01
→ axl_ joined22:02
← dexter_e left22:03
← macabre left22:03
← AaronMT left22:03
→ lorfds_ joined22:03
→ mordof joined22:03
← lorfds left22:04
lorfds_ → lorfds22:04
mordof grrrr22:05
Francisc git diff --cached is diff between staged and unstaged WHILE git diff HEAD is between staged and repo?22:05
mordof it's telling me my master branch and 'origin/master' have diverged, and have 2 and 1 different commits each, respectively22:05
kevlarman Francisc: other way around22:05
err no22:05
mordof i have no idea how to fix this o.o22:05
Francisc :) Thanks.22:05
kevlarman git diff --cached is between the index and head22:05
git diff HEAD is between the working copy and HEAD22:06
Francisc Ah.22:06
→ davetoo joined22:06
← talios left22:06
niloc132 and git diff is working copy and index22:06
hadnt thought of git diff HEAD before, thats a good thought22:06
Francisc Index is repo latest commit?22:06
niloc132 no, index is staged changed, uncommitted22:07
Francisc I see.22:07
→ Rvl joined22:07
mordof can anyone help me get my master branch and 'origin/master' on the same page? honestly i thought they were the same thing22:07
Francisc Then what is HEAD? I thought head was staged modified uncommited.22:07
mordof is new to git22:07
niloc132 mordof: origin/master is what is on the remote 'origin'22:07
mordof niloc132: ah22:07
niloc132: so how do i get them to synch up?22:08
niloc132 you might try `git merge origin/master` to bring master up to date with the remote22:08
mordof hm22:08
niloc132 and then `git push origin master` to push that merge remotely22:08
it really depends on what kind of workflow you are after22:08
i like rebases for that sort of thing, but the merge will probably be fast forward anyway22:08
mordof niloc132: that worked.22:08
← Rvl left22:09
davetoo ok, I have a mess to fix, hope this is not too github-specific: essentially I want to make a branch from origin/master called origin/oldmaster, and then point origin/master back about 18 commits. Even when I point origin/HEAD elsewhere, Github won't let me "push origin :master" to just clobber it.22:09
iheffner niloc132: can't ff when the two diverged, but merge works22:09
davetoo what is the terminology I'm looking for to re-point master back several commits?22:10
niloc132 err, yeah, brain fart :)22:10
davetoo origin/master, specifically.22:10
← sh_sh left22:10
iheffner davetoo: not sure if github will take push --force, but that'd be the "typical" way22:10
davetoo: but if anyone else has pulled, you're likely wasting effort.22:11
davetoo I tried that; perhaps it was about the time that they were broken a few minutes ago.22:11
→ Modius joined22:11
niloc132 if github wont take a force, go to the admin part of your page, change another branch to be default, then delete origin/master22:11
Francisc There's a #github channel here.22:11
niloc132 `git push origin :master` to delete it remotely22:11
mordof niloc132: AHHH it's a mess!! lol22:11
niloc132 then you can push again, and reset it as local22:11
davetoo There are three other folks working on the project, so we should be able to coordinate.22:11
niloc132 err, s/local/defaul/22:11
mordof niloc132: my repo is a disaster ;_;22:11
davetoo 'k thanks22:11
mordof grabs a screenshot22:11
← jutaro left22:12
davetoo tries to remember a pastebin-equivalent for images22:12
mordof niloc132: http://img7.imagebanana.com/img/swd32nz3/Selection_022.png22:12
sitaram Mpenz: it is a no-op on non-wold repos22:12
niloc132 mordof: master is the same as origin/master in that image22:13
isnt that what you want?22:13
mordof niloc132: development and master, and origin/master should all be together at the latest22:13
niloc132: the only thing that should be off is the slow_indicies22:13
niloc132 then you need to switch to development and bring it up to date (that will be a ff merge)22:13
and then push it to the remote22:13
← davetoo left22:13
→ cstephens4 joined22:14
Francisc What is HEAD if it is not index (=staged, modified, uncommited)22:14
mordof niloc132: so i should do git merge master?22:14
niloc132: does it ff by default?22:14
niloc132 it defaults to it, yes22:14
mordof ok22:14
niloc132 ff==fast-forward, meaning just pile on commits22:15
mordof nods22:15
niloc132 Francisc: head is the last commit22:15
index is the stuff staged to be the _next_ commit22:15
Francisc Oh, so it's the commit itself. I see.22:15
mordof niloc132: now the remotes development is out of place ;_; why are they all out of sync... ahhh i'm going insane22:15
niloc132 the remote is 'out of place' because you havent pushed the change you made to the local developemnt branch22:16
mordof oh right right22:16
← cstephens4 left22:16
Francisc When I reset HEAD, why does it clear staged files then?22:16
← linusoleander left22:16
niloc132 unless you use --hard, it just unstages them22:16
→ linusoleander joined22:16
niloc132 the changes are still in your working dir22:16
mordof niloc132: ugh.. i don't like the fact that now it's bypassed a couple items -.-22:17
niloc132: i had it all on the same line, which i would really like to get back22:17
← beatak left22:17
niloc132 mordof: i'm afraid i dont follow you22:17
Francisc When I clear all staged files (make them unstaged) I run git reset HEAD.22:17
mordof niloc132: i'll take another screenshot22:17
niloc132 Francisc: yeah, or just `git reset`, same thing22:17
← TomyLobo left22:17
niloc132 that makes them all unstaged, not in HEAD or index, right? or am i being dumb again?22:18
mordof niloc132: http://img6.imagebanana.com/img/ow0anjud/Selection_023.png the left line should be straight all the way up22:18
niloc132: but i'm afraid i messed it all up, is there a way to fix this?22:18
Francisc OK. It is unclear to me why HEAD would clear staged files when it means last commit. That's why I thought HEAD is list of staged files next to be commited.22:18
← GunArm left22:18
niloc132 mordof: that looks okay... what are you worried about?22:18
the extra line just means that you had two divergent branches for a bit, but they are merged again22:19
mordof niloc132: that was only because of mistakes of me committing things, that's not how it should be22:19
niloc132 the same commit appearing twice isnt a big deal either, since they merged - just make sure the code works22:19
mordof hm22:19
i suppose it doesn't matter too much as long as they're all on the right track now22:20
niloc132: the main problem is that i don't understand how that ended up happening, lol.22:20
niloc132 yeah, hard to say without going back through what you did22:20
mordof niloc132: i did a commit to development, checkout to master, rebase dev to master. but it didn't account for some removing of comments in dev, so i went back into dev and did a commit amend, then tried to rebase master22:21
but the commit amend didn't take right for some reason22:21
dankest I just changed the name of the folder containing my git repo, and now I can't connect to github. What do I need to change?22:21
mordof so i got fed up with it and did a new commit and tried to rebase that, lol22:21
:\22:21
thiago mordof: that's because of the history rewrite22:21
when you amended, you rewrote history22:21
mordof ah22:21
thiago a base should never be rewritten22:21
Francisc OK, to be sure I understood: git diff = diff between staged and working dir ;;; git diff --cached = diff between staged and unstaged ;;; git diff HEAD = diff between last commit and staged. Please tell that's right. :)22:22
mordof thiago: so there's no way to go back and fix that up?22:22
thiago Francisc: not right22:22
niloc132 mordof: the amend did it probably22:22
Francisc git diff HEAD between last commit and working dir sorry.22:22
niloc132 yeah, like thiago said :)22:22
thiago Francisc: git diff = stage (-) to working dir (+)22:22
Francisc OK.22:22
niloc132 git diff HEAD difference between unstaged and last commit22:23
thiago Francisc: git diff --cached = from last commit (-) to stage (+)22:23
mordof i'll just try to avoid that in the future, lol..22:23
it's all caught up now22:23
thiago Francisc: git diff HEAD = from last commit (-) to working dir (+)22:23
dankest Would changing the name of the cloned-into folder make it so I can't connect to my remote repo?22:23
thiago Francisc: git diff HEAD is the combination of the other two22:23
← nixmaniack left22:23
→ lastk joined22:23
→ mytec joined22:23
thiago dankest: no22:24
dankest thiago: thanks22:24
lastk hi guys, i made a mistake on a rebase, is possible to unmake the rebase?22:24
thiago lastk: git reset --hard <the commit you want to be in>22:24
lastk: use git reflog to find the commit you'd like to be in22:24
← kvanderw left22:24
← lorfds left22:25
→ robotmay joined22:25
lastk thiago : good, thank you22:25
← robotmay left22:25
← mandric left22:25
← q0rban left22:25
← boombatower left22:26
Francisc Thank you thiago and niloc132. Clear.22:26
→ boombatower joined22:26
niloc132 dankest: github seems dead for me too - its them, not you22:26
→ jedahan joined22:26
← glennpratt left22:27
dankest niloc132: haha just noticed. Thank god for that.22:28
← dankest left22:28
→ gchristensen joined22:28
nevyn wereHamster: that lists the commits in a branch. I want a list of branches by last commit22:29
→ the_metalgamer joined22:29
→ kadoban joined22:30
thiago nevyn: see if git showbranch is what you want22:30
nevyn git showbranch doesn't exist... in my version of git.22:31
wereHamster git show-ref22:32
← pantsman left22:34
← jedahan left22:35
mordof niloc132: oh i know why it splits - i've got two different commits that have the same parent22:35
← xpot-mobile left22:35
← warthog9 left22:35
← booginga left22:35
← w0bni left22:36
→ wyszo joined22:36
← interopcop left22:36
Francisc Is there a difference between git reset HEAD and git rm --cached ?22:38
kevlarman yes22:38
← centipedefarmer left22:38
Francisc What's the difference, please?22:38
jast the first returns the file to its state in the most recent commit22:39
Francisc I know the last unstages staged files.22:39
jast in the index, that is22:39
i.e. it unstages changes to the file22:39
the latter stages a deletion of the file, i.e. it would no longer be part of the next commit22:39
Francisc So it resets a staged file to the version in the last commit, but does not touch the working directory?22:39
← workmad3 left22:39
jast yes22:39
Francisc The reset HEAD. ^22:39
jast but note22:39
this only applies if you do specify a filename as an additional argument22:40
otherwise it unstages *all* changes22:40
Francisc rm --cached <file> unstages a file, it does not remove it from the commit or working dir, right?22:40
jast yes22:40
uh wait22:40
kevlarman Francisc: it doesn't unstage the file, it stages the deletion of the file22:40
→ guufy1 joined22:40
← Amorphous left22:40
jast just to clarify: it removes the file from the index, which means that the next commit will no longer contain the file22:40
Francisc Oh.22:41
jast it doesn't remove the file from previous commits nor the working tree22:41
Francisc But if I checkout, it won't have that file anymore?22:41
Checkout the last commit.22:41
Not previous ones.22:41
jast that one is already checked out, isn't it22:41
Francisc Yup.22:41
Thanks.22:41
jast so nothing would happen at all :)22:41
Francisc Yeah. Got it.22:41
→ Enchilada joined22:41
jast remember, what's in the index (=staged) only affects the next commit you're going to make... nothing else22:42
← gusnan left22:42
Enchilada How can I remove all .svn files from a directory (recursively)?22:42
Francisc Thanks, jast.22:42
jast Enchilada: you mean the .svn subdirectories with all their contents?22:42
Enchilada I want to delete all .svn directories, and then move to git22:42
yeah dirs, not files :)22:42
jast (note that that isn't a git question ;))22:42
Enchilada yeah but I didn't want to piss off #svn22:43
:P22:43
jast well, try this: find -name .svn -exec rm -rf '{}' +22:43
be sure to run it in the right place :)22:43
kevlarman jast: i'd add -type d just to be safe22:43
jast sure, why not22:43
iheffner Enchilada: svn export rather than checkout22:44
jast if you've got a good shell (=zsh), you can use: rm -rf **/.svn(/)22:44
kevlarman also -delete is usually better than -exec, but not in this case22:44
jast I know22:44
kevlarman actually, git svn clone rather than export or checkout22:44
to preserve your history22:44
jast yeah, but then you still don't need the .svn subdirs in the working copy anymore :22:45
:}22:45
Enchilada hmm22:45
kevlarman jast: you don't git svn clone in a working copy22:45
jast my point exactly22:46
Enchilada are such clones "fully compatible"? i mean, won't git have any problems with working with svn history?22:46
kevlarman Enchilada: if it's a standard layout then no22:46
if it isn't then it can take some effort22:46
but for one time conversions it's not an issue22:46
Enchilada you mean trunk,branch,tag?22:46
kevlarman yeah22:46
Enchilada i've got that22:47
ok i'm going to read about clone22:47
thanks22:47
← RaceCondition left22:47
jast in that case 'git svn clone' can probably convert your repository history to git22:47
← Ryback_ left22:47
← baburdick left22:47
Francisc If I'm on a Windows machine, do I want Git to replace CRLF with LF?22:48
mordof Francisc: no22:48
→ Lemon|work joined22:48
Francisc Thanks.22:48
→ baburdick joined22:49
Francisc Git doesn't covert it back if I checkout, does it?22:49
→ oriba joined22:49
mordof i have no idea on that22:49
kevlarman Francisc: that setting can cause problems22:49
mordof all i know is that CRLF is the windows newline22:49
← mekapses left22:49
kevlarman mordof: most decent windows programs understand unix line endings22:49
Francisc Nodepad.exe doesn't. I won't say more. Haha.22:50
kevlarman Francisc: qed22:50
Francisc Was thinking that Git does this for crossplatform reasons, but converts back to CRLF on Windows.22:50
It's the default setting to convert LF to CRLF.22:51
← gchristensen left22:51
Francisc I'll change the config.22:51
iheffner for the windows user, would smudge / {other way} rules be used for crlf / lf fixes?22:51
kevlarman Francisc: default on msysgit, and it causes far more problems than it solves22:51
Francisc Thank you.22:51
kevlarman Francisc: input may be useful to keep others from yelling at you about leaking \r's into your commits22:51
Francisc core.autocrlf should be true then, right?22:51
kevlarman no22:52
input or false22:52
true is dangerous22:52
→ warthog9 joined22:52
Francisc OK.22:52
It's for my own playing around with Git at the moment. No "others"22:52
jast ideally you want LF inside the repo history22:52
makes collabs lots easier22:52
kevlarman (input will s/\r\n/\n/g when commiting)22:52
jast if you're not collaborating, feel free to ignore line endings22:52
Francisc Not for now.22:53
← axl_ left22:53
jast with recent versions of git, we have an awesome mechanism for making this stuff work out of the box on pretty much every conceivable installation22:53
← ColKurtz left22:53
jast it just requires that you tell git which files are text files22:53
kevlarman i wish microsoft would one day decide to force all their developers to switch to unix line endings22:53
jast by keeping that information in .gitattributes in your repository22:53
← macmartine left22:53
Francisc Not sure MS can do that so late in the game.22:53
← pteague left22:54
jast with lines like: *.c text22:54
Francisc Good to know, jast.22:54
← ehsan left22:54
jast and, voilà, everything will work perfectly22:54
kevlarman Francisc: fopen() already converts \r\n to \n by default22:54
← _psychic_ left22:54
jast of course you'll want to do this before first staging/committing the files :)22:54
kevlarman (unless you open as 'rb' or similar)22:54
jast which fopen()?22:54
kevlarman windows fopen22:55
jast isn't fopen() a libc function?22:55
windows doesn't have its own libc afaik22:55
kevlarman it does22:55
jast huh. where?22:55
I thought that was stuff provided by the compiler or mingw/cygwin22:55
→ Amorphous joined22:56
thiago crtdll.dll22:56
kevlarman jast: http://msdn.microsoft.com/en-us/library/yeby3zcb.aspx22:56
→ whyking joined22:57
→ mlncn joined22:57
jast yeah, that is the visual studio RTL, I think22:57
kevlarman jast: which has a bunch of the stuff you'd expect in libc22:58
← shruggar left22:58
jast okay, so it's not windows but visual studio22:58
kevlarman jast: no pretty sure it ships with windows22:58
jast hmm22:58
ah well22:59
kevlarman you're thinking of msvcr<whatever>.dll22:59
and msvcp<whatever>.dll22:59
→ cakehero joined22:59
→ mxweas_ joined23:00
← mxweas_ left23:00
← kpreid left23:00
← cggaurav left23:01
← ymasory left23:01
kevlarman jast: and those are redistributable, you can almost assume they're already there because *everything* installs them23:01
← the_metalgamer left23:01
→ arunce joined23:02
← swombat left23:02
← mordof left23:02
jast thiago: according to the zlib website, crtdll is not really supported by microsoft any longer23:02
Francisc git config core.autocrlf outputs true. git config core.autocrlf=input outputs an error. What the hell?23:02
jast Francisc: the = is invalid23:03
kevlarman Francisc: ditch the =23:03
jast it wants a space23:03
Francisc Haha, ok.23:03
kevlarman jast: type slower :(23:03
jast also you might want --global23:03
Francisc Yeah, forgot.23:03
thiago jast: I didn't say it was supported :-) It's just what is there.23:03
jast :)23:03
← LiohAu left23:04
← btanaka left23:04
jast hmm, if I read the fopen() MSDN page correctly, line ending normalization is only enabled if you explicitly request it using the 't' flag23:05
no, actually text mode is the default23:05
→ RaceCondition joined23:07
← wyszo left23:07
thiago yeah23:07
← wilmoore left23:08
thiago when I learnt DOS programming in the 90s, you needed to add "b"23:08
← minijupe left23:08
← mikeyutley left23:09
jast insanity!23:09
← Francisc left23:12
→ soulcake_ joined23:12
← Destos left23:13
← tatsuya_o left23:14
← sythe left23:14
→ dogarrhea2 joined23:14
← soulcake left23:14
→ minijupe joined23:14
→ heptadecagram joined23:14
dogarrhea2 hrm i just did a git status and saw a file prepended with ._23:14
and i looked in the directory and there is no file prepended with ._23:14
heptadecagram ._.23:15
jast normally files starting with '.' are not displayed23:15
try ls -a23:15
dogarrhea2 hrm. i wonder why that would be there..23:15
jast another non-git question, yay ;)23:15
thiago you're on Mac23:15
jast presuambly some kind of third-party tool created it, e.g. an editor23:15
dogarrhea2 oh. i just copied jquery ui file over23:15
← Lemon|work left23:16
← cher left23:16
← RaceCondition left23:16
→ ehsan joined23:16
← DofLeFou left23:16
→ werdan7 joined23:17
← baburdick left23:18
← saysjonathan left23:18
→ baburdick joined23:20
→ mbrumlow joined23:21
← derpadurr left23:21
→ Jon47 joined23:21
← thiago left23:21
mbrumlow Hey guys, wondering if anybody here has any good ideas for using svn with git.23:21
Corey mbrumlow: "Don't?"23:21
mbrumlow Corey: lol :p23:21
Corey mbrumlow: Alternately, what're you trying to do in real world terms?23:22
mbrumlow The problem is at work we use svn. And have a code review system. Sometimes I need to work on more than one thing at once, and it slows me down waiting for something to be reviewed.23:22
So I am looking for a way to have one single place to check in and commit via svn, but the rest of my work would use git.23:22
Corey mbrumlow: I fail to see how the git/svn interplay comes into effect?23:22
← Sonderblade left23:22
niloc132 mbrumlow: if it will just be you, its possible, but you'll need a fair bit of discipline to not hose it up once a week23:22
jast use git-svn on your workstation, keep stuff locally23:23
Corey mbrumlow: From where I sit, you're trying to solve a political problem via technical means. That doesn't work out well very often.23:23
jast that way only you get the benefits of git, but better than nothing23:23
mbrumlow Corey: yes, that is right.23:23
jast just be sure to not create any merge commits in anything you intend to push back to svn23:23
Corey mbrumlow: I'd lobby management to see if they can come up with a good way to alter the workflow so you can be more productive.23:23
→ angelsl joined23:24
mbrumlow Corey: its not all that political I guess. Somebody (maybe me) just has to take the time to redo the build system to support git.23:24
Corey mbrumlow: That's preferable to peeing all over your source control. :-)23:24
← urbanmonk left23:24
mbrumlow jast: I was looking at git+svn, but it seemd like it would cause problems because I work from more than one location :(23:24
jast: and the entire issue of passing all commits through reviewboard before they can actualy be submiited to svn.23:25
jast yeah, that gets unwieldy if you want to share stuff between the various locations23:25
it's perfectly fine if you trade patch files23:25
→ AlecTaylor joined23:25
AlecTaylor hi23:25
jast but there's a bit of extra effort involved, obviously23:25
→ urbanmonk joined23:25
AlecTaylor Can I grab just the one file from a git repo? - I just need the CMakeList.txt from http://www.webtoolkit.eu/git/wt.git23:26
← urbanmonk left23:26
kevlarman fortunately git is really good at trading patch files23:26
AlecTaylor: no23:26
wereHamster AlecTaylor: use the web interface to download it23:26
(if they provide one)23:27
AlecTaylor has horribly slow internet ATM, so is trying to find it in time23:27
← antoniojasr left23:27
← angelsl left23:28
→ frogonwheels joined23:29
mbrumlow ugg, this sytem makes me want to puek :(23:29
AlecTaylor Which one?23:29
mbrumlow svn.23:29
with reviewboard.23:29
AlecTaylor ha23:29
→ jmah_ joined23:30
→ mandric joined23:30
mbrumlow we also don't do branches or tags right.23:30
So we have many many merg issues.23:30
← jmah left23:30
jmah_ → jmah23:30
mbrumlow And problems with bugs showing up again 3 or 4 releases later23:30
AlecTaylor gave up, now cloning whole repo23:31
mbrumlow I had a setup that was sort of working with btrfs snapshots.23:31
← saschagehlich left23:32
← mandric left23:32
→ dim_ joined23:33
← jonshea left23:33
← cylence left23:33
AlecTaylor >git clone http://www.webtoolkit.eu/git/wt.git23:34
Cloning into wt...23:34
error: Unable to get pack index http://www.webtoolkit.eu/git/wt.git/objects/pack23:34
^Anyone else get that error?23:34
→ jonshea joined23:34
← jonshea left23:35
→ Sonderblade joined23:36
← cakehero left23:36
← Tommy[D] left23:37
← Kream left23:37
oriba AlecTaylor, 403 Error23:38
← dogarrhea2 left23:39
← oriba left23:39
→ jaequery joined23:39
AlecTaylor :o23:40
→ ISF joined23:40
→ ajstanton joined23:41
mbrumlow I figured itout!23:42
→ blaenk joined23:42
→ murilobr joined23:42
AlecTaylor YAY23:43
mbrumlow I will have a develop branch in git, all features I want to work on will branch from it. Before I branch I svn update and commit it to the develop branch (maybe we call this branch svn). After the branch is made I work on the feature (or bug in most cases). Then when I am ready to put it back on the company's svn repo I svn update in that branch and the commit then svn commit.23:44
← jaequery left23:45
mbrumlow I never merge back in to master/svn branch as those changes will always come from svn.23:45
This will allow me to have outstanding reviews for code while working on other things with the latest code that is in svn.23:45
And I can have my linux and windows boxes all push and pull from the git repo for the feature I am working on.23:46
that way I don't have to share my files over slow smb.23:47
← ziggles left23:47
→ thorpe joined23:47
→ Tommy[D] joined23:48
AlecTaylor SMB=Super Mario Bros23:48
jast that explains a lot23:48
← baburdick left23:49
→ baburdick joined23:50
← ajstanton left23:50
thorpe How do you setup different 'sections' within your ~/.gitconfig for different user name etc etc as github do?23:51
→ mandric joined23:52
← ehsan left23:52
← airborn left23:54
jast only one name per git config23:54
you can use per-repository configuration if you need that23:54
thorpe How do github do it?23:55
They somehow read from a [github] section within your ~/.gitconfig23:55
← ddkilzer left23:56
← Wizek left23:56
→ Wizek joined23:57
jast when you do what?23:57
I mean, github doesn't run on your computer, right? it runs elsewhere. so without special local tools it can't even look at your config file.,23:58
thorpe Yeah, just figured that.23:58
← boombatower left23:58
thorpe It's wired though, because any local repo I jave that tracks a github remote reads my user.name from the [github] section within my ~/.gitconfig23:58
*weird*23:59
← tystr left23:59

Logs Search ←Prev date Next date→ Channels Documentation