IRCloggy #git 2013-04-08

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.

2013-04-08

→ AaronMT joined00:00
← robottinosino left00:00
← rabellamy left00:01
→ bytephilia joined00:03
← kcj left00:04
← mikehaas763 left00:06
→ huoxito joined00:07
← Dreadnaught left00:07
→ dthorman joined00:10
→ philips joined00:10
→ ncd|leeN joined00:11
→ mikehaas763 joined00:11
← tmcmahon left00:13
→ fuzzybunny69y joined00:13
→ jcao219_ joined00:13
← leeN left00:14
→ jcao219 joined00:14
→ hwrd|work joined00:15
← etcetera left00:17
← rakl left00:18
← jcao219_ left00:19
← p3lim left00:19
→ p3lim joined00:21
← justache left00:21
← zacts left00:23
← offby1 left00:23
← fuzzybunny69y left00:24
← huoxito left00:24
→ offby1 joined00:24
→ Davey joined00:24
→ huoxito joined00:25
← offby1 left00:25
→ offby1 joined00:25
← yshh left00:27
→ etcetera joined00:28
→ d2dchat joined00:29
← bytephilia left00:29
← mitz_ left00:30
→ ryez joined00:31
→ EasyCo joined00:31
EasyCo Before I write one myself, anybody know of a script that extend git commit to do a database export and add it to the commit?00:32
→ jali_f joined00:33
HedgeMage EasyCo: You can just do that as a pre-commit hook.00:33
→ rchavik joined00:33
HedgeMage !hooks00:33
!hook00:33
HedgeMage pokes the bot annoyedly00:33
→ siriuz joined00:33
EasyCo Haha, not much luck there.00:33
→ pur3forlyphe joined00:33
EasyCo I'll have a google look.00:34
Thx00:34
→ jaequery joined00:34
HedgeMage EasyCo: see http://git-scm.com/book/en/Customizing-Git-Git-Hooks00:34
EasyCo There's even a nice pre-commit.sample hook00:35
→ chuckharmston joined00:35
EasyCo Beautiful.00:35
Eugene man githooks ;-)00:35
gitinfo the githooks manpage is available at http://jk.gs/githooks.html00:35
→ PaulCapestany joined00:35
← eletuchy left00:35
HedgeMage Eugene: showoff :P00:35
Eugene Well, I am sans shirt today00:35
← spaceships left00:36
Eugene But the belly needs work00:36
HedgeMage Eugene: Join the club.00:36
→ Yakko joined00:36
→ spaceships joined00:37
← chuckharmston left00:39
← Thra11 left00:43
→ private joined00:44
private → Guest7241400:44
← hyperair left00:44
← freestyler7 left00:45
← siriuz left00:46
← DonRichie left00:46
← scorphus left00:46
→ DonRichie joined00:46
← jaequery left00:47
→ siriuz joined00:48
Adys_ → Adys00:48
→ scorphus joined00:48
→ jaequery joined00:50
→ Lewoco joined00:54
← Maxdamantus left00:55
← johnflux__ left00:59
← barneybook left00:59
→ theRealGentleman joined01:01
← theRealGentleman left01:01
→ simesy joined01:01
← zastern left01:01
→ therealGent joined01:01
← RaceCondition left01:01
← jaequery left01:02
← perlstein left01:04
→ therealfakemoot joined01:05
→ jday_ joined01:06
therealfakemoot I'm a bit confused; trying to create a few aliases after reading a nice article about it. https://gist.github.com/therealfakemoot/5333445 Git throws errors saying that "git is not a git command", but removing 'git' from the alias throws a different error. I'm clearly doing something very basic wrong01:08
→ megha joined01:09
← baba left01:10
← jaimef left01:10
← Immutable left01:11
Eugene therealfakemoot - don't put 'git' in the beginning of the alias01:11
therealfakemoot Eugene: I have tried that before.01:12
→ yshh joined01:12
← Vampire0 left01:12
therealfakemoot Eugene: Huh. I guess it's just the lg alias that's screwed up01:12
bremner well, what is your other error.01:12
Eugene ;-)01:12
therealfakemoot Damn it01:12
→ Immutable joined01:13
→ Vampire0 joined01:13
→ hyperair joined01:15
→ stliu joined01:15
← mloskot left01:16
→ catsup joined01:17
← pastime left01:18
← ncd|leeN left01:19
← snql left01:20
→ cespare joined01:20
← gregsmith left01:23
← ozette left01:23
← ThePrimeMedian left01:24
→ xiukun joined01:25
← warthog9 left01:27
→ zamabe joined01:29
← siriuz left01:30
← therealfakemoot left01:31
zamabe Will a rebase fail in the same way that a merge will? or will it refuse to apply? and does it apply many commits from a branch as one appended super-commit or does it rewrite the history in a (time-linear or file-linear) manner? So far RTFM hasn't cleared this up much for me. :/01:31
offby1 zamabe: tas.01:32
Try It And See™, rather.01:32
zamabe offby1, mind telling me what to expect?01:32
→ aartist joined01:32
← simesy left01:32
offby1 short answer: the former: it gets a merge conflict, which you resolve pretty much the same way you'd resolve any merge conflict.01:32
and it creates many commits.01:32
but seriously: Try It And See™.01:32
zamabe thx01:33
offby1 no better way to get a feel for it.01:33
bremner but it might get a _different_ merge conflict01:33
→ RaceCondition joined01:33
offby1 well, sure.01:33
and whole bunches of them, one after the other, despite valiant attempts at using git-rerere01:33
→ edgeuplink joined01:33
→ dhruvasagar joined01:33
→ siriuz joined01:33
← alexander__b left01:34
← dhruvasagar left01:34
→ dhruvasagar joined01:34
← plumpkin left01:35
→ simesy joined01:35
← msm left01:35
→ msm joined01:35
← edgeuplink left01:36
→ edgeuplink joined01:38
→ mitz_ joined01:38
→ alexander__b joined01:39
← Sky[x] left01:39
→ wrouesnel joined01:40
→ jaimef joined01:40
→ erkules joined01:40
← siriuz left01:40
→ zacts joined01:41
→ normanrichards joined01:41
← edgeuplink left01:41
→ siriuz joined01:42
→ yuwang_ joined01:43
← erkules_ left01:43
← yuwang_ left01:44
→ yuwang_ joined01:44
← yuwang_ left01:44
→ jaequery joined01:45
→ nanjj joined01:46
← yuwang left01:47
→ pastime joined01:48
→ barneybook joined01:49
→ setmeaway joined01:50
→ BSaboia joined01:50
← dhruvasagar left01:51
← tvw left01:51
← siriuz left01:51
← wrouesnel left01:51
→ cbot_ joined01:52
→ dsdeiz joined01:53
→ siriuz joined01:53
← DonRichie left01:54
← Chryyz left01:54
→ dhruvasagar joined01:54
← brum left01:54
→ luc_ joined01:54
→ DonRichie joined01:54
→ asakura0 joined01:55
→ flippo joined01:57
← hwrd|work left01:58
→ R1KRDO joined01:58
← siriuz left01:59
→ siriuz joined02:01
→ s00pcan joined02:02
→ ranmocy joined02:02
← nanjj left02:03
← cbot_ left02:07
→ herbnerder joined02:08
← BSaboia left02:08
→ anonymuse joined02:08
← siriuz left02:09
← etcetera left02:09
← huoxito left02:10
← Davey left02:11
← herbnerder left02:11
SeoZ-work[AWAY] → SeoZ02:13
→ siriuz joined02:13
← therealGent left02:13
→ herbnerder joined02:13
← siriuz left02:16
→ BiggFREE joined02:16
← aartist left02:16
← [1]JPeterson left02:17
→ [1]JPeterson joined02:17
→ sha3 joined02:18
← sha3 left02:18
→ a1pha joined02:18
← a1pha left02:18
→ a1phanumrc joined02:18
← [1]JPeterson left02:19
→ Esa_ joined02:20
→ JPeterson joined02:21
→ weiyang joined02:23
→ Davey joined02:23
→ solusfaran joined02:24
→ siriuz joined02:24
← bttf left02:28
← siriuz left02:28
← pastime left02:29
→ pastime joined02:29
← Cassiel left02:31
→ paddymahoney joined02:31
→ hafeez3000 joined02:31
← s0ber left02:32
← redrocket left02:32
← herbnerder left02:33
→ siriuz joined02:33
→ s0ber joined02:34
← RigidWig left02:34
← solusfaran left02:36
→ wald0 joined02:37
→ pitzips joined02:38
wald0 i have setup a git repository for work as a fork or another project, i wanted to use the way "one single commit per feature" in order to being easly able to create patches about a specific feature (instead of search a number of different commits over the history), but i dont know how i should do that if i add more features in the future (so they are new commits)02:38
→ _Harm_B_ joined02:39
← siriuz left02:39
wald0 in short, more features in teh future means new commits after other ones, but if i rebase in the server, this is bad, so how i should do that ? or is there any better workflow to follow and im wrong ?02:39
← BiggFREE left02:39
→ siriuz joined02:39
→ nathanbz joined02:40
pekster wald0: You can always consider creating a branch for your features. Then commit as much as you want, and squash the commits together if you really want. But it's often useful to commit more often than for a "complete" feature. Many times partway into a complex feature I've wanted to commit code so I could go back to that point. Maybe I start re-writing a new function, but 30 minutes in decide I liked it the way I had it originally. It's ...02:42
... handy to be able to go back02:42
← madewokherd left02:43
← Octalot left02:44
wald0 pekster: yes, thats part of the idea, but in the end is not so easy because when the feautre is finished, it needs to be moved to the "dev" branch (used for build the software and package it), so the problem occurs when for example a week later is needed to add a minor fix and there was more new commits (different features/topics)02:44
← luc_ left02:44
pekster How is that a problem? If complete "features" get merged into a dev branch, what stops you from simply merging the branch with that feature?02:45
→ luc_ joined02:45
pekster It'll have the same effect as would merging a single commit with the same changes02:45
You simply get more flexibility in the process02:45
← siriuz left02:46
← a1phanumrc left02:46
pekster Say you do that and feature "make it more green" gets a bugfix (the original topic branch wasn't green enough, it turns out.) You can then merge it again and get the "proper green" changes you needed02:46
← jaequery left02:47
← paddymahoney left02:48
wald0 pekster: i think that i have not explained it correctly, lets do an example: i create a feature1 branch, do some commits, feature1 is complete so i rebase it in a single commit and put it on the "dev" branch which is used for compile/package the software (final product), next day i do the same for feature2, and next day i need to add a small fix in feature1, but i think that i cannot rebase it to a "previous" commit (there is feature2 aft02:48
wald0 wonders if irssi has cut his text, which finished in "..(push) code"02:49
pekster (there is feature2 aft... ?02:49
pekster recommends splitlong.pl02:49
→ siriuz joined02:50
← orafu left02:50
→ orafu joined02:51
wald0 > feature2 after it) in an already-published (push) code02:51
only that :)02:51
pekster Right. You can't rebase it after you've pushed without screwing up history for your team who already pulled it02:52
Stop trying to "hide" what happens in fixes. Mess with rebasing as much as you'd likely locally, but don't do that to code you've pushed or face angry team mates when they have to pull over their existing copies02:52
→ preflex_ joined02:53
→ PixelCrumbs joined02:53
pekster If you fix that feature again and you've already rebased the change, you've effectively "hidden" the feature1 branch. You lost that history, and git only knows a single commit. You can't merge a fix from that branch anymore since you destroied it in the rebase02:53
wald0 pekster: so there comes the problem :) i would like to have all the feature/topics in a single commit (useful for give it back to the original project in the future) but is a mess to try to know/select the "first complete feature" + all the future small fixes02:54
← preflex left02:54
pekster Bad mindset. Stop thinking of "commits as features"02:54
← nathanr left02:54
preflex_ → preflex02:54
pekster That's exactly what git is designed to stop you from having to do02:54
Use topic branches for "features"02:54
→ nathanr joined02:55
pekster The commit as much as you need to them. Merge them into your dev, or testing, or master, or what-have-you. If you're "done" with a feature, you can delete the branch from HEAD, but it's references will still be there containing the history02:55
wald0 pekster: on this case, how i should compile/package the final software including all the features ? (packager downloads a git and compile it)02:55
← siriuz left02:56
SamB wald0: branches work fine02:56
→ Cassiel joined02:56
pekster huh? Don't you just have them do a git clone and build from some stable release? Maybe a release/1.0 branch (or lightweight tag if you'd prefer)?02:56
Or a dev branch if that's where your stable packaging happens?02:56
← fireh left02:57
SamB wald0: oh, you mean merging02:57
wald0 oh wait, you mean to always-have and maintain opened a lot of branches (one per feature) where to everytime merge everything on the master one as a final result ?02:57
pekster Yes. That's *way* easier than trying to glob together commits02:57
You can't "fix" a commit you made yesterday (provided you pushed it already)02:57
It's best to think of it as *uneditable* for eternity. Because that's better than the alternative02:58
Technically, you can rewrite history. And it really screws up workflow for everyone else who has a copy of the project. Don't do it.02:58
SamB you don't *have* to keep using the feature branch for every change you do to a feature, though02:58
pekster Right, you can create a new branch if you'd like02:59
Then merge that02:59
→ a1phanumrc joined02:59
pekster You can remove the branches whenever you're done with them. The history is still there, but the branch doesn't need to be02:59
→ siriuz joined02:59
← nathanr left02:59
← cirenyc left02:59
wald0 ooh, i see now, this is much clearer03:00
so now another question about this new method, what happens if i have a branch for a temporal feature that i want to remove in the future ?03:00
→ fireh joined03:00
← fireh left03:00
→ fireh joined03:00
← kakos left03:00
wald0 i mean, how to remove from master all the commits/code that i have do in a branch for its purpose ?03:00
SamB you can't remove the commits03:00
the code, you can remove, but that isn't really a thing that git is designed to help with03:01
← Khisanth left03:02
wald0 for example, let's say that i create a branch for a temporal code that i want to give to the author in the future (so in the future if i pull from him, i will need to remove my code?)03:02
→ kakos joined03:02
← PixelCrumbs left03:02
← anonymuse left03:03
→ PixelCrumbs joined03:03
wald0 or another example: it includes a temporal fix for another application, but when the other application has this solved i dont need my code anymore (remove it)03:03
→ perlstein joined03:03
pekster The perform another commit that undoes that change03:03
Then*03:03
← TheJH left03:03
→ blaenk joined03:04
pekster Since you have the original commit that merged your feature branch fix (or a single commit, whatever it is) just reverse that commit in your working copy, resolve any conflicts that might come up (maybe recent code changes also changed some lines causing a conflict or 2) and then commit that.03:04
← siriuz left03:04
→ TheJH joined03:05
pekster You don't undo history. You just commit another change. Think of it like the 'reverse merge' feature of svn, if that's more familiar to you. You literally commit another commit's inverse. Same as applying a patch in reverse if that's a better analogy.03:05
← scorphus left03:05
wald0 what is for reverse then on this case ? "git revert" ?03:06
yeah, i understood, makes sense03:06
blaenk asked on #github but curious if anyone here knows. deleted a forked repo of mine and my commits which referenced an issue in upstream are still linked in that issue ('referenced this issue from a commit' messages), any way to get rid of those?03:07
→ siriuz joined03:07
→ dsdeiz_ joined03:07
Eugene Nope.03:08
blaenk what happened was worse: I kept git commit --amend'ing a commit I was workign on and doing push -f to replace that commit in my fork's remote (github), and so now there's like 10 messages there of 'referenced this issue from a commit' because technically they're each different commits03:08
guess I'll just have to live with it then heh03:08
Eugene github actually stores it in a special ref03:08
→ engkur joined03:08
Eugene See !github_pull03:09
gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/334224703:09
← dsdeiz left03:09
← Guest72414 left03:09
← dhruvasagar left03:09
→ smw joined03:09
blaenk Eugene: pardon my ignorance but what's the benefit of that?03:09
Eugene Easier to merge PRs from outside github's interface03:10
blaenk oh okay, thanks03:10
← Chillance left03:10
ranmocy Ask for some help. I'm currently operate a huge repo, but when I wish to check the last commit of a certain file, it's extremely slow on my machine. My command: `git log --max-count 1 master -- path/to/file.txt`.03:11
Eugene Buy a SSD..03:12
ranmocy I am SSD...03:12
← trungqtran left03:12
ranmocy @Eugene Is there may some better ways?03:12
Eugene Make your repo smaller03:12
ranmocy ...03:12
Eugene That's about all I can say, really.03:13
→ mmlac joined03:13
← siriuz left03:13
ranmocy @Eugene so, the time cost is unavoidable? Since I only need the last one commit info03:14
← PaulCapestany left03:14
Eugene git has to walk the commit chain backwards until it finds the file, so, yeah.03:14
→ stewiee joined03:15
→ Khisanth joined03:16
→ siriuz joined03:16
ranmocy @Eugene i see, thank you for answer~03:17
← Watabou left03:17
← DonRichie left03:19
← dOxxx left03:19
← siriuz left03:22
← jcao219 left03:22
← Fissure left03:23
→ siriuz joined03:23
jjore_ I suppose if you needed to perform that search often, you could create an index.03:24
→ ThePrimeMedian joined03:24
→ PaulCapestany joined03:25
→ Fissure joined03:28
← ThePrimeMedian left03:29
← siriuz left03:30
→ griotspeak joined03:31
→ jyp joined03:31
→ siriuz joined03:35
→ longbeach joined03:38
→ hwrd|work joined03:38
← kukks left03:39
→ fuzzybunny69y joined03:39
← fuzzybunny69y left03:39
→ fuzzybunny69y joined03:40
← fuzzybunny69y left03:40
← siriuz left03:40
← mitz_ left03:40
← mmlac left03:41
→ fuzzybunny69y joined03:41
→ siriuz joined03:42
→ Jojomofoman joined03:44
→ aartist joined03:45
← the_cybersphinx left03:45
← Cassiel left03:46
→ mitz_ joined03:47
← siriuz left03:48
→ irqq joined03:48
← t-mart left03:48
→ t-mart joined03:49
← Esa_ left03:49
→ siriuz joined03:49
→ Dreamer3 joined03:50
← PixelCrumbs left03:50
→ Esa_ joined03:50
→ PixelCrumbs joined03:50
← odin_ left03:51
← mercwithamouth left03:54
→ DonRichie joined03:55
← siriuz left03:56
← arvind_khadri left03:57
← PixelCrumbs left03:59
→ PixelCrumbs joined03:59
← Dougie187 left04:00
→ siriuz joined04:00
→ Chryyz joined04:02
← griotspeak left04:03
← siriuz left04:03
← jyp left04:03
→ Tommy[D]_ joined04:03
→ odin_ joined04:04
→ siriuz joined04:05
→ joon joined04:06
→ jyp joined04:06
← ranmocy left04:07
← Tommy[D] left04:07
← jyp left04:07
→ luc__ joined04:08
← luc_ left04:08
→ jyp joined04:08
→ beautifulmind joined04:09
← flippo left04:09
← blaenk left04:10
← aartist left04:14
← kpreid left04:14
← avinashrbhat left04:14
← Esa_ left04:14
→ kpreid joined04:14
← siriuz left04:15
→ luc_ joined04:15
← luc__ left04:15
← hafeez3000 left04:15
→ hoschi joined04:17
→ Kulrak joined04:17
→ mercwithamouth joined04:18
→ siriuz joined04:18
← seanius left04:20
→ dermoth_ joined04:20
← a1phanumrc left04:21
← irqq left04:21
→ siriuz_ joined04:22
→ a1phanumrc joined04:22
← dermoth|home left04:23
→ mihamina joined04:23
← siriuz left04:24
← kakos left04:28
← AaronMT left04:29
→ kakos joined04:31
→ seanius joined04:31
← pitzips left04:33
← khmarbaise left04:35
← pastime left04:35
← mihamina left04:36
→ jaequery joined04:36
→ therealGent joined04:36
→ pastime joined04:40
← jali_f left04:41
← PixelCrumbs left04:41
← DonRichie left04:42
← siriuz_ left04:42
→ private joined04:42
← zacts left04:43
→ dhruvasagar joined04:43
private → Guest9752104:43
← fuzzybunny69y left04:44
← therealGent left04:45
→ Watabou joined04:46
→ siriuz joined04:47
→ fuzzybunny69y joined04:48
← fuzzybunny69y left04:48
→ fuzzybunny69y joined04:49
← fuzzybunny69y left04:49
→ fuzzybunny69y joined04:50
← fuzzybunny69y left04:50
← jyp left04:50
→ fuzzybunny69y joined04:50
← dsdeiz_ left04:50
→ dsdeiz joined04:51
← PaulCapestany left04:52
← jjore_ left04:53
← Watabou left04:54
← ak5 left04:55
← SirCmpwn left04:57
← siriuz left04:57
→ pretty_function joined05:00
→ SirCmpwn joined05:02
→ siriuz joined05:02
← pyacks left05:02
→ johnbenz joined05:04
← pretty_function left05:04
→ wwalker joined05:05
← stewiee left05:05
wwalker https://gist.github.com/wwalker/5334340 - a git branch merging question05:05
→ _Harm_B_1 joined05:05
← siriuz left05:06
→ pretty_function joined05:06
Eugene Merge harder, not smarter05:06
wwalker - man git-cherry-pick05:06
gitinfo wwalker: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html05:06
← _Harm_B_ left05:07
← Villadelfia left05:09
← SeySayux left05:09
→ siriuz joined05:09
← d2dchat left05:09
← spaceships left05:10
→ arvind_khadri joined05:10
→ Anders_J joined05:10
wwalker so I would run "git checkout feature-1; git cherry-pick feature-2-branch-start-tag..feature-2" ?05:11
Eugene: thank you05:11
← L-Chymera left05:11
→ jceb joined05:12
→ spaceships joined05:12
← R1KRDO left05:12
→ jyp joined05:12
← spaceships left05:13
← knightshade left05:13
→ jrnieder joined05:13
Eugene My karma count is slowly rising. I need to beat that cbreak git.05:14
HedgeMage lol05:14
→ R1KRDO joined05:15
→ dsdeiz_ joined05:16
→ avinashrbhat joined05:17
← dsdeiz left05:17
← a1phanumrc left05:20
← ph^ left05:21
← jrnieder left05:21
→ ph^ joined05:22
→ elixir joined05:22
← Max-P left05:22
← siriuz left05:23
← ph^ left05:24
→ siriuz joined05:24
→ hafeez3000 joined05:24
→ ph^ joined05:24
→ dsdeiz joined05:25
→ h0bbit joined05:25
← donmichelangelo left05:25
→ donmichelangelo joined05:25
← dsdeiz_ left05:26
→ pyacks joined05:26
← jyp left05:28
→ Villadelfia joined05:28
→ SeySayux joined05:29
← ph^ left05:29
← Galaris_ left05:30
→ subhojit777 joined05:30
← siriuz left05:30
← gwty left05:31
← Noldorin left05:32
→ siriuz joined05:32
← zamabe left05:32
← R1KRDO left05:35
← delinquentme left05:36
← Yakko left05:36
← bgerber left05:37
→ revyd joined05:37
← EasyCo left05:37
← siriuz left05:38
← dhruvasagar left05:38
→ vedant joined05:40
→ siriuz joined05:40
→ newbie999 joined05:40
→ bgerber joined05:41
→ Sky[x] joined05:41
_ikke_ I'm always a few behind cmn05:41
← pastime left05:42
Eugene That git.05:42
HedgeMage probably has no karma in here, not having been around long05:42
HedgeMage :P05:42
Eugene .karma HedgeMage05:43
gitinfo the karma of the given users is shrouded in the mists of uncertainty.05:43
_ikke_ correct05:43
← hafeez3000 left05:43
HedgeMage That, and I spend most of my time sexually harrassing Eugene, which isn't very karma-worthy :P05:43
Eugene It isn't harassment until you've found my webcam(s).05:44
→ Dreadnaught joined05:44
← Dreadnaught left05:44
→ Dreadnaught joined05:44
→ Watabou joined05:44
→ dsdeiz_ joined05:44
HedgeMage Eugene: 'found' -- you mean you don't secure that sort of tihng?05:44
← karupanerura left05:45
← Kulrak left05:45
Eugene Secure? God, no, it's public.05:45
← dsdeiz left05:45
Eugene Though you can't see much right now, I have the lights off.05:45
→ karupanerura joined05:46
HedgeMage has the lights on, but is mostly dressed due to being in a shared part of the house and having a kid05:46
← siriuz left05:46
Eugene Your poor dress05:47
HedgeMage ?05:47
Eugene Getting all worn out :-p05:47
HedgeMage :P05:48
→ pppaul joined05:48
HedgeMage I don't often dress in actual dresses. I find them to be quite impractical.05:48
→ siriuz joined05:49
Eugene I like them05:49
← rasto left05:49
HedgeMage Last time was...about 8 years ago when a dear friend was married (I was in the wedding party).05:49
→ dsdeiz joined05:49
→ warthog9 joined05:50
← dsdeiz_ left05:50
Eugene Yay party05:51
← beneggett left05:51
→ beneggett joined05:52
→ mishok13 joined05:52
HedgeMage Though I've kind of considered getting a nice period outfit (yes, that would mean a dress) for swing dancing with P.05:52
→ jyp joined05:54
← siriuz left05:54
→ siriuz joined05:57
← Jojomofoman left05:59
→ Wulf joined06:01
← siriuz left06:02
← jyp left06:02
← beneggett left06:03
→ PaulCapestany joined06:04
→ siriuz joined06:06
→ ThomasLocke joined06:08
→ hafeez3000 joined06:08
→ beneggett joined06:08
← johnbenz left06:08
← siriuz left06:08
← Gentlecat left06:09
→ PixelCrumbs joined06:09
← SirCmpwn left06:10
→ cbreak-work joined06:11
← corsair__ left06:11
→ halcyonCorsair joined06:12
← Davey left06:12
→ SirCmpwn joined06:13
← Sky[x] left06:15
→ ph^ joined06:16
← ph^ left06:16
← Entomo left06:16
→ ph^ joined06:16
→ siriuz joined06:16
→ Error404NotFound joined06:18
→ jnavila joined06:19
← beneggett left06:19
← LekeFly left06:20
← siriuz left06:20
→ jnavila_ joined06:20
→ beneggett joined06:20
← Error404NotFound left06:21
← cagedwisdom left06:21
← dsantiago left06:21
→ Error404NotFound joined06:22
→ dsantiago joined06:23
→ Sigma joined06:24
← jnavila left06:24
← pppaul left06:24
← Error404NotFound left06:24
→ soee joined06:25
→ siriuz joined06:25
→ Error404NotFound joined06:25
← beautifulmind left06:26
← mishok13 left06:27
← Markvilla left06:27
→ dsdeiz_ joined06:28
→ Andromeda joined06:28
← dsdeiz left06:28
← hwrd|work left06:29
← siriuz left06:33
← h0bbit left06:33
→ rath joined06:33
← jceb left06:34
← Sigma left06:34
→ siriuz joined06:34
→ dsdeiz joined06:35
→ tvw joined06:36
→ beautifulmind joined06:36
→ h0bbit joined06:36
← dsdeiz_ left06:36
← Goplat left06:36
← Guest97521 left06:37
→ rob_w joined06:37
→ lb1a joined06:38
← lb1a left06:38
→ lb1a joined06:38
← mercwithamouth left06:39
← siriuz left06:40
→ pantsman joined06:41
→ rasto joined06:41
← fuzzybunny69y left06:41
← bulletmark left06:42
→ siriuz joined06:42
→ ivar_ joined06:43
→ netiul joined06:44
→ fuzzybunny69y joined06:46
← siriuz left06:48
← alexander__b left06:48
→ siriuz joined06:49
→ fRAiLtY- joined06:50
→ tomplast joined06:51
→ mishok13 joined06:51
→ marthinal joined06:52
→ rurufufuss joined06:53
← beautifulmind left06:54
tomplast Hi. I have an issue with GIT and I would be very pleased if anyone could help. I work at a company as a programmer but I'm also responsible for the GIT server and usage. Lately we have had a problem where we had two folder with the same name, i.e Folder and folder. So suddenly we have the same file (just different commits) in two different folders. How can I resolve this? And how can I make git be case sensitive? Btw, we work in a Wi06:55
← siriuz left06:55
→ Raging_Hog joined06:56
nevyn tomplast: it is case sensitive.06:56
tomplast nevyn: Yes I am well aware of that, how does that help me?06:56
→ nicolash joined06:56
tomplast I mean, I want it to be case insensitive.06:56
nevyn oh.. that's different ;)06:57
tomplast Sorry, spelled incorrectly06:57
nevyn ok I lost everything in your post after: " And how can I06:57
make git be case sensitive? Btw, we work in a Wi06:57
"06:57
tomplast Okay, but now you see my problem?06:58
nevyn tomplast: irc only deals with relatively short messages ~256chars06:58
→ siriuz joined06:58
tomplast amend message: Btw, we work in a Windows environment.06:58
→ dhruvasagar joined06:58
← boombatower left06:58
tomplast :p06:58
nevyn tomplast: I think the likely answer is a case insensitive filesystem but given you're programmers working in a case preserving operatingsystem surely you could just fix the work practices06:59
!case06:59
gitinfo [!case_mapping] Git tries its best if you are on a filesystem which does not understand the difference between upper case and lower case, but there are many circumstances, especially when there are two files which only differ by case, that git just cannot cope. Windows and Mac users are especially likely to have such problems. Solution, move to a real filesystem or OS and investigate git-config's core.ignorecase06:59
tomplast When we are trying to look at the log we won't find anything, because it's in different folders.06:59
nevyn tomplast: so you're pushing a new repo to the remote?07:00
→ tim joined07:00
→ jyp_ joined07:00
nevyn tomplast: so when you say a "server" what do you mean?07:00
tomplast Yeah, on Windows it looks all fine and dandy but on the Git server there are two folders.07:00
cbreak-work tomplast: don't worry about it07:00
← barneybook left07:00
cbreak-work git is case sensitive07:00
nevyn cbreak-work: he wants it to be insensitive clod!07:01
tomplast We work with local repositories which we push to a central git server.07:01
nevyn how?07:01
what transport and what runs on the central git server?07:01
cbreak-work doesn't sound problematic07:01
tomplast Huh?07:01
thiago tomplast: enforce that people should use everything lowercase07:01
← nfroidure_ left07:01
← xiukun left07:01
nevyn tomplast: what software manages the git repos on your central git server?07:01
cbreak-work doesn't matter07:02
← yellah left07:02
nevyn or you just have a common account or shared folder and ssh?07:02
cbreak-work: it sortadoes.. maybe.07:02
→ yellah joined07:02
cbreak-work tomplast: just check local state: git ls-files07:02
do you see two different directories?07:02
tomplast nevyn: Used Gitolite before, now its GitLab-shell.07:02
cbreak-work (only differing in case)07:02
→ jceb joined07:03
tomplast Have to come back, there's a meeting here now. Sorry, I will look at your advcies.07:03
cbreak-work nevyn: the file names are part of history, no git server can change them unless it breaks sha107:03
tomplast Thanks for your help.07:03
afk07:03
→ eletuchy joined07:04
→ psoo joined07:04
← siriuz left07:04
nevyn cbreak-work: oh right.. course they are.07:04
cbreak-work so the different directories are either proper part of history, or they are not history07:04
if they are proper part of history, then they were probably created on a system that doesn't handle different cases as the same07:04
← dhruvasagar left07:04
← nicolash left07:04
nevyn eww...07:05
cbreak-work (or on a system that does handle them the same, without git being aware of it)07:05
→ nicolash joined07:05
cbreak-work but I think git is aware of that by default07:05
→ siriuz joined07:05
← mitz_ left07:05
→ dhruvasagar joined07:05
→ mastro joined07:05
cbreak-work so it was probably caused by a careless linux user or similar07:05
→ JosefAssad joined07:06
cbreak-work either way, the solution is quite simple I think: git rm -rf --cached directory07:06
← mastro left07:06
cbreak-work to remove all varying case versions07:06
then git add them from the filesystem again07:06
→ mitz_ joined07:06
cbreak-work git should pick up the renames as needed07:06
← fuzzybunny69y left07:06
→ mastro joined07:07
← gan_ left07:08
← normanrichards left07:08
← Error404NotFound left07:09
← markalanevans left07:10
→ mastroWork joined07:10
→ markalanevans joined07:11
← ivar_ left07:11
← siriuz left07:12
lb1a setting up a new intern git server box with gitolite. i just love it :)07:12
→ barneybook joined07:13
→ Sky[x] joined07:14
← mastro left07:14
→ suy joined07:15
← thiago left07:16
← revyd left07:16
→ siriuz joined07:17
← arvind_khadri left07:17
→ mastro__ joined07:18
← threesome left07:18
→ timj1 joined07:18
→ LekeFly joined07:18
→ Dr4k3 joined07:19
← o] left07:20
← timj left07:20
← dsantiago left07:20
← mastroWork left07:21
← Dr4k3 left07:21
→ narfnarf joined07:22
← narfnarf left07:22
→ Error404NotFound joined07:22
← siriuz left07:22
→ maxmanders joined07:23
→ dsantiago joined07:23
→ LeMike joined07:23
← avinashrbhat left07:24
→ avinashrbhat joined07:24
→ mitz__ joined07:25
← quazimodo left07:25
→ _Qman joined07:26
← mitz_ left07:27
→ siriuz joined07:27
← beneggett left07:27
QshelTier → Bombe07:28
→ Sonderblade joined07:28
→ BiggFREE joined07:29
← siriuz left07:30
← pyacks left07:30
→ AdrienBrault joined07:31
→ alorence joined07:32
→ smirn0v joined07:32
→ quazimodo joined07:33
← pigeon left07:34
→ yacks joined07:34
← jnavila_ left07:34
→ pigeon joined07:34
→ vedant_ joined07:35
→ guns joined07:35
← PaulCapestany left07:37
← stliu left07:38
← vedant left07:38
→ siriuz joined07:39
→ flijten joined07:39
← vedant_ left07:40
← yacks left07:41
← markalanevans left07:43
← quazimodo left07:44
→ vedant_ joined07:44
← siriuz left07:45
→ threesome joined07:45
→ siriuz joined07:45
→ Dr4k3 joined07:46
→ JohnBat26 joined07:48
← jaequery left07:48
blackjack → suaminya07:49
← suaminya left07:49
← guns left07:49
→ quazimodo joined07:49
→ jnavila_ joined07:50
← siriuz left07:52
→ lavong joined07:52
→ mastroWork joined07:54
→ ThePawnBreak joined07:55
← quazimodo left07:55
→ yacks joined07:55
→ siriuz joined07:56
← dreiss left07:57
← mastro__ left07:57
→ alexander__b joined07:57
← Raging_Hog left07:58
← alexander__b left07:59
→ alexander__b joined07:59
→ Raging_Hog joined07:59
→ iksik joined07:59
← iksik left07:59
→ iksik joined07:59
→ alkino joined08:00
← dregad left08:01
← siriuz left08:01
→ tjbiddle joined08:01
← elixir left08:03
→ elixir joined08:03
→ marhaban joined08:04
← stephan_ left08:04
→ siriuz joined08:06
→ stephan_ joined08:07
→ LimeBlast joined08:07
→ Sigma joined08:09
→ dsdeiz_ joined08:09
← iksik left08:09
← dsdeiz left08:09
→ narfnarf joined08:10
→ jargon joined08:10
← ThePawnBreak left08:10
← narfnarf left08:10
← Vile left08:11
→ brocken joined08:12
← siriuz left08:12
← LeMike left08:13
→ LeMike joined08:13
→ dsdeiz joined08:14
← pur3forlyphe left08:14
← dsdeiz_ left08:15
← marthinal left08:15
→ quazimodo joined08:16
→ narfnarf joined08:17
→ arvind_khadri joined08:17
→ siriuz joined08:17
→ eijk joined08:18
← tjbiddle left08:19
→ jnavila__ joined08:20
← jnavila_ left08:20
← tirengarfio left08:20
→ Hail_Spacecake joined08:20
Hail_Spacecake how do you tell github to create a repo from an already-extant local git repo?08:20
→ barq joined08:20
← barq left08:20
→ barq joined08:20
Hail_Spacecake I recall they used to have an option for this, but I can no longer find it08:21
← barq left08:21
_ikke_ Hail_Spacecake: Just create a new project, and push to it08:22
→ marthinal joined08:22
← siriuz left08:23
← lausi left08:24
→ lausi joined08:24
← donmichelangelo left08:26
← Error404NotFound left08:27
← sirdancealot left08:27
→ spuz_ joined08:27
→ siriuz joined08:27
← maxmanders left08:28
→ maxmanders joined08:29
→ irqq joined08:30
→ babilen joined08:30
→ mrwonko joined08:31
← Raging_Hog left08:32
→ exidl joined08:32
mrwonko So I did the impossible and rewrote history. Had to. What step-by-step repair instructions can I give to forkers?08:32
→ private joined08:32
← siriuz left08:32
private → Guest5102608:33
→ xiukun joined08:33
exidl hey, I need to rebase my fork because the upstream has history rewritten, is the following correct ? git checkout upstream; git fetch upstream; git rebase upstream/master08:33
_ikke_ mrwonko: man git rebase (section, recover from upstream rebase)08:33
gitinfo mrwonko: the git-rebase manpage is available at http://jk.gs/git-rebase.html08:33
_ikke_ exidl: The same section applies too08:33
exidl ah okay there's a special section for that, great thanks08:34
lb1a _ikke_: not bad, 2 flies with 1 clap ;)08:34
_ikke_ :D08:34
Is that an english proverb too?08:34
mrwonko well, he is one of the forkers :D08:34
lb1a _ikke_: dont think so, but you got the point ^^08:34
_ikke_ lb1a: yeah08:34
dr_lepper english is "two birds with 1 stone"08:35
lb1a ah thanks dr_lepper08:35
_ikke_ mrwonko: haha, makes sense08:35
← Hail_Spacecake left08:35
← babilen left08:36
→ babilen joined08:36
→ siriuz joined08:37
→ Error404NotFound joined08:39
← JEEB left08:39
→ JEEBcz joined08:40
← t-mart left08:40
→ the_cybersphinx joined08:40
← lavong left08:40
→ martinklepsch joined08:40
→ normanrichards joined08:40
→ t-mart joined08:40
→ delboy1978uk joined08:41
→ rudak joined08:41
→ lavong joined08:41
← elixir left08:41
← BiggFREE left08:42
→ Markvilla joined08:42
→ zoresvit joined08:42
← Markvilla left08:42
← siriuz left08:42
← delboy1978uk left08:43
← suy left08:43
→ Raging_Hog joined08:44
→ suy joined08:44
← Caelum left08:44
← rudak left08:44
→ Caelum joined08:44
← Werring left08:45
← simesy left08:45
→ siriuz joined08:46
→ samuel02 joined08:46
meuh_ → meuh08:47
→ Vile joined08:48
→ simesy joined08:48
→ Werring joined08:48
← JEEBcz left08:48
→ JEEBcz joined08:48
JEEBcz → JEEB08:48
← Learath2_ left08:48
→ Learath2 joined08:49
gitinfo set mode: +v08:49
← siriuz left08:50
← marhaban left08:53
← Raging_Hog left08:54
→ Raging_Hog joined08:55
← JosefAssad left08:55
→ JosefAssad joined08:55
→ stliu joined08:55
→ Guest88035 joined08:56
← lb1a left08:56
→ siriuz joined08:58
← LeMike left08:59
→ pradi joined08:59
→ snql joined08:59
← Raging_Hog left08:59
← vedant_ left09:01
→ leeN joined09:01
← marcdel left09:01
← ph^ left09:02
→ mastro__ joined09:03
← siriuz left09:04
← diegoviola left09:04
→ ph^ joined09:04
→ beaky joined09:05
beaky hello09:05
← CZer0 left09:05
beaky I have a devel branch, and a topic branch off that devel branch; if I make changes in the devel branch, how do I update the topic branch with those changes?09:05
← PixelCrumbs left09:06
← mastroWork left09:06
← dvide left09:06
_ikke_ beaky: Have you pushed this topic branch?09:07
→ Hounddog joined09:07
osse beaky: either merge them in, cherry-pick them, or rebase the topic branch09:07
← quazimodo left09:07
beaky ah09:07
→ siriuz joined09:08
_ikke_ beaky: Does that topic branch really need the changes from develop?09:08
→ Kulrak joined09:08
beaky no :(09:08
_ikke_ You can wait, and merge that topic branch back into master when it's ready09:09
beaky ah xlent09:09
_ikke_ s/master/develop09:09
→ security joined09:09
← Dreadnaught left09:09
← megha left09:10
→ dvide joined09:11
→ shruggar joined09:11
mwilkes|away → MatthewWilkes09:12
← Dr4k3 left09:12
← arvind_khadri left09:12
← blami_orcl left09:12
→ blami_orcl joined09:13
← siriuz left09:13
→ FernandoBasso joined09:13
→ arand joined09:15
→ siriuz joined09:16
← Guest88035 left09:16
← hafeez3000 left09:16
← smirn0v left09:17
← Sigma left09:17
→ yrrrep joined09:17
→ L-Chymera joined09:17
← JosefAssad left09:18
→ CZer0 joined09:18
← stephan_ left09:18
→ stephanmg joined09:19
← Sky[x] left09:19
← pantsman left09:19
→ PixelCrumbs joined09:19
→ maletor joined09:20
→ kewah joined09:21
→ Dr4k3 joined09:21
→ barq joined09:22
← barq left09:22
→ barq joined09:22
← siriuz left09:23
← irqq left09:24
→ mastroWork joined09:24
← Dr4k3 left09:24
← maletor left09:25
← TheJH left09:26
→ siriuz joined09:26
esc in case anyone from Berlin would like to join: http://krzz.de/4w09:27
→ howlymowly joined09:27
← mastro__ left09:27
mrwonko I'll be in berlin that day, but that's because it's during A MAZE, so I won't actually have time. bad date to pick :D09:28
→ TheJH joined09:28
← Guest51026 left09:28
← _iron left09:29
← jyp_ left09:29
→ arvind_khadri joined09:30
→ Noldorin joined09:30
→ JosefAssad joined09:31
→ KevinSjoberg joined09:32
← hyperair left09:32
← siriuz left09:33
→ sveajobb joined09:33
→ smirn0v joined09:33
→ hafeez3000 joined09:34
→ herbnerder joined09:34
← beaky left09:35
mrwonko huh, how did I mess that up09:35
wrong chat09:35
sveajobb hi, is there a way to get a list of new commits on master from a branch (master is merged into branch at regular intervals), I want to see the new "pending" commits in the master branch09:36
→ siriuz joined09:36
→ Dr4k3 joined09:37
← Andromeda left09:37
_ikke_ git log branch..master?09:37
Eugene !lol09:37
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all09:37
_ikke_ That shows branches that are in master, but not in branch09:37
← Error404NotFound left09:38
→ juril joined09:38
← Dr4k3 left09:38
← s0ber left09:38
→ Dr4k3 joined09:38
← Dr4k3 left09:39
sveajobb _ikke_, ... thanks :) I should have thought of that09:39
→ Laurenceb_ joined09:39
→ s0ber joined09:40
← smirn0v left09:41
→ marhaban joined09:41
→ rednaks joined09:42
← siriuz left09:42
rjc_ → rjc09:43
← weiyang left09:43
→ mastro__ joined09:44
jast esc: we have an "Adalbertstraße" here, too... is it okay if I go there instead? :}09:44
esc jast: your welcome to try and hope for quantum entanglement09:45
→ lalondong joined09:45
← jnavila__ left09:46
→ Raging_Hog joined09:46
→ smirn0v joined09:46
→ lb1a joined09:46
← lb1a left09:46
→ lb1a joined09:46
gitinfo set mode: +v09:47
→ siriuz joined09:47
← mastroWork left09:47
← lalondong left09:47
→ jnavila__ joined09:48
→ dregad joined09:48
sveajobb git log ..master was just a tad more elegant than my solution :) P=$( git merge-base HEAD master ); git log $P..master09:48
→ lalondong joined09:48
← barneybook left09:48
← lalondong left09:48
← _Harm_B_1 left09:49
→ jlg13 joined09:50
_ikke_ You didn't even need to find the merge-base09:51
→ mastroWork joined09:51
→ Error404NotFound joined09:52
← CZer0 left09:52
← mrwonko left09:52
← yacks left09:52
→ jkremser joined09:52
← siriuz left09:53
→ ozette joined09:53
← RaceCondition left09:53
← mastro__ left09:54
← maxmanders left09:55
→ marhaban1 joined09:55
→ mastro joined09:55
→ tonko joined09:56
→ freestyler7 joined09:56
→ Sky[x] joined09:56
← sveajobb left09:56
→ maxmanders joined09:56
_ikke_ oh, dat gaat nu via het rails commando09:56
← marhaban1 left09:57
→ siriuz joined09:57
← smirn0v left09:58
← mastroWork left09:58
→ mastroWork joined09:59
cmn was that dutch?10:00
→ LeMike joined10:00
→ lalondong joined10:00
→ Element9 joined10:01
jast yes10:01
_ikke_ yes10:01
wrong chat window10:01
← lalondong left10:01
← Laurenceb_ left10:02
← siriuz left10:03
← mastro left10:04
→ hyperair joined10:04
lb1a interesting language10:04
→ smirn0v joined10:04
→ siriuz joined10:04
← bremner left10:04
jast yeah10:05
→ mastro__ joined10:05
_ikke_ It's similar to german10:05
← xiukun left10:06
lb1a _ikke_: i know ^^10:06
← cyphase left10:06
_ikke_ That was for people who didn't know ;)10:06
→ cyphase joined10:06
lb1a i'm able to understand it, but it's still a language that sounds "funny" to me10:06
it's like the german bavarian accent10:06
→ angelsl joined10:07
lb1a you can guess what they want, but have to stay calm and not laugh publicly ;)10:07
jast Dutch is more different from German than Bavarian is, though :}10:07
→ Fandekasp joined10:07
→ Dr4k3 joined10:07
lb1a of course10:07
jast granted, I have to focus quite a bit more than normal for understanding either of them10:07
_ikke_ Same counts for me for understanding German ;-)10:08
jast turns out that spending a lot of time in NL for ~5 years doesn't magically teach you the language10:08
← mastroWork left10:08
→ bremner joined10:08
← bremner left10:08
→ bremner joined10:08
_ikke_ We had a few German class mates which had to learn it in 10 weeks10:08
lb1a jast: seems legit. you probably spoke a lot of english that time? ;)10:09
← marhaban left10:09
lb1a _ikke_: did it work?10:09
jast I did10:09
it's perfectly possible to learn quickly with German as a background, though10:10
_ikke_ lb1a: Some better than others, but the spoke quite good dutch10:10
← siriuz left10:10
← simesy left10:10
← mastro__ left10:10
→ mastroWork joined10:10
← qwertz_ left10:11
→ achadwick joined10:11
lb1a good to know that, i had a work offer in nl some time ago. wasn't so sure about it10:11
→ Gentlecat joined10:12
→ siriuz joined10:12
← jceb left10:12
→ jceb joined10:13
_ikke_ The most anoying sound for germands is the sch sound10:13
dutch prononcuation that is10:13
→ mastro__ joined10:13
→ beautifulmind joined10:14
→ elixir joined10:14
→ simesy joined10:14
← JosefAssad left10:14
← spuz_ left10:15
→ spuz joined10:15
→ irqq joined10:16
← mastroWork left10:16
← bremner left10:18
→ mastroWork joined10:18
→ Kje10L joined10:18
← FernandoBasso left10:19
← mastro__ left10:21
← yshh left10:22
← siriuz left10:23
→ mastro__ joined10:24
← mastroWork left10:24
→ siriuz joined10:25
← L-Chymera left10:25
→ ifairbairn joined10:25
← ph^ left10:25
→ Thra11 joined10:26
← ifairbairn left10:26
← simesy left10:26
← normanrichards left10:26
← Thra11 left10:27
→ toshywos1y joined10:28
← mklappstuhl left10:28
→ simesy joined10:29
→ Thra11 joined10:29
→ bremner joined10:29
← bremner left10:29
→ bremner joined10:29
_ikke_ Anecdote: Dutch used that in WWII to tell if someone was dutch or german10:30
← siriuz left10:30
← Thra11 left10:30
→ chichouw joined10:31
→ hakunin joined10:31
← toshywoshy left10:31
← maxmanders left10:32
→ nabdev joined10:32
→ sonda joined10:32
→ siriuz joined10:32
→ jlebar_ joined10:32
→ wcpan_ joined10:32
← Dr4k3 left10:33
→ mastroWork joined10:33
← tomek left10:33
nabdev hi all , i commit in branch A and i passed to branch B (master ) without push it , i have this message : "Your branch is ahead of 'origin/master' by 1 commit" and the content of branch revesed :/10:34
→ kortti_ joined10:34
→ jMCg_ joined10:34
→ Gaga joined10:34
→ thnee_ joined10:34
← stephanmg left10:34
→ Hamled|Erp joined10:34
→ bartman` joined10:35
→ borior_ joined10:35
← borior_ left10:35
→ borior_ joined10:35
→ stephan_ joined10:35
← jlg13 left10:35
spuz nabdev: that's nice, what's your question?10:35
→ offbyone- joined10:35
→ maxmanders joined10:36
← mastro__ left10:36
← snql left10:36
→ atrus` joined10:37
→ RobertLaptop_ joined10:37
security → fire10:37
→ alegen_ joined10:37
→ alip_ joined10:38
→ LocalPCGuy joined10:38
← siriuz left10:38
nabdev haw can i return the content of branch master like want i create my second branch A10:38
→ cschneid_ joined10:38
← Chaser left10:39
← bartman left10:39
← kortti left10:39
← Guest98887 left10:39
← aboudreault left10:39
← Hamled left10:39
← jlebar left10:39
← wcpan left10:39
← atrus left10:39
← kermit left10:39
← hakunin_ left10:39
← MetaCosm left10:39
← alegen left10:39
← hesco1 left10:39
← chichou left10:39
← RobertLaptop left10:39
← ping-pong left10:39
← guide left10:39
← alip left10:39
← offbyone left10:39
← Maelstrom left10:39
← steven- left10:39
← thnee left10:39
← jMCg left10:39
← Stravy left10:39
← Juri_Agarin left10:39
← cschneid left10:39
← borior left10:39
alip_ → alip10:39
← exidl left10:39
borior_ → borior10:39
← joon left10:39
→ steven- joined10:39
spuz nabdev: are you asking how you merge your changes from one branch to another?10:39
→ siriuz joined10:39
→ exidl joined10:39
→ tomek joined10:39
← simesy left10:40
→ ping-pong joined10:40
→ MetaCosm_ joined10:40
→ Stravy joined10:40
→ Chaser joined10:40
→ Guest98887 joined10:41
→ mastro__ joined10:41
→ aboudreault joined10:41
→ hesco joined10:42
→ jyp joined10:42
← techlife left10:43
← Error404NotFound left10:44
→ guide joined10:44
← mastroWork left10:45
← siriuz left10:45
→ mastroWork joined10:46
→ siriuz joined10:46
→ techlife joined10:49
← techlife left10:49
← mastro__ left10:49
→ techlife joined10:49
← techlife left10:49
→ Thra11 joined10:50
→ techlife joined10:50
← techlife left10:50
→ techlife joined10:50
← techlife left10:50
← Noldorin left10:51
→ techlife joined10:51
← techlife left10:51
→ techlife joined10:52
← techlife left10:52
→ tirengarfio joined10:52
→ techlife joined10:52
← techlife left10:52
← smirn0v left10:52
← siriuz left10:52
← ojacobson left10:53
→ edgeuplink joined10:55
→ Error404NotFound joined10:57
→ tevio joined10:57
→ techlife joined10:58
← techlife left10:58
← mastroWork left10:59
→ techlife joined10:59
→ DoniRS joined10:59
→ p3lim_ joined11:02
→ sqwk joined11:02
→ sebrock joined11:02
sqwk How can I run a post-update hook as a different user? at the moment it checks out all files as root, ideally it should run as the www apache user11:03
_ikke_ sqwk: Why are you pushing via root?11:04
← p3lim left11:04
→ nihilista joined11:04
sqwk _ikke_: ah, it has to do with the user that pushes into the repo?11:04
← Error404NotFound left11:04
_ikke_ sqwk: The user you ssh into11:04
← p3lim_ left11:06
→ pastime joined11:08
← maxmanders left11:09
← robbyoconnor left11:11
← dregad left11:11
→ Noldorin joined11:11
→ mastroWork joined11:12
→ p3lim joined11:14
← exidl left11:14
lb1a sqwk: sounds like you're trying to !deploy with git. maybe the tips help11:14
gitinfo sqwk: Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html11:14
→ p3lim_ joined11:16
← p3lim left11:18
→ gusnan joined11:19
← mitz__ left11:20
→ Dr4k3 joined11:20
→ huoxito joined11:21
← TheJH left11:22
← dsirijus left11:22
→ TheJH joined11:22
sqwk _ikke_ thanks, took a bit of reconfiguring but works flawlessly now :D11:23
→ oehman joined11:26
→ marhaban joined11:27
← marhaban left11:28
→ prudniko joined11:28
← tim left11:29
← j416 left11:29
→ j416 joined11:29
→ yacks joined11:29
→ tim joined11:29
← tomplast left11:29
→ JEEBcz joined11:29
← mh` left11:29
← kennethreitz left11:29
← prudnikov left11:29
← ciaranm left11:29
→ ciaranm joined11:29
→ sirdancealo2 joined11:30
← JEEB left11:30
→ kennethreitz joined11:31
→ mh` joined11:31
→ BSaboia joined11:31
← techlife left11:32
→ yshh joined11:32
→ aartist joined11:32
→ maxmanders joined11:33
← PixelCrumbs left11:35
← s0ber left11:35
→ techlife joined11:35
← ciaranm left11:35
→ PixelCrumbs joined11:36
← yshh left11:37
→ ciaranm joined11:37
← ciaranm left11:37
→ ciaranm joined11:37
→ ph^ joined11:39
← yacks left11:40
→ yacks joined11:41
← ph^ left11:41
→ barneybook joined11:42
← jyp left11:42
→ mihamina joined11:43
← JohnBat26 left11:43
irqq I started and committed some changes in master, but my actual intention was to do it in a new branch. How to fix it now?11:43
→ chimay joined11:44
← TheJH left11:44
_ikke_ irqq: Create a temporary branch, reset master to it's original position, rebase the tmp branch to the desired branch, merge desired branch with tmp branch11:44
→ TheJH joined11:45
← pradi left11:45
← thnee_ left11:45
← Raging_Hog left11:46
→ w09x joined11:48
← skorgon left11:48
shruggar irqq, _ikke_: git branch <new-branch> && git reset --keep <commit-you-want-to-be-in-master>11:49
→ JohnBat26 joined11:49
→ ThePawnBreak joined11:51
← Thra11 left11:51
← elixir left11:52
→ Error404NotFound joined11:52
← mastroWork left11:52
→ papegaaij joined11:52
→ qwertz_ joined11:53
← trusktr left11:53
→ Thra11 joined11:53
← rasto left11:55
→ cannonball joined11:55
irqq it worked. Thank you both.11:56
→ freeed joined11:56
→ dsirijus joined11:58
← JohnBat26 left11:58
→ mitz__ joined11:58
← PixelCrumbs left11:58
→ rue_XIV joined11:59
← tim left11:59
← j416 left11:59
→ tbosua joined11:59
→ pradi joined11:59
→ j416 joined11:59
← barneybook left11:59
→ PixelCrumbs joined11:59
← PixelCrumbs left12:00
→ barneybook joined12:00
→ elixir joined12:00
→ PixelCrumbs joined12:01
← rue left12:01
→ siriuz joined12:03
→ skorgon joined12:04
lb1a oh12:05
lb1a wasn't aware of git reset --keep. looks quite useful12:06
← PixelCrumbs left12:06
_ikke_ It's basically a safer version than --hard12:06
← LaunchDirector left12:07
lb1a _ikke_: yeah, i usually use a temp branch or stash. but keep looks useful too12:07
← markovh left12:07
→ vedant_ joined12:07
_ikke_ lb1a: Well, it just aborts when it would need to delete unstaged changes12:07
lb1a _ikke_: so it's preserve you from loosing data, right?12:08
→ mastroWork joined12:08
← unreal left12:08
_ikke_ yes12:09
← aartist left12:09
← Noldorin left12:09
← vedant_ left12:09
← mihamina left12:09
lb1a i love it without testing or use case so far ^^12:09
→ vedant_ joined12:10
→ Lewoco_ joined12:10
SeoZ → SeoZ-work[AWAY]12:10
← skorgon left12:10
→ kmels_ joined12:11
→ cristi_ joined12:11
← beautifulmind left12:11
cristi_ → Guest7754412:11
→ beneggett joined12:12
→ aartist joined12:13
← ThePawnBreak left12:13
← Lewoco left12:14
→ jcao219 joined12:15
→ Mallo joined12:15
→ LaunchDirector joined12:15
Mallo Morning everyone ! Just a quick question. Is it a normal behavior for git to remove the ignored files during a pull ?12:16
→ smirn0v joined12:16
← siriuz left12:16
Mallo I work in a environment with a special config file for each developer, so this config file is specified in the .gitignore file. But when we "pull", this config file disapears12:17
_ikke_ Mallo: Only when the file has been deleted in the commits thet get 'pulled12:17
'12:17
→ siriuz joined12:18
Mallo I see... is there a way to keep it now ? (btw, aren't you working with kohana or something ? I feel like I've seen your username somewhere)12:18
_ikke_ Mallo: I'm active in #kohana too yeah12:18
← luc_ left12:19
→ markovh joined12:19
Mallo ;-)12:19
← jargon left12:20
→ rath_ joined12:20
← vedant_ left12:20
← huoxito left12:20
Mallo So, let's say I want these file not to be deleted in the future, should I add them to the repository then ? But they're suppose to be ignored so... what's the proper way to do ?12:20
→ skorgon joined12:21
← pradi left12:21
→ mastro__ joined12:21
← oehman left12:22
→ quazimodo joined12:22
← beneggett left12:23
→ mitz_ joined12:23
_ikke_ Mallo: It's not deleted everytime you pull12:23
← rath left12:23
← siriuz left12:24
_ikke_ Mallo: It's just a result of the merge. Git sees that the file has been deletedm, so it deletes it locally. Next time you merge, it doesn't know about the file anymore, so it leaves it alone12:24
← mastroWork left12:24
→ kristofers joined12:24
← alunduil left12:25
← mitz__ left12:25
Mallo so if I pull again, the file should not disappear ? Let's try12:25
_ikke_ Mallo: correct12:25
→ ojacobson joined12:25
→ siriuz joined12:26
Nevik unless it gets added and deleted somewhere12:26
_ikke_ Mallo: though, this will happen for each branch where the 'delete' gets merged in12:26
→ tinti joined12:27
Mallo Well, everything stayed this time. Okay, it was just a one time bad luck. I'll try to merge everything and start from this point then, thanks !12:27
Nevik we should add a disclaimer somewhere saying something like "When we say 'X will happen', we mean 'under normal circumstances, without you doing anything stupid, X will happen.' Don't sue us if you can't follow directions."12:27
Nevik thinks about adding that as a trigger12:28
← Dr4k3 left12:28
← kewah left12:29
→ Dr4k3 joined12:29
→ mastroWork joined12:29
← mastro__ left12:29
→ gcollum joined12:29
→ broonie joined12:30
→ nkr joined12:30
broonie Is there any work going on on improving the way that the auto gc triggers?12:31
← gcollum left12:31
← siriuz left12:31
lb1a smiles about Nevik's humor ;)12:31
Nevik lb1a: i have to say. i always feel compelled to include "*usually* X will happen" or "*unless* you mess up Y"12:32
→ huoxito joined12:32
Nevik both for my own OCDish need for completeness, and so people dont come back crying "you said Z wouldnt happen!"12:32
→ siriuz joined12:33
lb1a is still smiling ;)12:33
→ unreal joined12:34
bremner Nevik: there is always !refund12:34
gitinfo Nevik: If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.12:34
← Mallo left12:34
← BSaboia left12:34
Nevik hah, true12:34
while this additional info can overload some people who are new to all of git, i am generally grateful for "hearing the whole story" when i do new stuff myself12:35
bremner oddly enough the one time a guy was desperate to pay for support, that didn't work out either.12:35
Nevik so guess that's kind of a golden rule thing too12:35
→ chuckharmston joined12:36
← w09x left12:36
← pastime left12:38
← markovh left12:38
← jcao219 left12:38
→ nathanr joined12:38
← siriuz left12:39
← LaunchDirector left12:39
→ rideh joined12:40
→ mastro__ joined12:40
→ siriuz joined12:41
← eletuchy left12:41
← nathanr left12:43
← mastroWork left12:43
→ bmac joined12:43
← NiteRain left12:44
→ JohnBat26 joined12:44
→ LaunchDirector joined12:45
→ gregsmith joined12:45
→ mihamina joined12:45
← gregsmith left12:45
← Error404NotFound left12:46
← ISF left12:46
← p3lim_ left12:46
→ p3lim joined12:47
→ Error404NotFound joined12:47
→ mercwithamouth joined12:47
← siriuz left12:47
→ thelodger joined12:47
← skoop left12:50
← jab416171 left12:50
← edgeuplink left12:51
← steven- left12:51
← nardev left12:51
← stfn left12:51
← roflin left12:51
→ ilogger2_ joined12:52
→ Raging_Hog joined12:52
→ nardev joined12:52
→ stfn joined12:52
→ else- joined12:52
→ tmcmahon joined12:54
→ ph^ joined12:55
→ jali_f joined12:55
→ nioncode joined12:56
→ herdingcat joined12:56
→ marhaban joined12:57
→ rath joined12:57
→ siriuz joined12:58
← jali_f left12:58
← marhaban left12:58
→ kukks joined12:58
← kukks left12:58
→ kukks joined12:58
→ skoop joined12:59
→ ojacobson_ joined13:00
→ jali_f joined13:02
→ mastro__ joined13:02
→ SecretAgent joined13:04
→ Chikore joined13:05
→ TBoneCam__ joined13:05
→ anonymuse joined13:06
→ jaequery joined13:06
← siriuz left13:06
→ p3lim joined13:07
→ kmels__ joined13:08
→ siriuz joined13:09
→ eletuchy joined13:11
→ avinashrbhat joined13:12
→ hafeez3000 joined13:13
← siriuz left13:14
← tmcmahon left13:14
→ breakingthings joined13:14
ojacobson_ → ojacobson13:15
→ siriuz joined13:15
← eletuchy left13:15
→ trungqtran joined13:15
→ JosefAssad joined13:15
→ ThePrimeMedian joined13:16
→ dregad joined13:17
← Chikore left13:17
→ nathanr joined13:18
→ R1KRDO joined13:18
→ oehman joined13:19
← hafeez3000 left13:19
→ hafeez3000 joined13:20
→ GarethAdams joined13:20
→ alunduil joined13:21
→ elixir joined13:21
← siriuz left13:21
→ mastroWork joined13:22
← mastro__ left13:22
yac git add -p doesnt work on untracked files13:23
Bombe Surprise. NOT.13:24
cmn use -N13:24
→ siriuz joined13:24
→ m0ltar joined13:25
→ scelis joined13:25
→ KevinSjoberg joined13:27
→ AaronMT joined13:27
→ gkatsev joined13:28
GarethAdams is there an easy way to `git config branch.*.rebase true` for all existing branches?13:28
← hafeez3000 left13:28
→ hkj joined13:28
← hkj left13:28
← siriuz left13:28
→ Dr4k3 joined13:29
→ hkj joined13:29
→ normanrichards joined13:29
← hkj left13:29
← mastroWork left13:29
→ TeckniX joined13:29
→ hkj joined13:30
→ Iszak joined13:31
→ cirenyc joined13:32
→ cellardoor joined13:32
cmn loop over them13:32
or are you looking for the config to do it always?13:33
→ siriuz joined13:33
GarethAdams I guess I'm asking in the wrong place, my shellscript-fu isn't hot enough13:34
→ fooey joined13:36
→ jonatasnona joined13:37
→ mmitchell joined13:37
← mmitchell left13:38
→ thl0 joined13:39
osse I though you could actually write what GarethAdams did literally, and it would work as a "default" value13:39
← siriuz left13:39
← normanrichards left13:39
osse But the man page doesn't mention it13:39
← ThePrimeMedian left13:39
GarethAdams osse: ah, it looks like you can13:40
osse: I tried that earlier but forgot that zsh would be trying to expand *13:41
→ mmitchell joined13:41
→ eletuchy joined13:41
→ siriuz joined13:41
→ Error404NotFound joined13:41
→ cbot_ joined13:42
→ hafeez3000 joined13:42
→ mezner joined13:43
→ ThePawnBreak joined13:43
← thl0 left13:44
→ thl0 joined13:44
← TBoneCam__ left13:44
→ mastroWork joined13:45
→ ThePrimeMedian joined13:46
← siriuz left13:46
→ yacks joined13:48
→ macabre joined13:48
→ siriuz joined13:48
osse GarethAdams: does it actually work as expected?13:49
→ MattStratton joined13:49
→ jyp joined13:49
osse yeah, zsh's defaults are equivalent to bash's failglob13:50
→ sgambino joined13:50
→ xalbo joined13:50
→ revagomes joined13:50
→ thiago joined13:51
→ mastro__ joined13:51
GarethAdams osse: sorry, seems not. I forgot to come back and say that13:51
I'm not really *that* bothered about the behaviour and I'm working on other things that need more time13:52
osse Damn. I was hoping it would work and that it wasn't documented. That way I could submit a patch and get my name ferever engraved in git.git ^_^13:52
lb1a osse: do the patch that fixes it ;)13:53
"fixes"13:53
← cbot_ left13:53
osse lb1a: heh, I got have a go at it. My C isn't that strong though. Well, I know the basics. But I always think it's hard to "get to know" an existing large codebase13:53
*I could have13:53
cmn you can do something similar if you tell config to use a regex relace13:53
→ Lefont joined13:54
← mastroWork left13:54
→ gregsmith joined13:54
← siriuz left13:54
→ acharlieh joined13:55
→ mastroWork joined13:56
← Lefont left13:56
→ BSaboia joined13:56
→ daniel_- joined13:56
← daniel_- left13:56
→ daniel_- joined13:56
→ siriuz joined13:57
→ micky62g joined13:59
← mastro__ left13:59
gitinfo set mode: +v13:59
→ exidl joined14:01
m1sc GarethAdams: you could use for-each-ref, something like "for b in $(git for-each-ref --format '%(refname)' refs/heads/*); do echo ${b#refs/heads/}; done"14:01
osse cmn: what do mean?14:01
→ babilen joined14:02
cmn you can do a regex substitution on branch\..*\.rebase = true14:02
which will write out for each one14:02
← jyp left14:02
→ Octalot joined14:03
osse Awesome.14:04
← siriuz left14:04
→ bmac joined14:04
→ siriuz joined14:06
→ burzum joined14:06
→ mastro__ joined14:06
→ barq joined14:06
← barq left14:06
→ barq joined14:06
→ beneggett joined14:08
→ stack joined14:09
← mastroWork left14:09
← barq left14:09
← fooey left14:11
→ mikecmpbll joined14:11
← siriuz left14:11
→ ErKa joined14:11
→ plumpkin joined14:11
→ barq joined14:12
← barq left14:12
→ barq joined14:12
← mezner left14:12
→ mezner joined14:12
→ natechan joined14:13
→ siriuz joined14:13
← ph^ left14:13
→ mastroWork joined14:14
→ marhaban joined14:14
← jaequery left14:14
← mastro__ left14:17
→ arvind_khadri joined14:17
→ plumpkin- joined14:17
← marhaban left14:17
← avinashrbhat left14:18
→ d2dchat joined14:18
→ rideh joined14:18
← plumpkin left14:18
← beneggett left14:19
← siriuz left14:19
← arvind_khadri left14:20
→ v0n joined14:20
→ Plouj joined14:21
→ NiteRain joined14:21
→ smirn0v joined14:22
→ nihilista joined14:22
← nihilista left14:22
→ siriuz joined14:23
→ arvind_khadri joined14:23
gitinfo set mode: +v14:23
→ nihilista joined14:23
ChanServ set mode: -v14:24
→ jaequery joined14:24
→ mastro__ joined14:24
← trungqtran left14:24
← rideh left14:25
→ guampa joined14:26
← guampa left14:27
← hafeez3000 left14:27
← mastroWork left14:27
← arvind_khadri left14:27
→ guampa joined14:27
← siriuz left14:28
→ Phoenixz joined14:29
← Phoenixz left14:29
→ Phoenixz joined14:29
→ AdrienBrault joined14:30
→ siriuz joined14:31
→ Liir joined14:32
→ Katafalkas joined14:32
→ Lefont joined14:33
→ rideh joined14:33
← oehman left14:34
→ surfdue joined14:35
← KevinSjoberg left14:35
← barq left14:35
← siriuz left14:36
→ pradi joined14:36
→ AnimeCYC joined14:36
→ tmiller joined14:36
→ sgkim126t joined14:37
→ yrrrep joined14:38
→ dougsland_ joined14:38
← mastro__ left14:38
→ siriuz joined14:39
→ fooey joined14:39
→ normanrichards joined14:40
stack hello, I'm trying to use submodules in a ricorsive manner, I have repoA that contains 3 submodules, one of them (subA) contains another 2 submodules, when I do git clone repoA && git submodule init/update, I get subA in a detached head state and I must do git submodule init git submodule update there, is that a way to have recursive submodules initialized and updated automatically?14:40
← gregsmith left14:40
← smirn0v left14:40
ojacobson submodules are normally in the detatched state14:41
in commit foo of the outer repository, git links to commits in each subrepository *by hash*14:41
'git submodule init' and other things that manipulate submodules will check out that exact hash, without regard to branches or tags14:42
stack mh probably I'm understanding, that is also the reason I have to git checkout master after having updated all submodules right?14:44
ojacobson you don't have to.14:44
Why do you believe you have to?14:44
← hkj left14:44
→ mastro joined14:45
ojacobson Git's checked out the correct commit in each submodule. That's what submodules do: stitch a specific commit in one repository into another ("outer") repository.14:45
stack I had to do that because in that example I was still in a detatched state after having updated all submodules14:45
ojacobson There's nothing wrong with being in the "detatched" state, so that doesn't tell me why you think you had to.14:45
← mastro left14:45
→ Artpicre joined14:45
ojacobson Detatched heads are perfectly normal if you're dealing with submodules. If you're trying to add new commits to those submodules, then the detatched head state may cause problems (lost commits, mostly) but you should probably not use submodules for that.14:46
→ markalanevans joined14:46
ojacobson They're really only meant for read-only views, not for concurrent development spanning multiple repos.14:46
→ ehsan joined14:46
→ mastro joined14:46
→ |Freeman| joined14:47
→ m0viefreak joined14:47
← nihilista left14:47
← yacks left14:47
← m0viefreak left14:47
→ m0viefreak joined14:47
→ feider joined14:47
→ TheJH joined14:47
→ hkj joined14:47
→ ph^ joined14:47
← hkj left14:47
← siriuz left14:47
stack ojacobson: readonly views? what does that mean?14:47
gitinfo set mode: +v14:48
ojacobson stack: where you treat the submodules as "Read only" subtrees, except for occasionally updating them to new versions of their parent repo14:48
→ Dougie187 joined14:48
→ hkj joined14:48
→ RoyBellingan joined14:48
ojacobson but never make new commits in the submodules14:48
and never edit files in the submodule14:48
feider Hi. This may be a stupid question, but: what command do I have to use, when I want to see if the version of a branch on a server is newer than my version and if yes, update my version? I want to write a script to auto-update a program via git14:49
← Lefont left14:49
→ mastroWork joined14:49
→ smirn0v joined14:50
← markalanevans left14:50
ojacobson feider: if you have a local branch (refs/heads/foo) tracking some remote branch (refs/remotes/origin/foo), then 'git checkout foo && git pull --ff-only' will do what you most likely want (fetch 'origin', and fastforward refs/heads/foo onto refs/remotes/origin/foo if possible, or fail if they've diverged)14:50
→ AndroUser2 joined14:50
ojacobson You can decompose that into fetch and merge steps if you like, the --ff-only part is the important part14:50
→ thinkdevcode joined14:51
→ marthinal joined14:51
→ jamesez joined14:51
feider ok, thank you. I'll try that now14:51
→ siriuz joined14:51
→ guns joined14:51
→ barq joined14:51
← barq left14:51
→ barq joined14:51
ojacobson you'll want to reach man git-fetch and man git-merge14:51
gitinfo the git-fetch manpage is available at http://jk.gs/git-fetch.html14:51
the git-merge manpage is available at http://jk.gs/git-merge.html14:51
ojacobson (git-pull is a combination of those two things)14:52
→ etcetera joined14:52
→ kermit joined14:52
stack ojacobson: could you please explain better why?14:52
ojacobson stack: not as well as man git-submodule can, honestly14:53
gitinfo stack: the git-submodule manpage is available at http://jk.gs/git-submodule.html14:53
→ beneggett joined14:53
← v0n left14:53
← mastro left14:53
→ v0n joined14:53
ojacobson the submodule stuff is designed to solve the problem of including other peoples' code in your own repos, by repository inclusion14:53
the implementation tracks specific commits for each submodule, not branches14:53
that makes it hard to use them for concurrent development that spans both the outer repo and one or more submodules14:54
← siriuz left14:54
→ Dr4k3_ joined14:56
← Dr4k3 left14:57
→ trungqtran joined14:57
→ luc_ joined14:58
→ markalanevans joined14:59
← acharlieh left14:59
← bmac left14:59
→ tonko joined15:00
stack ojacobson: ok thanks now I've understanded that, thanks15:01
→ siriuz joined15:01
← siriuz left15:01
→ siriuz joined15:01
ojacobson !submodule15:01
gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://book.git-scm.com/5_submodules.html15:01
ojacobson !slave15:01
gitinfo [!gitslave] gitslave (http://gitslave.sf.net) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.15:01
ojacobson !subproject15:02
gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.15:02
← ThePrimeMedian left15:03
→ endikos joined15:04
← guns left15:04
← beneggett left15:04
→ infynyxx joined15:04
→ system64 joined15:05
← markalanevans left15:06
← Error404NotFound left15:06
← eletuchy left15:06
→ mossplix joined15:06
← jonatasnona left15:07
→ mutex joined15:07
← mossplix left15:09
→ mossplix joined15:09
← siriuz left15:10
→ PixelCru_ joined15:11
← natechan left15:11
← fooey left15:12
← rath left15:12
→ siriuz joined15:13
→ jonatasnona joined15:13
→ natechan joined15:14
→ MrNibbles joined15:14
→ jcarouth joined15:15
← thinkdevcode left15:15
→ antihero joined15:17
→ jnavila joined15:17
→ vpopov joined15:17
antihero is there a way to use patience diff with git add -p by default?15:17
→ yacks joined15:17
← |Freeman| left15:17
→ Error404NotFound joined15:18
→ mastro__ joined15:19
→ flaguy48 joined15:19
→ spaceships joined15:19
→ maxandersen joined15:19
← maxandersen left15:19
→ maxandersen joined15:19
→ luc__ joined15:20
← tonko left15:20
→ tonko joined15:20
← siriuz left15:20
→ rcu joined15:20
← tonko left15:20
← AndroUser2 left15:20
← etcetera left15:21
→ wedgeV joined15:21
antihero til: nop15:21
→ madduck joined15:21
← madduck left15:21
→ madduck joined15:21
← mastroWork left15:22
→ Treggats joined15:22
→ siriuz joined15:22
→ mviitanen joined15:23
→ szx joined15:23
← luc_ left15:23
← mviitanen left15:24
→ avinashrbhat joined15:24
Remram how can I put several commands in a git alias?15:25
→ knightshade joined15:25
→ knightshade2 joined15:25
Remram it seems to ignore what's after the ;15:25
→ Davey joined15:25
→ tjbiddle joined15:25
← trungqtran left15:27
→ nylinuxhelp joined15:27
← mmitchell left15:27
← nylinuxhelp left15:27
Eugene Remram - just write a shell script; drop it in ~/bin/(or other PATH location) as git-foo15:27
→ fooey joined15:28
→ mmitchell joined15:28
← knightshade2 left15:29
→ barneybook joined15:29
→ scorphus joined15:29
stack so , supposing I have two parts of a project that are forked from two other svn/cvs repo, what is the best way to include them as a subdir in my repo/project ? I also need to update them from upstream sometime, rebasing my mods from there15:29
← barneybook left15:29
← fooey left15:30
→ barneybook joined15:30
→ beneggett joined15:30
← siriuz left15:30
→ btree joined15:30
← barneybook left15:30
endikos Hey folks, I have a submodule that doesn't seem to want to update to the latest HEAD rev of the project it was pulled from. Is there a way to easily delete teh submodule and start over, or is there a better way to get up to HEAD?15:31
→ fooey joined15:31
← btree left15:31
→ barneybook joined15:31
← mastro__ left15:31
→ shruggar joined15:32
ojacobson endikos: this comes up a lot: submodules do not track branches and therefore do not automatically update to new commits on any branch, not even if you created them from a branch in the first place15:32
they track specific commits15:32
to update them, check out the commit you want, then git-add and git-commit the submodule *in the outer work tree*.15:32
→ sonda joined15:32
→ eletuchy joined15:33
← shruggar left15:33
→ shruggar joined15:33
→ siriuz joined15:34
endikos ojacobson: OK. Thanks!15:34
ojacobson if you want that kind of automatic-tracking behaviour, you don't want submodules15:34
!subprojects15:34
gitinfo So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.15:34
→ oakdog8 joined15:35
→ irqq joined15:35
← mmitchell left15:36
← normanrichards left15:37
→ eijk_ joined15:38
→ mmitchell joined15:38
→ ThePrimeMedian joined15:38
← siriuz left15:38
← ThePrimeMedian left15:39
← Dr4k3_ left15:40
→ Dr4k3 joined15:41
← ThePawnBreak left15:41
← luc__ left15:42
← smirn0v left15:42
→ siriuz joined15:42
→ lun_ joined15:43
← Dr4k3 left15:43
→ Dr4k3 joined15:43
→ ThePawnBreak joined15:44
→ marhaban joined15:44
endikos ojacobson: Thanks much. Got it sorted now. I appreciate it!15:44
→ bmac joined15:44
→ smirn0v joined15:45
→ doener joined15:45
→ kevwil joined15:46
→ LeMike joined15:47
← Dr4k3 left15:48
→ Dr4k3 joined15:48
→ ISF joined15:48
← jaequery left15:48
→ spaceonline joined15:49
← tjbiddle left15:49
→ traviscj joined15:50
→ meLon_ joined15:50
← MattStratton left15:50
→ robbyoconnor joined15:50
→ rath joined15:50
← meLon_ left15:50
← siriuz left15:50
← marhaban left15:51
← thiago left15:51
← LeMike left15:51
→ meLon joined15:51
→ ScottE joined15:51
→ heytrav joined15:52
→ pitzips joined15:52
→ MattStratton joined15:53
→ siriuz joined15:53
← robbyoconnor left15:54
← babilen left15:55
← barq left15:56
→ robbyoconnor joined15:57
← Dr4k3 left15:58
← MattStratton left15:59
→ Dr4k3 joined15:59
→ hellopat joined16:00
← siriuz left16:00
→ MattStratton joined16:00
← ph^ left16:01
← Error404NotFound left16:01
→ LeMike joined16:01
← beneggett left16:01
← kevwil left16:01
→ ph^ joined16:01
→ rakl joined16:02
← AdrienBrault left16:03
→ siriuz joined16:04
→ jaequery joined16:04
← rakl left16:04
← spaceonline left16:05
← szx left16:05
← jaequery left16:05
→ rakl joined16:05
→ kevwil joined16:05
← kevwil left16:06
→ AdrienBrault joined16:06
← ISF left16:06
← tmiller left16:07
← rakl left16:07
→ dhruvasagar joined16:07
→ Kje10L joined16:07
→ rakl joined16:08
→ johnfg joined16:08
johnfg hi folks16:08
→ mitz joined16:08
→ kevwil joined16:08
→ acharlieh joined16:08
→ beneggett joined16:08
← rakl left16:08
← lun_ left16:08
johnfg I've been running git bisect for the first time to find a problem with a gentoo kernel.16:08
← dregad left16:09
→ rakl joined16:09
johnfg I'd had a bad bisect, followed by a good.16:09
Do I now run another good bisect?16:09
← siriuz left16:10
→ spaceonline joined16:11
→ psoo joined16:11
← mikecmpbll left16:11
grawity What exactly do you mean by "a bad bisect" and "good bisect"? Just the `git bisect bad/good` commands, or something eles?16:11
← Kje10L left16:11
→ Chikore joined16:12
johnfg grawity: I'm following this page: http://wiki.gentoo.org/wiki/Kernel_git-bisect16:13
→ siriuz joined16:13
← Iszak left16:14
→ nkr joined16:14
→ melkor joined16:14
GarethAdams johnfg: git bisect will choose a commit for you. You tell it whether the commit it chooses is good or bad, and it goes and chooses another based on that16:14
← PixelCru_ left16:14
← feider left16:15
johnfg So, I do mean git bisect good produced a working kernel. the attempt before that kernel was bad.16:15
melkor I do not get it. I do git add, git commit, and then git push origin master. It seems like everything works but then when I move to another computer and pull from the repo it says the repo is up to date and doesn't pull anything.16:15
tinti hi, is there a git clone --shared option?16:15
johnfg GarethAdams: so, based on the good kernel, I do (am right now) another git bisect good, right?16:15
→ pl0sh joined16:15
GarethAdams johnfg: what exact commands have you typed so far that contain 'bisect'16:15
?16:16
← Katafalkas left16:16
← psoo left16:16
GarethAdams johnfg: (put them in a pastebin if there are more than 2)16:16
← dhruvasagar left16:17
← eletuchy left16:17
GarethAdams johnfg: oh I think I see what you mean. Yes, all you have to do is `git bisect good` if git gave you a working commit, and `git bisect bad` if it gave you a broken one16:17
johnfg: but you don't "*do* a bisect good"16:18
→ maletor joined16:19
johnfg GarethAdams: I'm putting a paste together for you.16:19
→ rtjure joined16:19
← smirn0v left16:20
← Dr4k3 left16:20
johnfg GarethAdams: Ya, my phraseology wasn't too good.16:20
→ Dr4k3 joined16:20
GarethAdams johnfg: as far as I understand it, "doing a bisect" is the entire process from `git bisect start` until you've finished. It just doesn't make sense to say "doing a bisect [good]" for any intermediate step16:20
so I think you've got the right idea16:20
← siriuz left16:20
→ Esa_ joined16:20
→ danishkhan joined16:21
→ smirn0v joined16:21
← smirn0v left16:21
← Dr4k3 left16:22
→ mmitchel_ joined16:22
→ Dr4k3 joined16:22
→ siriuz joined16:23
← mmitchell left16:23
← jali_f left16:23
→ etcetera joined16:23
→ barq joined16:24
← barq left16:24
→ barq joined16:24
← elixir left16:24
→ dsdeiz joined16:25
→ lun_ joined16:26
→ elixir joined16:26
→ bartman` joined16:26
← infynyxx left16:27
→ tjbiddle joined16:27
johnfg http://bpaste.net/show/DodFuoUevj5Al5Deqwns/ GarethAdams sorry that took a while. I didn't put in my kernel building steps, and tried to make sure that I haven't missed any good or bad.16:27
melkor → odinsbane16:27
GarethAdams johnfg: sounds like you're going just fine16:28
ojacobson johnfg: every 'git bisect' step from the second one onwards will have checked out a new commit for you to test, in the process16:28
→ ISF joined16:28
→ goshawk joined16:28
johnfg Here's what the last git bisect good produced: http://bpaste.net/show/B3hFxByQIZFqA8Z7NSTx/16:28
GarethAdams johnfg: every time you type `git bisect [good|bad]` git is getting more information about where in the tree the problem is16:28
→ jaequery joined16:28
ojacobson if you have git-prompt enabled you can easily see that happening; otherwise, git status will tell you about it16:28
johnfg I'm glad someone suggested coming over to #git, as I just haven't been sure that I was doing things correctly.16:29
ojacobson that looks like reasonable output16:29
GarethAdams johnfg: think of playing "Guess a number (1-100)" - you start by guessing '50' and then I say "no, higher". Then you say '75' and I say "no, lower"16:29
← nkr left16:29
GarethAdams johnfg: that's basically git bisect16:29
ojacobson ^ that, only graph-aware :)16:29
Eugene And with bacon16:29
Don't forget the bacn16:29
johnfg I'm gonna go build that latest kernel and see if it's good.16:29
Eugene: Yum!16:30
→ thiago joined16:30
← siriuz left16:30
→ hwrd|work joined16:31
GarethAdams johnfg: hopefully "roughly 11 steps" will decrease each time you make a step ;)16:31
→ nkr joined16:31
ojacobson usually, but not always, by one16:31
→ Noldorin joined16:31
ojacobson I've had it show "roughly 0 steps" without having solved the problem, once or twice, too16:31
→ Chillance joined16:32
ojacobson (the following command found the problem commit)16:32
johnfg GarethAdams: Yup, I think the start was 14.16:32
→ siriuz joined16:32
johnfg Only because of that 'starting number' you mentioned.16:32
Hopefully...hope springs eternal...!16:33
← GarethAdams left16:33
→ cbot_ joined16:33
→ GarethAdams joined16:34
→ Trevi joined16:36
← GarethAdams left16:36
→ sq-one joined16:37
← tjbiddle left16:37
← beneggett left16:37
→ Kje10L joined16:37
→ tjbiddle joined16:37
gitinfo set mode: +v16:38
Trevi Hey guys, i am kind of new to git and i got a error messag that said "Detached Head" and now i cant commit anymore :(16:38
→ Shusshu joined16:38
← Shusshu left16:38
Trevi is there a way to fix this?16:38
← siriuz left16:38
→ dhruvasagar joined16:39
wald0 i have a fork for a project, where i have created a branch and imported patches-per-feature, but now im thinking to move this to feature-per-branch, i can export those patches and delete entirely this branch having untouched the original fork ? (so that i can pull from the author's project without problems)16:39
ojacobson Trevi: !detached16:39
gitinfo Trevi: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach16:39
Trevi thanks :)16:40
← Noldorin left16:40
Trevi !reattach16:41
gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue16:41
ojacobson 'git status' will also tell you if some detached-causing work ('git rebase', for example) is in progress, and how to continue if so16:41
→ Steelsouls joined16:41
→ Yakko joined16:42
→ siriuz joined16:43
→ eletuchy joined16:43
← Kje10L left16:44
Trevi hmmm is there a spesific command i can use to reatach?16:44
← mossplix left16:45
← Steelsouls left16:45
grawity just check out a branch16:45
→ gwty joined16:46
→ Noldorin joined16:46
Trevi and then?16:46
ojacobson Trevi: no, because it's somewhat contextual, and the options all have different side effects.16:46
If you have commits that you made in the detached state, and you want to keep them, you need to do something different than if you don't.16:46
← Yakko left16:46
ojacobson (Or if you have them, but don't care if they go away)16:47
Trevi i do have 3 hours of java programming so back them up and then roll back on old commit?16:47
ow dang i cant roll back :(16:48
← cbot_ left16:49
→ Katafalkas joined16:49
→ Thra11 joined16:50
→ trungqtran joined16:50
← siriuz left16:50
← irqq left16:51
← rcu left16:52
Trevi okay, if i check out the branch i get "failed to check out branch"16:53
← jnavila left16:54
→ siriuz joined16:54
Trevi so do i need to create a new one and clone it to there?16:54
← hkj left16:54
← breakingthings left16:55
→ mossplix joined16:55
→ zenx joined16:55
→ engkur joined16:56
← dhruvasagar left16:56
← rtjure left16:58
← Noldorin left16:58
← Davey left16:59
← etcetera left16:59
wald0 how i can import a set of 32 different patches (complete features) in 32 different new branches ?16:59
→ HardDisk_WP joined16:59
← shruggar left17:00
milki script-fu?17:00
→ marcdel joined17:00
→ etcetera joined17:00
← Trevi left17:00
→ markalanevans joined17:00
← siriuz left17:00
← Chikore left17:01
grawity do the patches have 'From:'/'Subject:' headers, or are they just diffs?17:01
→ Davey joined17:01
wald0 if i have 30 branches (features) of a forked project, and i update (pull) the code from the author's project, what is the way that i need to update my branches/project exactly ?17:02
→ mishok13 joined17:02
→ Saby joined17:03
→ Galaris_ joined17:03
wald0 grawity: in fact i have just created them with git (im moving to a better git structure/workflow) so i assume that has everything17:03
→ cbot_ joined17:03
→ siriuz joined17:03
frew the right way to find the current branch: git rev-parse --abbrev-ref HEAD17:03
frew got a much more frustrating answer on friday17:04
grawity wald0: you said patches; I assumed you have .patch or .diff files17:04
→ angelsl joined17:04
← MattStratton left17:04
← system64 left17:05
→ beneggett joined17:05
← herdingcat left17:05
wald0 grawity: yes17:05
← R1KRDO left17:06
→ anderse joined17:06
→ PaulCapestany joined17:06
→ Error404NotFound joined17:07
← Error404NotFound left17:07
← angelsl left17:07
→ dc5ala joined17:08
→ SicoAnimal joined17:08
→ Error404NotFound joined17:08
→ Kje10L joined17:09
→ tekseven joined17:09
← siriuz left17:10
→ JaredMiller joined17:10
→ R1KRDO joined17:11
grawity wald0: so "I've created them with git" tells ... not much, really17:11
wald0: did you use `git diff` or `git format-patch` or something else17:11
← robbyoconnor left17:12
grawity or actually, I don't care much. for f in *.patch; do git checkout -b "feature/${f%.*}" master && <git-am/git-apply your patch here> && <commit if necessary> || break; done17:13
→ JaredMiller1 joined17:13
→ robbyoconnor joined17:13
→ siriuz joined17:13
→ traviscj_ joined17:13
→ travisc__ joined17:15
← eletuchy left17:15
← JaredMiller left17:15
← JaredMiller1 left17:15
→ draginx joined17:16
← traviscj left17:16
→ allaire joined17:17
← allaire left17:17
→ Sicp joined17:17
→ allaire joined17:17
← allaire left17:17
→ a1phanumrc joined17:17
→ hkj joined17:18
← hkj left17:18
← Raging_Hog left17:18
← traviscj_ left17:18
→ allaire joined17:18
→ hkj joined17:18
← hkj left17:19
→ hkj joined17:19
← hkj left17:19
→ tenmilestereo joined17:20
→ hkj joined17:20
← siriuz left17:21
→ baba joined17:21
→ jali_f joined17:21
← beneggett left17:22
→ dreiss joined17:22
→ siriuz joined17:23
→ kvcrawford joined17:23
→ mitz_ joined17:23
← trungqtran left17:23
→ prudnikov joined17:23
← d2dchat left17:24
→ jdunck joined17:25
→ ruckerz_ joined17:25
← mitz left17:25
→ system64 joined17:26
→ alsdjal joined17:26
→ s0ber joined17:26
← alsdjal left17:27
→ Andromeda joined17:27
→ zakora joined17:27
→ luksaur joined17:27
→ Kartonschachtel joined17:27
→ SicoWork joined17:28
← jali_f left17:28
← SicoAnimal left17:28
→ Chikore joined17:30
← siriuz left17:30
→ MattStratton joined17:32
← MattStratton left17:32
→ siriuz joined17:32
→ MattStratton joined17:33
← Davey left17:33
← Katafalkas left17:33
← maxandersen left17:33
draginx whenever im trying to git stash branch grouping <-- I get this: https://gist.github.com/durango/34289c69dac6996411f4 and idk why because im just trying to stash everything into that branch there shouldnt be any problems in regards to things being overwwritten17:34
→ Davey joined17:34
milki draginx: what does git stash branch grouping mean?17:35
ojacobson "stash into (a) branch" is nonsensical17:35
git-stash doesn't operate on branches and branches don't (usually) operate on stashes, unless you've gone way out of your way17:35
← nardev left17:35
ojacobson ah, I see17:35
the message is clear17:35
← spaceonline left17:36
ojacobson you have uncommited modifications in the named file17:36
they would be destroyed by the 'git checkout' step that happens at the start of 'git stash branch <new-branch-name>'17:36
git is trying to avoid destroying your work for you17:36
← sgambino left17:36
draginx basically what im trying to do is.. i have 4 features for a website right? I want to sepearate out the logic for each of them ... i dont want feature #1 mingled with feature #2, and I want an easy way to show my client changes for JUST ONE feature only, without mangigng 50 stashes in the end :p17:36
milki use brancheS?17:36
ojacobson ^17:37
milki you dont need to work with stashes at all17:37
← cirenyc left17:37
cbreak how about just making a branch, or even a clone?17:37
draginx milki: I believe even when 10 branches... they all kind of mingle and mix together as one when viewed in the browser17:37
← engkur left17:37
← ErKa left17:37
draginx cbreak: id rather not clone the entire project for each task :/17:37
ojacobson if you've already *got* stashes then 'git stash branch' looks like a reasonable way to convert them into something more manageable17:37
cbreak branches don't mingle17:37
draginx hmm17:37
ojacobson internally 'git stash' and 'git branch' work in very similar ways, so you're not saving any work on git's side by using one over the other17:37
cbreak if you keep a stash for more than a minute or two17:38
ojacobson the stash is kind of a hack on top of the reflog, too17:38
cbreak you are doing it wrong17:38
milki draginx: what are you trying to diwht with the browser?17:38
draginx cbreak: right im trying to avoid that17:38
← Saby left17:38
draginx milki: just show a website with one feature?17:38
so if I have changes on master right now, how can I move all of those changes to a branch?17:38
milki draginx: you only have one website and one directory to worry about?17:38
draginx: you might want to consider !deploy then17:38
gitinfo draginx: Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html17:38
draginx milki: for this yeah17:38
i am not deploying17:39
this is a dev instance17:39
pure and simple17:39
milki yes you are17:39
draginx then git is worthless for web development? O_o17:39
milki no...17:39
draginx well how so17:39
milki a website is a collection of files that can be sourced from a repo17:39
spyroboy git is fine as a deployment tool if certain conditions aren't required.17:39
draginx so I have to git checkout to a git work tree everytime? O_o17:39
thiago git is not a deployment tool17:40
→ juvenal joined17:40
milki isnt that what you are doing already?17:40
thiago if you want to deploy files, you can write a deployment tool that uses git17:40
→ Saby joined17:40
thiago for example, by writing a hook script17:40
milki this way, you can seperate the way you use git to what is used for the website17:40
then your worries about "mingling" are gone17:40
→ spaceonline joined17:40
spyroboy well, those are semantics I'm not very sure about. I won't even begin to argue where I'm unqualified to do so.17:40
← siriuz left17:40
→ penguin1 joined17:41
→ dorkmafi1 joined17:41
→ eletuchy joined17:42
→ siriuz joined17:42
← eletuchy left17:42
→ jjido joined17:42
← a1phanumrc left17:42
→ eletuchy joined17:42
→ ruckerz joined17:43
→ a1phanumrc joined17:43
← LeMike left17:44
→ LeMike joined17:44
← ruckerz_ left17:44
← anderse left17:46
→ tinti joined17:46
← eletuchy left17:47
← rideh left17:47
→ trungqtran joined17:47
← LeMike left17:48
← a1phanumrc left17:48
← penguin1 left17:48
→ cirenyc joined17:49
→ penguin1 joined17:49
→ Milossh joined17:49
← jjido left17:49
→ jjido joined17:50
→ mikef joined17:50
kvcrawford → MistuhKurtz17:50
→ delinquentme joined17:50
delinquentme ok so I'm happily devving along ... in my natural habitat17:50
← ISF left17:51
← siriuz left17:51
delinquentme and some how I lose a file which I guess i hadn't committed to VC yet17:51
oh wait. nm17:51
→ rtjure joined17:51
→ infynyxx joined17:51
→ rideh joined17:51
→ amcsi joined17:52
milki o.O17:52
→ penguin1_ joined17:53
→ siriuz joined17:53
← sonda left17:53
→ maxmanders joined17:54
ojacobson another successful rubber-ducking17:55
cbreak undo! undo!17:55
← penguin1 left17:55
← draginx left17:55
← Kartonschachtel left17:56
→ elnn joined17:57
→ rideh_ joined17:57
← zenx left17:57
← rideh left17:58
rideh_ → rideh17:58
→ gregsmith joined17:59
_ikke_ irl has no ^Z18:00
→ mstormo joined18:00
← siriuz left18:00
→ madewokherd joined18:00
ojacobson what does SIGTSTP have to do with it18:00
← MattStratton left18:00
_ikke_ It has nothing to do with it18:01
→ Uniter joined18:01
→ rasto joined18:01
gitinfo set mode: +v18:01
Uniter guys sorry how do you "accept theirs" when you are on a merge branch?18:01
→ mf_ joined18:01
_ikke_ Uniter: accept?18:01
merge branch?18:02
mf_ → Guest4447518:02
→ MattStratton joined18:02
Uniter i did a pull18:02
i have some conflicts18:02
I want to do: git checkout . --theirs18:02
ojacobson "blindly accept theirs" is a piss-poor merge strategy18:02
Uniter but it won't work it says file is unmerged18:02
ojacobson unless you like destroying your own work18:02
← rideh left18:02
cbreak Uniter: then do git checkout --theirs file18:02
_ikke_ checkout . and --theirs does not work indeed18:02
← Chikore left18:03
→ btanaka joined18:03
ojacobson (conversely, blindly accepting your own side is also a good way to destroy the incoming changes)18:03
→ siriuz joined18:03
_ikke_ Hey, I fixed that yesterday18:03
Uniter: Just use a merge tool, and try to actually merge the thing18:03
charon also !eekaconflict18:03
gitinfo Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge. Carefully go through the conflicts. Picking one side verbatim is not always the right choice!18:03
_ikke_ Uniter: If you want only their side, why are you actually merging?18:04
charon i love this attitude, it's so pervasive18:04
→ zacts joined18:04
_ikke_ charon: The attitude of, don't do that, do this instead?18:04
← cirenyc left18:04
Uniter thanks =)18:04
→ aberrant joined18:04
← Saby left18:05
← gwty left18:05
Uniter guys thanks I know I can safely accept theirs18:05
charon _ikke_: no, the "eek a conflict! i want to discard my work! KILL IT WITH FIRE!" attitude18:05
_ikke_ Uniter: Then git reset --hard <other_branch> is easier18:05
juvenal → juvenal_away18:05
→ Watabou joined18:06
cbreak charon: maybe he's just a bad programmer and knows it? :)18:06
Uniter ikke but I had some files I wanted to keep18:06
only the conflicting ones were irrelevant18:06
cbreak then only check out those files :)18:07
(not .)18:07
→ Kuukunen joined18:07
← gregsmith left18:08
gitinfo set mode: +v18:08
ffualo What does the -- in "git checkout -- file.txt" actually stand for? I know it's to prevent file/branch confusion, but does it = HEAD by default?18:08
← nioncode left18:08
jast no18:08
→ knightshade2 joined18:09
_ikke_ ffualo: It just says, from here on, only expect file paths18:09
jast it means "only paths after this"18:09
→ jali_f joined18:09
← etcetera left18:09
jast since you didn't specify any commit, it'll checkout the files from the index18:09
← AdrienBrault left18:10
← kermit left18:10
ffualo ah, thanks _ikke_ and jast. But by default, git checkout HEAD file.txt is always the same?18:10
→ rwestphal joined18:10
→ aksnot joined18:11
← siriuz left18:11
_ikke_ ffualo: No18:11
git checkout HEAD file checks it out from the HEAD commit, git checkout -- file checks it out from the index18:12
ffualo oh, I see. So if I've staged a file, it will revert to that staged one?18:12
← wedgeV left18:12
→ arietis joined18:12
→ wedgeV joined18:13
→ siriuz joined18:13
← knightshade left18:13
← knightshade2 left18:13
→ dhruvasagar joined18:14
→ erichynds joined18:14
Guest44475 → mf_18:14
_ikke_ ffualo: aye18:14
→ beneggett joined18:14
← prudnikov left18:15
→ ranman joined18:15
→ dregad joined18:15
ffualo thanks _ikke_, that makes sense18:15
→ BBonifield joined18:15
→ breakingthings joined18:16
← MrNibbles left18:16
← lun_ left18:16
ranman Question, is this a bug or a feature? if you change a global commit hook (or any other hook), then run git init on a repo to get it to pull down the new commit hook, it will not get updated unless you manually remove the hook first18:16
juvenal_away → juvenal18:16
→ meuh joined18:17
← barq left18:17
→ kermit joined18:17
→ barq joined18:17
← barq left18:17
→ barq joined18:17
ojacobson ranman: not authoritative, but git-init goes out of its way not to destroy data18:17
→ khmarbaise joined18:17
ojacobson eg. existing refs, commits, config files18:17
→ gwty joined18:18
→ gnarf joined18:18
ranman ojacobson: I'm aware but I was somewhat hoping that if you had a pre-existing hook and purposefully ran git init again it would pull down the new hook… manually removing every hook is a pain -- mainly because I don't remember where I have it and where I don't18:18
→ sq-one_ joined18:18
← dreiss left18:19
→ dreiss joined18:19
← sq-one left18:20
→ keller joined18:20
← rtjure left18:20
← siriuz left18:21
→ d2dchat joined18:21
_ikke_ .version18:21
gitinfo _ikke_: .version: still at 1.8.2, not updating topic.18:21
→ smirn0v joined18:21
→ ErKa joined18:21
_ikke_ 1.8.2.1 has been released18:22
← Milossh left18:22
→ etcetera joined18:22
← ranman left18:22
→ bindaasomatic joined18:22
→ siriuz joined18:22
← bindaasomatic left18:22
→ john2496 joined18:22
→ rtjure joined18:22
osse _ikke_: prove it18:23
cbreak ran, just find / -name post-commit --delete? :)18:23
osse never mind18:24
→ _iron joined18:25
_ikke_ hmmm, gmane doesn't seem to have the e-mail :-/18:26
osse I was a bit confused18:26
← sq-one_ left18:27
→ Sky[x] joined18:27
_ikke_ http://article.gmane.org/gmane.comp.version-control.git/21486718:27
There it is18:27
osse the 1.8.1.6 announce had the same date as the release date of 1.8.2.1 on git-scm.com. Then I realized I could just fetch ^_^18:27
→ Saby joined18:27
osse hmm? that's 1.8.1.218:27
→ Laurenceb_ joined18:27
→ gregsmith joined18:27
← etcetera left18:28
→ AdrienBrault joined18:28
_ikke_ for arg18:28
→ fobban joined18:28
_ikke_ gmane doesn't have the e-mail then18:29
← zacts left18:29
← barq left18:30
→ MrNibbles joined18:30
→ barq joined18:30
← barq left18:30
→ barq joined18:30
← siriuz left18:30
→ zacts joined18:30
← pradi left18:30
dregad gmane is having issues with an mta server since april 5th18:32
→ alvaro_o joined18:32
← alvaro_o left18:32
← ThePawnBreak left18:33
← Watabou left18:33
→ rurufufuss joined18:33
→ Katafalkas joined18:33
_ikke_ apparently18:34
→ siriuz joined18:34
→ JaredMiller joined18:34
→ etcetera joined18:34
← JaredMiller left18:34
→ ThePawnBreak joined18:34
← MattStratton left18:36
osse Not long after relipse's apology e-mail18:36
_ikke_ Has that anything to do with it?18:36
osse The guy never got a response, so maybe he sabotaged it18:37
→ MattStratton joined18:38
← etcetera left18:38
→ huoxito joined18:39
← robbyoconnor left18:39
← rath left18:39
dregad http://article.gmane.org/gmane.discuss/1560618:40
→ whowantstolivef1 joined18:40
← siriuz left18:40
← infynyxx left18:41
← barq left18:41
→ barq joined18:41
← barq left18:41
→ barq joined18:41
← ThePawnBreak left18:41
→ pantsman joined18:42
← pantsman left18:42
→ pantsman joined18:42
→ siriuz joined18:43
← odinsbane left18:44
→ ThePawnBreak joined18:45
charon osse: he pinged me privately on irc, and i flamed him for not following through on advice to read "how to ask questions". haven't heard anything since. so i figure a reply on-list wasn't needed18:46
← zacts left18:46
bremner missed whatever relipse did to get on the ban list 3 times.18:47
bremner but maybe once would be enough?18:47
→ gusnan joined18:47
→ ISF joined18:48
← Andromeda left18:48
← johnfg left18:49
osse charon: I suppose that's a 'no' from you, then18:49
→ Melon_Bread joined18:49
← siriuz left18:51
← alunduil left18:51
→ irqq joined18:53
→ Weezey joined18:53
cbreak this channel has a ban list? interesting :)18:53
→ siriuz joined18:53
dr_lepper heh18:54
→ WinstonSmith joined18:55
← MattStratton left18:55
→ LekeFly joined18:56
← dc5ala left18:56
→ newbie joined18:57
newbie → Guest1771918:57
_ikke_ bremner: He tried to avoid the ban18:57
bremner ah, OK.18:58
_ikke_ I totally missed that e-mail though18:58
stack is that possible to push all references upstream? also svn info , in ordet to do git clone from somewhere else and , git svn fetch && git svn rebase ?18:59
← allaire left18:59
→ etcetera joined19:00
osse _ikke_: http://article.gmane.org/gmane.comp.version-control.git/21998219:00
← siriuz left19:00
_ikke_ yeah, found it in my e-mail client19:01
→ cthuluh joined19:01
→ nadirvardar joined19:01
→ sgambino joined19:03
← aksnot left19:03
← zakora left19:03
→ threesome joined19:03
→ eletuchy joined19:04
→ siriuz joined19:04
→ aksnot joined19:04
← rasto left19:04
cbreak stack: no, svn meta data is not part of history19:04
→ MattStratton joined19:04
← marthinal left19:05
→ mercwithamouth joined19:06
→ Belliash joined19:07
Belliash hi19:07
gitinfo Belliash: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.19:07
stack cbreak: so to the other side I have to repeat git svn init, and then rebase for example from a branch pointing to that svn repo?19:08
cbreak stack: if you use git svn, then you have to do so directly19:08
Belliash can anyone tell me how can i fetch specific revision/changeset ? i mean w/o any future changes? something like svn checkout svn://sth.here/ -r 43 but in GIT?19:09
cbreak you may not tamper with history from git svn, and you may not exchange it with others that use git svn (apart from cherry - picking or similar)19:09
Belliash: impossible19:09
Belliash: just fetch all of it19:09
you can cherry pick locally if you really need to slice history into pieces19:09
← khmarbaise left19:10
→ Orbitrix joined19:10
← siriuz left19:10
Belliash cbreak: lets say i fetched all of them... can i somehow switch to the previous revision, so that any future changes will be available ?19:10
cbreak ?19:11
rephrase please.19:11
stack cbreak: ok thanks19:11
grawity Belliash: I think you are looking for `git checkout <commit-id>`19:11
→ infynyxx joined19:11
→ johnfg joined19:11
cbreak Belliash: wether something is available or not is independent from the current commit.19:11
SamB know any nice frontend for "git cherry"?19:11
← infynyxx left19:12
→ infynyxx joined19:12
johnfg the last kernel booted fine too! gonna do another git bisect good.19:12
Belliash cbreak: lets say someone pushed few changes into tree, i downloaded it... now i would like to revert back to state it was lets say week ago... of course i know its sha - is it possible?19:12
cbreak tree?19:13
← mercwithamouth left19:13
cbreak do you want to rewrite history?19:13
or do you just want the state from back then?19:13
→ john_anderson joined19:13
→ oracal joined19:13
→ tianon joined19:14
cbreak you can for example git reset --hard SHA19:14
→ siriuz joined19:14
cbreak that would nuke away any changes since19:14
or you could git revert SHA..HEAD19:14
← Sicp left19:14
cbreak that'd make an undo commit19:14
Belliash cbreak: just the state... so that any changes made after specified SHA will not be available in local copy19:15
← rakl left19:15
SamB Belliash: you just want "git checkout <sha>"?19:15
cbreak all changes will be available in the local copy19:15
for ever19:15
← john_anderson left19:15
cbreak use git revert as described above19:15
it'll create new history, and will not require messing with other people's work19:15
SamB cbreak: couldn't he just checkout the sha and make a new branch?19:15
cbreak SamB: I don't think so19:16
he said something about future changes available19:16
→ prudnikov joined19:16
cbreak I have no idea what he meant with that19:16
and then he said he wanted to revert it, so he wants to actually undo the stuff19:16
→ gerep joined19:16
cbreak and not only visit the past19:16
gerep Hello world19:16
gitinfo gerep: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.19:16
Belliash cbreak: do you know svn also?19:17
SamB wall of text19:17
cbreak Belliash: barely.19:17
what for?19:17
→ Kamal_ joined19:17
→ clone1018 joined19:17
cbreak svn knowledge is mostly worthless.19:17
← MattStratton left19:17
→ rasto joined19:18
Kamal_ → Guest9984819:18
Belliash cbreak: in svn i can do svn up -r 5 and have revision 5 on disk... while rev 6 could provide some new not working code... so i can still build the one from older revision...19:18
cbreak yeah. so?19:18
you can visit the past too in git. But what's the point?19:18
it has nothing to do with what you asked19:19
Belliash id like to do so with git19:19
→ anderse joined19:19
Guest99848 → Kamal_19:19
grawity you were told *twice* how to do the same with git19:19
ojacobson So what happened when you tried that?19:19
cbreak if you just want to visit the past, just do as SamB and grawity said above19:19
→ garbagecollect-1 joined19:19
cbreak but if you do that, you of course leave your current branch19:19
garbagecollect-1 fatal: Not a valid object name: 'thestriving/reskin-geapp-370'.19:19
ojacobson If you know how to use svn to obtain the tree from past commits, you know how to use git to do the same thing19:19
cbreak and it wouldn't be reverting anything19:19
garbagecollect-1 I'm just trying to get my current branch to track and push to a branch on another repository with the same name19:20
cbreak garbagecollect-1: so git push -u remotename branchname19:20
garbagecollect-1: done.19:20
garbagecollect-1 i just want to set upstream first without pushing19:20
cbreak garbagecollect-1: man git-branch19:21
gitinfo garbagecollect-1: the git-branch manpage is available at http://jk.gs/git-branch.html19:21
cbreak take a look at --set-upstream19:21
(pay attention to the parameter order)19:21
garbagecollect-1 i did that and it said fatal: Not a valid object name: 'thestriving/reskin-geapp-370'.19:21
→ Esa|iPhone6 joined19:21
← siriuz left19:21
Belliash ok, i got it now...19:21
thanks!19:21
cbreak garbagecollect-1: then you failed to pay attention to the parameter order19:21
← Esa_ left19:21
garbagecollect-1 i did not19:21
cbreak what did you type?19:21
garbagecollect-1 git branch --set-upstream reskin-geapp-370 thestriving/reskin-geapp-37019:21
ojacobson What part of that looked like 'git push'19:21
cbreak and what does git branch -r show?19:22
ojacobson you can push and also fix the upstream at the same time, and it's probably easier that way19:22
garbagecollect-1 don't want to push19:22
ojacobson (git branch --set-upstream has a really surprising argument order. In more recent versions use --set-upstream-to/-u instead, which behaves more like most people expect)19:22
garbagecollect-1 git branch -r shows the branches from origin and from thestriving19:22
→ captbaritone joined19:22
→ mastro joined19:22
cbreak does it show the one you use?19:23
→ skorgon joined19:23
ojacobson does 'thestriving/reskin-geapp-370' appear in the output of 'git branch -r'?19:23
← mastro left19:23
garbagecollect-1 no19:23
ojacobson if not, you can't tell a local branch to track it19:23
← arietis left19:23
ojacobson because it doesn't exist yet19:23
cbreak then it's invalid.19:23
git remote update, that might fetch it19:23
ojacobson (you can, but you have to use other mechanisms to do so, and oyu shouldn't)19:23
garbagecollect-1 so i should push it ?19:23
with the -u param/19:23
cbreak yes.19:23
ojacobson if you *expected* it to exist, git-fetch may help19:24
→ siriuz joined19:24
ojacobson if it doesn't exist in the remote at all, then you'll have to push something first :)19:24
→ Andromeda joined19:24
→ mastro joined19:24
cbreak I think you could mess around with the .git/config file to make it track non-existing things19:24
garbagecollect-1 atal: 'thestriving/reskin-geapp-370' does not appear to be a git repository19:24
ojacobson you could19:24
cbreak but ... if you have to ask in here for advice, you're probably not ready for that :)19:25
ojacobson but I'm not going to explain how, because i try not to hand people loaded guns :)19:25
→ haydenmuhl joined19:25
→ ivar_ joined19:25
cbreak garbagecollect-1: yeah, you have to use the correct syntax19:25
garbagecollect-1 i did a git fetch -all19:25
cbreak duh19:25
ojacobson garbagecollect-1: push expects a remote name plus a normal branch name ("thestriving" followed by "reskin-geapp-370"), not a remote-tracking branch name ("thestriving/reskin-geapp-370")19:25
man git-push for details19:25
gitinfo the git-push manpage is available at http://jk.gs/git-push.html19:25
cbreak as I said above19:26
← system64 left19:26
cbreak just replace remotename with the remote name and branchname with the branch name19:26
garbagecollect-1 that is not the syntax cbreak offered19:26
← cthuluh left19:26
garbagecollect-1 i did19:26
cbreak what did you type?19:26
garbagecollect-1 git push -u thestriving/reskin-geapp-370 reskin-geapp-37019:26
← d2dchat left19:26
ojacobson cbreak suggested 'git push -u remotename branchname'19:26
which is pretty compatible with what I suggested19:26
garbagecollect-1 and how is that not what i typed?19:27
← Belliash left19:27
cbreak garbagecollect-1: the remote name is thestriving19:27
ojacobson remotename needs to be the name of a remote ("thestriving", in your case), not the name of a remote-tracking branch19:27
cbreak you typed testriving/garbagehere19:27
delete the garbagew19:27
which is not part of the remote name19:27
ojacobson that these have similar names and similar syntaxes in some contexts is one of the lovely features of git you'll be getting real familiar with soon19:27
cbreak it confuses git19:27
→ MattStratton joined19:27
← elixir left19:27
cbreak garbagecollect-1: git remote -v lists remote names you have set up19:27
garbagecollect-1 ah ok19:27
it worked19:27
i think19:27
cbreak of course it did.19:27
→ elixir joined19:28
cbreak ojacobson: there are not infinite number of words available19:28
ojacobson it's true19:28
cbreak so we have to compose them :)19:28
if we'd use german it might be easier19:28
→ kit joined19:28
cbreak then new words could be formed by gluing others together19:28
ojacobson 'peer repository' might be a better term but I'm not sure I want to explain 'git peer add' to people :)19:29
→ knightshade joined19:29
cbreak I'd have called it "other"19:29
Eugene The heck is git peer19:29
ojacobson Eugene: nonexistant19:29
Eugene Good19:29
cbreak git other add19:29
ojacobson "I'm not sure I _would_ want", perhaps19:29
cbreak sounds good, doesn't it? :)19:29
← tianon left19:30
← siriuz left19:30
→ tianon joined19:31
→ drizzd joined19:32
← ivar_ left19:32
← Sky[x] left19:32
→ cthuluh joined19:32
→ dijonyummy joined19:33
→ ivar_ joined19:33
← dijonyummy left19:34
→ siriuz joined19:34
→ rakl joined19:34
← tenmilestereo left19:34
← ivar_ left19:35
→ shruggar joined19:35
← dhruvasagar left19:35
← mossplix left19:35
← shruggar left19:36
← etcetera left19:37
→ dijonyummy joined19:37
← ThePawnBreak left19:37
← danishkhan left19:38
← elixir left19:38
← Melon_Bread left19:38
← smirn0v left19:39
← fooey left19:39
→ micahf joined19:39
micahf hi, how do i commit changes from svn to my git repository after doing 'git svn fetch'19:39
i tried "git svn rebase"19:40
but "git status" doesn't show any of the new changes from svn19:40
→ smirn0v joined19:40
← Uniter left19:40
← siriuz left19:40
→ jas4711 joined19:40
cbreak micahf: it isn't supposed to19:41
← dreiss left19:41
→ agile joined19:41
cbreak micahf: git status will show uncommitted changes19:41
stuff from svn is committed19:41
→ Sky[x] joined19:41
cbreak micahf: git svn rebase is the correct way to get changes from svn19:41
micahf hm19:42
→ ThePawnBreak joined19:42
Dr4k3 üü19:42
sry..19:42
→ g0bl1n joined19:42
← g0bl1n left19:42
→ g0bl1n joined19:42
← barq left19:44
→ siriuz joined19:44
micahf cbreak, when i do "git push" i get " ! [rejected] trunk -> trunk (non-fast-forward)"19:44
→ _protagoras271_ joined19:44
cbreak yes.19:44
you did a rebase19:44
that rewrites history19:45
you will have to force push19:45
micahf: you can use either git native functionality, or git svn functionality19:45
if you want to use both, then you'll have to live with constant history rewriting19:45
→ elixir joined19:45
micahf ah19:45
darn!19:45
cbreak git svn dcommit rewrites history19:46
git svn rebase does19:46
if you do either, and you already pushed that history, t hen you will have to force push19:46
← thl0 left19:46
micahf the svn repository is a big repository that i don't want to commit to but want to keep updated19:46
the git repository referencing it is hosted on github, and this is something i do want to keep updated19:46
so what i'm trying to do is fetch updates from svn and get them onto github, along with my local changes19:47
→ BSaboia__ joined19:47
→ mossplix joined19:47
micahf does this make sense? sorry if i'm being a noob19:47
cbreak you'll have to rebase the local changes.19:47
→ blackjack joined19:47
← blackjack left19:47
cbreak every single time19:47
→ Ryback_ joined19:48
← Ryback_ left19:48
→ Ryback_ joined19:48
arand In that situation I would keep any git changes on separate branches, into which you'd merge the svn mirror branch19:48
micahf ahh19:48
cbreak that'd also work. and lead to a very train station like history :)19:49
→ mikef_ joined19:49
→ etcetera joined19:49
micahf so instead of pulling directly from svn i'd pull from another branch that is a direct mirror of the svn repository?19:49
→ norjor joined19:50
← Dougie187 left19:50
← mikef left19:50
micahf trains are on time, so that's good19:50
→ Dougie187 joined19:50
← siriuz left19:50
← BSaboia left19:50
arand If by pulling you mean merging then yeah, that's what i was thinking.19:51
← PaulCapestany left19:51
micahf i suppose that's what i meant19:52
i'm still working on the distinction19:52
→ siriuz joined19:53
arand the svn-mirror branch would never have any changes besides the ones from svn, updated via "git svn rebase" then you would: "git checkout feature; git merge svn-mirror", and push both (or just 'feature') up to the public git repo.19:54
← Ryback_ left19:55
→ dreiss joined19:55
arand you will get a lot of merging, so it depends if you like merges.19:55
← rtjure left19:56
→ jaseemabid joined19:57
→ x82_nicole joined19:57
→ johnfg_ joined19:57
gitinfo set mode: +v19:58
← Katafalkas left19:58
→ PaulCapestany joined19:58
← anderse left19:58
← MattStratton left19:59
→ jceb joined19:59
→ hyperair joined19:59
x82_nicole Hello all! I'm trying to determine why my Git repo has blown up to 1.2GB. Is there an easy to way to determine what folders are NOT within the .gitignore file? Like, forcing Git to list all directories it's managing? My .gitignore file is huge, and I'm sure there has to be a way to tell.19:59
_ikke_ x82_nicole: git ls-tree20:00
← smirn0v left20:00
_ikke_ or ls-index20:00
← siriuz left20:00
_ikke_ s/index/files20:00
← johnfg left20:00
→ Jasper joined20:00
Jasper Git for Windows is amazing: /libexec/git-core/git-rebase--merge: line 67: git-merge-theirs: command not foun20:00
d20:00
→ MattStratton joined20:01
x82_nicole Ahh, interesting. I wonder if git ls-files can exclude a folder? Like "list all files git see, except this folder and that folder".20:01
There are so many git commands, haha. (:20:01
→ marhaban joined20:01
→ b1rkh0ff joined20:02
_ikke_ afaict, it can only exclude untracked files20:02
→ holodoc joined20:03
← aberrant left20:03
→ danishkhan joined20:03
← keller left20:03
_ikke_ x82_nicole: You don't need to know all of them20:03
→ siriuz joined20:03
x82_nicole Alright. Let me try something, and if doesn't work, guess I could ack-grep -v ;)20:03
→ keller joined20:04
← danishkhan left20:04
← infynyxx left20:06
x82_nicole _ikke_, thanks for your help btw. Very much appreciated.20:06
← huoxito left20:06
_ikke_ yw20:06
← Davey left20:07
← whowantstolivef1 left20:07
← penguin1_ left20:07
→ Akufen joined20:07
← gerep left20:08
cannonball I am doing 'git branch -d -r remote_name branch_name'. It deletes the branch info from my local checkout, but the branch still exists on the remote. What option am I missing to make the change propoage to the remote and delete it there too?20:09
→ Ziber joined20:10
_ikke_ cannonball: git push --delete branch-name20:10
← siriuz left20:10
cannonball beautiful, thank you.20:10
→ penguin1 joined20:11
jast plus, once again, a remote name :}20:11
_ikke_ hehe, that always helps20:11
→ anderse joined20:11
→ infynyxx joined20:12
→ aberrant joined20:12
← delinquentme left20:13
→ siriuz joined20:13
← ISF left20:13
cannonball This remote repo contains just a few branches that I have done. There is no 'master' branch. The web browser, when I loaded the summary page, showed the commits for (what I think is) the first branch that I used to create that remote repo.20:14
→ LeMike joined20:14
← knightshade left20:14
cannonball Since I deleted that branch, now the summary page just shows the tags and the branches.20:14
I should be able to make one of the remaining branches be the default branch that gets show in the summary page, right?20:14
Dougie187 yeah, it's under settings20:15
cannonball I'm checking git push --help right now, looking for something that seems right.20:15
Dougie187 well, depending on what site you're on20:15
jast there's no git command to do it remotely20:15
Dougie187 on github, it's under settings for the repo. but ionno about other sites.20:15
← dsdeiz left20:15
→ mabrand joined20:15
cannonball It's a repo located in ~/public_git/ (a bare repo).20:15
cbreak you have to do git symbolic-ref HEAD blah20:16
jast if it's self-hosted, you need shell access20:16
cannonball thanks20:16
cbreak (in the remote repo)20:16
jast specifically, refs/heads/blah :)20:16
cbreak shouldn't git resolve that itself?20:16
maybe not, it's plumbing20:16
← etcetera left20:17
← mabrand left20:18
cannonball Fixed, thanks :-) In git, sometimes it's hard to tell when a path is a virtual path (remote/branchname) or a real path (refs/heads/branchname).20:18
Once I figured out that you meant a real path name, it made very much sense.20:18
→ etcetera joined20:18
← aksnot left20:18
→ zakora joined20:19
cbreak cannonball: the are all real20:20
remote/branchname are in refs/remotes/remote/branchname20:20
→ khushildep joined20:20
← penguin1 left20:20
← kermit left20:20
← siriuz left20:20
cbreak (unless they are packed :)20:20
← marhaban left20:20
cannonball thanks everybody.20:21
cmn they're both the same, but neither are paths20:21
→ siriuz joined20:23
← irqq left20:23
← prudnikov left20:23
← vpopov left20:24
← g0bl1n left20:25
→ irqq joined20:26
← jamesez left20:26
→ fooey joined20:27
← fooey left20:28
→ fooey joined20:28
→ nielsbusch joined20:29
→ vpopov joined20:30
← kevwil left20:30
← jceb left20:30
← Andromeda left20:31
← siriuz left20:31
← ThePawnBreak left20:33
→ kermit joined20:33
→ siriuz joined20:33
→ danishkhan joined20:35
→ Gitzilla joined20:35
→ Davey joined20:36
→ aksnot joined20:37
→ grbsn joined20:37
← grbsn left20:38
← tinti left20:38
→ kevwil joined20:38
← fobban left20:39
→ delinquentme joined20:39
→ danman joined20:40
→ mstormo_ joined20:40
← siriuz left20:40
→ rtjure joined20:41
← mstormo left20:41
← endikos left20:42
→ Kismet010 joined20:43
Kismet010 hi20:43
gitinfo Kismet010: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.20:43
→ siriuz joined20:43
← juvenal left20:43
→ LuxuryMode joined20:43
← mastro left20:44
→ beakman joined20:44
Kismet010 I want to ignore all files under foo, but no foo/bar/taz.txt20:44
← irqq left20:44
Kismet010 how can I doit?20:44
cbreak just add foo to .gitignore20:44
and force add that file20:45
(or add it before adding the ignore rule)20:45
Kismet010 this doesn't not work, I have a foo/.gitignore with a * for ignoring all, 'for/bar/requeriments.txt' and foo/whatever.txt is what a I wnat to mantain20:47
now I preppend ! to whatever, this work, but no !*/req.txt20:48
ojacobson Kismet010: have a *top level* .gitignore with 'foo/' in it20:48
'git add --force' the files you wish not to be ignored20:48
cbreak Kismet010: the ! is not needed20:48
ojacobson ignores do not apply to files git knows about20:48
cbreak Kismet010: do what I said above, it'll be enough20:48
← rakl left20:48
← JosefAssad left20:49
ojacobson it doesn't matter that "everything" in foo/ is ignored; git-status and friends will continue to report changes to foo/bar/requirements.txt if it's tracked20:49
Kismet010 but I change files constantly and need "git add ."20:49
cbreak so?20:49
doesn't matter.20:49
← jjido left20:50
← aksnot left20:50
← siriuz left20:50
← vpopov left20:52
← ph^ left20:52
→ juvenal joined20:52
← AdrienBrault left20:53
Kismet010 how can I force add a file in a subdirectory name which is variable?20:54
variable o.O20:55
Kismet010 just a wildcard?20:55
cbreak Kismet010: git add -f $variable/file20:55
Kismet010 not a variable, a variable name20:55
cbreak yes20:55
variable Kismet010: what do you mean by "variable"?20:55
cbreak what do you think $ does?20:55
variable the file moves around a lot?20:55
Kismet010 yes20:56
variable you need to add it each time20:56
→ mercwithamouth joined20:56
cbreak exactly20:56
variable git can not handle wandering files20:56
why does this file do that20:56
maybe it should not be tracked20:56
is it generated?20:56
Kismet010 it's requeriments.txt inside python virtualenvs owns by a team who create or delete ones20:56
← cthuluh left20:56
→ cthuluh joined20:57
cbreak just don't move it around.20:57
→ Lefont joined20:57
← daniel_- left20:57
→ siriuz joined20:57
Kismet010 so isn't there a way to ignore all foo/* except foo/bar.txt and foo/bar/taz.txt?20:58
cbreak sure there is20:58
ignore foo/20:58
and then unignore with !foo/bar.txt20:58
and so on20:58
Kismet010 this works20:58
cbreak of course it does20:58
Kismet010 but how for foo/bar/taz.txt?20:58
cbreak as does the previous suggestion20:59
→ DrShoggoth joined20:59
cbreak unignore !foo/bar/tax.txt20:59
same as always20:59
Kismet010: read man gitignore20:59
gitinfo Kismet010: the gitignore manpage is available at http://jk.gs/gitignore.html20:59
→ daniel_- joined20:59
Kismet010 !foo/*/taz.txt doesn't work20:59
cbreak not *20:59
bar20:59
Kismet010 I read manual20:59
but..20:59
this isn't viable for out workflow21:00
our*21:00
← mmitchel_ left21:00
→ Andromeda joined21:00
Kismet010 I need 'bar' to be whatever21:00
ojacobson Kismet010: "ask question A, get answer A', respond that it doesn't apply to situation B" is not, historically, a very effective strategy to seeking advice.21:01
m0viefreak !taz.txt21:01
then21:01
ojacobson Best of luck.21:01
← ojacobson left21:01
m0viefreak oh wait21:01
→ nickpresta joined21:01
← captbaritone left21:02
Kismet010 ask A, said I don't know how to do A so I told you I prefer to do B, is a common way to not say "I don't know"...21:02
cbreak then unignore !foo/**/tax.txt21:02
Kismet010 cbreak: I tried and look for ** means21:03
← siriuz left21:03
← AaronMT left21:03
→ Watabou joined21:03
cbreak you should look, yes21:03
Kismet010 looked21:03
I'll try again21:03
→ shruggar joined21:03
cbreak Kismet010: honestly, just do what I told you, all of the answers will work21:03
→ AaronMT joined21:03
charon aren't we in the whole ignore-affects-tree-traversal business again?21:03
← nadirvardar left21:03
cbreak I gave you like four by now21:03
→ chuckharmston joined21:04
→ psoo joined21:04
charon Kismet010: there's a catch with ignores, if a directory name is ignored the search for untracked files never descends into that directory, so it won't see any negative ignore patterns inside21:05
Kismet010 last one doesn't work, ** depends on shell instead fcname (or whatever I just read)21:05
← kit left21:05
→ drizzd_ joined21:05
charon Kismet010: newer gits do support **21:05
i'd have to check but it's probably around 1.8.1 or 1.8.021:05
← nkr left21:05
→ siriuz joined21:05
Kismet010 1.8.1.421:05
← luksaur left21:06
cbreak Kismet010: no21:06
** is a normal gitignore pattern21:06
Kismet010 is this what you mean? http://vpaste.net/jcXwp21:06
cbreak no21:06
foo21:06
not virtualenvs21:06
it won't work if you missspell the name21:06
← zakora left21:06
→ jjido joined21:06
Kismet010 lol21:07
ok virtualenvs=foo21:07
cbreak then it'll work21:07
← nickpresta left21:07
→ nadirvardar joined21:07
Kismet010 but it doen't21:07
charon cbreak: ** is not supported before v1.8.221:07
it'll still work as a *, of course21:08
→ rakl joined21:08
← mikef_ left21:08
← drizzd left21:08
→ babilen joined21:08
← Treggats left21:10
← spaceonline left21:11
← x82_nicole left21:12
← siriuz left21:12
← Watabou left21:12
← v0n left21:13
Kismet010 so there's no way21:13
← jonatasnona left21:13
← jali_f left21:13
cbreak all the ways we gave you should work for some of the questions you asked21:14
in particular, git add -f will work21:14
← gregsmith left21:15
← skorgon left21:15
juvenal → juvenal_away21:16
→ siriuz joined21:16
Kismet010 I told you we need git add .21:16
← anderse left21:16
charon find -name requirements.txt | xargs git add -f ?21:17
← agile left21:17
← kermit left21:17
cbreak find has --exec21:17
→ pib1998 joined21:17
← hwrd|work left21:18
→ skorgon joined21:18
cbreak that'll handle spaces too if you want :)21:18
Kismet010 umm I like the idea21:18
charon Kismet010: also, your issue is most likely that git doesn't descent into dirs that are ignored21:18
→ Milossh joined21:18
charon (as i already said)21:18
it would be easier to tell if that is the actual problem, if you gave us !repro21:18
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.21:18
charon see also !censor21:18
gitinfo [!obfuscate] Please do not elide, obfuscate, or otherwise hide information from !repro pastes. This invariably leads to pastes that hide the actual issue or (worse) are not consistent, sending the investigation down false paths. See !secret.21:18
← bmac left21:18
Kismet010 I know, because of that I'm this solution http://stackoverflow.com/questions/5533050/gitignore-exclude-folder-but-include-specific-subfolder21:19
for now I have http://vpaste.net/4PwxQ21:19
→ Treggats joined21:20
← rtjure left21:20
juvenal_away → juvenal21:20
→ zastern joined21:21
→ bgerber joined21:21
← siriuz left21:22
← khushildep left21:22
← jjido left21:22
→ jjido joined21:22
→ hwrd|work joined21:23
← jjido left21:24
→ jjido joined21:24
→ siriuz joined21:25
→ unreal joined21:26
← mossplix left21:26
← MattStratton left21:26
→ leeN joined21:28
→ x82_nicole joined21:28
← erichynds left21:30
← fooey left21:30
← drizzd_ left21:30
→ wrouesnel joined21:31
← etcetera left21:31
← mitz_ left21:32
← siriuz left21:32
← infynyxx left21:32
→ SteveRyherd joined21:32
gitinfo set mode: +v21:32
→ rockets_ joined21:32
← holodoc left21:33
→ holodoc joined21:33
SteveRyherd I want to deploy to a remote server. My local server does not have static-ip/address -- Should I setup a bare repo on the remote server and push to it, then checkout elsewhere. ... or is there a better method?21:33
← Thra11 left21:33
← psoo left21:34
← zastern left21:34
→ siriuz joined21:34
→ Vile joined21:35
→ sd1074 joined21:35
→ mitz_ joined21:36
thiago SteveRyherd: no, you've pretty much got the idea21:36
→ etcetera joined21:36
→ hobodave joined21:37
milki SteveRyherd: !deploy21:37
gitinfo SteveRyherd: Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html21:37
milki SteveRyherd: if you have $$, you can look through the github web hooks and see what kinds of services are available as well21:37
← delinquentme left21:38
→ redrocket joined21:38
→ mossplix joined21:38
SteveRyherd milki, I'm using fabric for deploy scripts. Just trying to figure out if it would be easier to move my local master git repos to the production server. Or if I could keep them local and just have a bare repo to push to.21:38
← LuxuryMode left21:38
→ aartist joined21:39
← Lefont left21:39
milki i recommend push to bare repo and rely on post-receive hooks, given your two choices21:40
→ markenranosa joined21:40
← tekseven left21:40
SteveRyherd Thanks.21:40
→ Pentium joined21:41
→ kermit joined21:41
Kismet010 charon cbreak thanks!21:42
← Kismet010 left21:42
← doener left21:42
← siriuz left21:43
→ boombatower joined21:43
← aartist left21:44
← Davey left21:44
← Dougie187 left21:45
← SteveRyherd left21:46
→ siriuz joined21:46
← RoyBellingan left21:47
→ hannic joined21:48
← LeMike left21:48
← jjido left21:48
← hannic left21:48
→ pandeiro joined21:48
→ sgu joined21:48
← Dr4k3 left21:49
← nielsbusch left21:49
← cbot_ left21:49
← siriuz left21:52
→ bulletmark joined21:52
→ ph^ joined21:53
→ FatDarrel joined21:53
← jaseemabid left21:54
→ Davey joined21:54
← FatDarrel left21:54
→ FatDarrel joined21:55
→ jaseemabid joined21:55
→ siriuz joined21:55
← Pentium left21:55
← john2496 left21:55
← FatDarrel left21:56
← revagomes left21:56
← mstormo_ left21:57
← elixir left21:58
← mezner left21:59
← avinashrbhat left22:01
← siriuz left22:02
← trungqtran left22:02
→ alunduil joined22:02
← ph^ left22:02
← m0ltar left22:03
→ AlexMax joined22:03
→ ISF joined22:03
← breakingthings left22:04
→ guy joined22:04
← sgambino left22:04
guy If I accidentally did `git commit -m "Renamed to a more generic (suitable) file."` (when I intended `git commit -m "Renamed to a more generic (suitable) file." ./somefile`, will `git stash save --keep-index; git stash drop` lose my changes or just undo the commit?22:05
← acharlieh left22:05
← wrouesnel left22:06
cbreak guy: what the hell are you talking about?22:06
git stash has nothing to do with committed stuff22:06
guy: man git-commit22:06
gitinfo guy: the git-commit manpage is available at http://jk.gs/git-commit.html22:06
cbreak look for --amend22:06
guy [1] I made changes to files [2] ran `git commit -a -m "foo"` [3] I need to get back to state [1]22:07
→ delinquentme joined22:07
→ siriuz joined22:07
cbreak then just git reset --soft (or --mixed) <sha>22:07
guy cbreak: I don't want to amend the message. I included the wrong (all) files in the message when I intended only one particular file.22:07
cbreak yeah?22:07
so amend the commit22:07
→ taylorlapeyre joined22:08
← chuckharmston left22:08
← norjor left22:08
guy ok.. now. `git commit --amend` only allowed me to change the message.22:09
cbreak no22:09
it amends the commit22:09
not only the message22:09
← siriuz left22:10
cbreak it's like git commit apart from replacing the newest commit instead of making a new one on top of the newest commit22:10
but if you don't like changing, do what I also recommended and just reset it away...22:10
both will work.22:11
→ BSaboia joined22:11
guy right, so if instead of all the files that I commited, I want to use the last commit message but with just one file, I could to `git commit --amend ./whateverfile` ?22:11
cbreak no22:11
you'd git reset HEAD~1 -- fileblah22:11
and then commit that22:11
that would commit fileblah from the previous commit22:12
if you do it with --amend, that commit will replace the current one22:12
guy right. But thats not what I want. This way I would lose my changes.22:12
← kermit left22:12
cbreak no.22:12
why do you think that?22:12
guy "23:12 cbreak: that would commit fileblah from the previous commit"22:12
cbreak yeah, and?22:12
that's what you want22:12
you want the changes from the previous commit to be there instead of the ones you committed by accident22:13
it won't change the working dir files22:13
guy oh well, I didn't make that many changes to cry if I lose them. Lets try.22:13
→ chrisgeorge joined22:13
cbreak so it will not cause you to lose any changes22:13
← Artpicre left22:13
← BSaboia__ left22:13
→ kermit joined22:13
← Error404NotFound left22:13
guy Ok. I did "git reset --soft", then I look at the `git status`, but it doesn't show the files as modified?22:13
← R1KRDO left22:13
cbreak ...22:14
did you ignore what I wrote?22:14
guy ...22:14
← pantsman left22:14
guy Clearly we are having communication issues.22:14
cbreak I gave you two options, and you only pick half of them22:14
you can't just leave away half of a command and expect it to work22:14
guy reads back the log22:14
guy oh. I missed <sha>22:14
← oakdog8 left22:15
cbreak you have to tell it to which commit to reset to22:15
guy and <sha> must literally be <sha> or can it be HEAD~1 (which I am guessing is one commit back)22:15
cbreak (in your case the previous one)22:15
the latter22:15
guy what if the former commit wasn't pushed. How do I get its sha?22:16
oh, nvd22:16
← macabre left22:16
cbreak pushing is unrelated.22:16
git log, git reflog, ...22:16
or just use HEAD~122:16
guy Well, sort of, because I am used to check sha from github.com22:16
though, git log worked22:16
cbreak of course it does...22:16
→ siriuz joined22:17
guy https://gist.github.com/anonymous/6dbdc77c3c68580ee80a22:17
now it says "changes to be commited"22:17
I am guessing that means that the message is already assigned?22:17
→ shel3over joined22:18
cbreak no22:18
the message is gone22:18
the commit is gone22:18
the changes are still staged for commit22:18
guy gotcha. Thanks for your help and patience. : )22:18
cbreak (you can still get the message and commit from the reflog if you care...)22:18
osse -C HEAD@{1}22:19
ooops.22:20
→ samuel02 joined22:20
→ hlysig joined22:20
hlysig Hi all. I have a branch on github and I wan´t to revert to a specific comment (move the head) and push. How can I do that?22:21
cbreak reset and push22:21
hlysig git reset commit id && git push ?22:22
cbreak reset --hard and push -f, yes22:22
that will nuke away changes and history22:22
guy cbreak: wouldn't --soft work in his case?22:22
cbreak be sure this is really what you want22:22
hlysig ok22:22
← siriuz left22:22
cbreak it would, but it'd leave debries behind22:22
guy well, only if he created new files inbetween two commits (?)22:23
→ ibash joined22:23
← ibash left22:23
cbreak it'd leave the state in index and working dir22:23
← maxmanders left22:23
→ ibash joined22:23
ibash hi22:23
I have a git repo on a filesystem on a remote server, I can push new branches, but whenever I try to push an update to a branch I get ! [remote rejected] adding_processes -> adding_processes (failed to lock)22:24
I tried modifying the permissions of the whole repo to 775 but still no cigar22:24
cbreak is your filesystem broken?22:25
← samuel02 left22:25
ibash cbreak: I don't think so? I can ssh in and navigate around22:25
→ jyp joined22:25
cbreak what filesystem?22:25
FAT16?22:25
ibash I'm unsure, it's on a mounted drive in a vm22:25
← taylorlapeyre left22:25
osse can there be some lockfile left behind?22:26
← etcetera left22:26
ibash osse: would I check that?22:26
osse: how would I check that?22:26
osse ibash: honestly, I don't know. I was just a hunch.22:26
ibash cbreak: filesystem is gpfs22:27
cbreak never heard of that.22:27
← pandeiro left22:27
→ siriuz joined22:27
cbreak maybe it doesn't support file locking22:27
← beakman left22:27
ibash cbreak: would I still be able to push a new repo though?22:27
← guy left22:27
← jaseemabid left22:27
cbreak no idea.22:28
← oracal left22:28
← kevwil left22:28
← MrNibbles left22:28
osse it supports locking, that's for sure.22:28
cbreak well, it failed to lock :)22:29
← leeN left22:29
← rockets_ left22:30
→ zastern joined22:30
osse ibash: this is a long shot, but you mentioned a vm: do you actually mean hgfs?22:30
← rasto left22:30
ibash osse: I don't know, df -T says the type if gpfs22:31
osse Then it probably is22:32
← siriuz left22:32
← jyp left22:32
→ pppaul joined22:33
→ edgeuplink joined22:34
→ MrNibbles joined22:34
→ w09x joined22:34
← Milossh left22:35
← TeckniX left22:35
← exidl left22:35
ibash osse: …?22:36
→ siriuz joined22:36
osse My hunch was merely that you made a weird typo or something. If df -T says the FS is gpfs, then I won't argue with that.22:37
But I don't know why you get that error22:37
ibash osse: ah, I thought you meant that it was probably hgfs :)22:37
→ etcetera joined22:38
osse Oh, hehe.22:38
I'm not the overly confident type22:38
← hwrd|work left22:39
ibash weird was just able to push -- maybe I fixed it by accident22:40
→ Yakko joined22:40
← Davey left22:40
← eijk_ left22:41
← siriuz left22:42
→ hwrd|work joined22:42
→ rasto joined22:43
← Laurenceb_ left22:43
→ hiptobecubic joined22:44
hiptobecubic Why on earth do git bisect commands have to be issued from the root of the working tree?22:44
SamB hiptobecubic: good question22:45
← Yakko left22:45
hiptobecubic It feels so arbitrary22:45
→ Yakko joined22:45
hiptobecubic It gets in the way pretty constantly :(22:45
← AnimeCYC left22:46
SamB perhaps someone should make a patch to rectify this22:46
→ siriuz joined22:46
← edgeuplink left22:46
hiptobecubic Well is there a reason for it?22:46
SamB not that I've heard of22:47
← w09x left22:47
← etcetera left22:47
hiptobecubic I wonder why someone wrote that to begin with22:48
→ edgeuplink joined22:48
← b1rkh0ff left22:49
→ Esa_ joined22:49
← Saby left22:49
← siriuz left22:50
SamB well, it's a shell script ...22:50
→ kit joined22:51
SamB and someone would have to decide about the handling of path arguments (particularly, what they're relative to)22:52
← Esa|iPhone6 left22:52
Weezey how I do translate this command to 4.1.0 ? /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h xenserver -s <optional-management-server-secret-key> -F22:53
← edgeuplink left22:53
← hwrd|work left22:53
SamB also there's the PWD for "run"22:53
Weezey wrong channel22:53
my bad22:53
SamB hiptobecubic: all in all, it probably isn't too difficult to sort out, but enough work that I can see why someone might have punted long ago ...22:53
hiptobecubic git does a perfectly fine job of finding the root in every other case22:54
← BSaboia left22:54
SamB yeah, finding the root is surely not the hard part22:54
← Esa_ left22:54
→ frenchlaf joined22:55
→ mloskot joined22:56
← mloskot left22:56
→ siriuz joined22:56
← Kje10L left22:57
→ jyp joined22:58
hiptobecubic wow... git's history is ridiculous22:58
SamB hmm, it looks like the first thing to do is try adding SUBDIRECTORY_OK=Yes at the top and messing around22:58
← travisc__ left22:58
→ pastime joined22:58
SamB (obviously in a scratch copy of something)22:58
→ hwrd|work joined22:59
→ R1KRDO joined23:00
→ chamunks joined23:01
← hwrd|work left23:01
← ehsan left23:02
← anonymuse left23:02
→ Davey joined23:02
SamB hiptobecubic: what in particular do you find ridiculous?23:02
← garbagecollect-1 left23:02
← siriuz left23:02
juvenal → juvenal_away23:02
← x82_nicole left23:03
hiptobecubic not ridiculous in a bad way. just thick23:03
→ robbyoconnor joined23:03
→ diegoviola joined23:03
→ etcetera joined23:05
← pppaul left23:05
→ siriuz joined23:06
← kmels__ left23:08
juvenal_away → juvenal23:08
→ Tommy[D]_ joined23:09
hiptobecubic SamB, it shouldn't give that error unless rev-parse --show-cdup fails... it seems23:10
→ sgambino joined23:10
← siriuz left23:10
← frenchlaf left23:10
← shruggar left23:12
→ shruggar joined23:13
→ frenchlaf joined23:15
→ robottinosino joined23:16
→ benjings joined23:16
← scelis left23:16
← R1KRDO left23:17
→ hwrd|work joined23:17
← amcsi left23:17
→ trungqtran joined23:18
→ siriuz joined23:18
← benjings left23:18
← daniel_- left23:18
→ pur3forlyphe joined23:18
→ chuckharmston joined23:19
← guampa left23:20
← hlysig left23:20
← shruggar left23:20
→ khushildep joined23:21
SamB hiptobecubic: not when it fails, but when it gives output23:23
juvenal → juvenal_away23:24
← danishkhan left23:24
SamB which would consist of the requisite number of repetitions of "../" to get to the root23:24
← chuckharmston left23:24
→ Noldorin joined23:24
← Chillance left23:25
hiptobecubic oh yes. I didn't notice the -z for some reason23:25
i am pretty curious about this now23:26
← mitz_ left23:27
← siriuz left23:27
→ siriuz joined23:31
← jyp left23:31
→ marhaban joined23:33
→ danishkhan joined23:33
← danishkhan left23:35
→ Gentlecat joined23:35
→ thin joined23:36
← kit left23:37
← siriuz left23:37
gitinfo set mode: +v23:38
thin Hi could someone help me figure something out with git in windows23:38
→ traviscj joined23:38
← spaceships left23:38
→ x82_nicole joined23:38
← Phoenixz left23:39
← robottinosino left23:39
→ griotspeak joined23:40
→ siriuz joined23:40
→ Phoenixz joined23:40
← Phoenixz left23:40
→ Phoenixz joined23:40
SamB hiptobecubic: any scripts which don't set $SUBDIRECTORY_OK to something likely assumes it's being run from the root, and thus doesn't yet have any logic for translating relative paths between PWD and the root of the working tree23:42
← ISF left23:42
SamB hmm, that didn't quite come out grammatical but it's clear enough23:43
← mossplix left23:43
hiptobecubic SamB, that was my assumption as well. I don't know all of the nooks and crannies where it will catch you though23:43
← danman left23:43
hiptobecubic It's interesting that this is all done in sh23:44
← marhaban left23:44
hiptobecubic I suppose it makes sense, I just didn't see it coming.23:44
→ danman joined23:44
← danman left23:46
← Noldorin left23:46
juvenal_away → juvenal23:47
← siriuz left23:47
→ m0ltar joined23:47
← hobodave left23:48
← x82_nicole left23:48
→ ehsan joined23:48
→ rockets joined23:48
← traviscj left23:49
→ dogarrhea joined23:50
dogarrhea what does it mean when the hashes are the same for a particular file?23:50
resin is complaining when i start a server23:51
→ danishkhan joined23:52
→ mitz_ joined23:52
← zastern left23:52
→ siriuz joined23:52
→ tekseven joined23:53
← ehsan left23:53
← tekseven left23:53
← rockets left23:53
← NiteRain left23:55
← siriuz left23:55
← etcetera left23:56
← rakl left23:56
→ spaceships joined23:56
← beneggett left23:57
← mitz_ left23:58
→ garbagecollectio joined23:59
→ jefferai joined23:59

Logs Search ←Prev date Next date→ Channels Documentation