IRCloggy #git 2013-10-13

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-10-13

← LuxuryMode left00:00
← Goplat left00:00
← ktosiek left00:02
→ ktosiek joined00:04
← ciampix left00:04
← phpwn left00:06
← TheNotary left00:07
→ devoldmx joined00:07
← pandeiro left00:07
→ jalama joined00:07
← Mars`_ left00:08
→ Mars` joined00:08
← rudak left00:10
← bryce11 left00:11
← SeySayux left00:12
→ phpwn joined00:12
← Mars` left00:13
← toothrot left00:13
→ babilen joined00:13
← babilen left00:13
→ SeySayux joined00:14
→ m0ltar joined00:14
← zacts left00:15
← trusktr left00:16
→ zacts joined00:16
← uman left00:16
← mfulz left00:17
← travisstaton left00:18
→ Shaladdle joined00:19
→ thierryp joined00:20
→ travisstaton joined00:20
← neure left00:23
← thierryp left00:25
→ harish joined00:27
← DonRichie left00:27
← PaulCapestany left00:27
→ DonRichie joined00:28
← phpwn left00:30
→ Hubicorn joined00:31
→ uman joined00:32
→ jenia joined00:34
→ mklappstuhl joined00:34
jenia hello, how do you tell which files have been changed between two git commits?00:34
thiago jenia: git diff00:34
jenia no but that will show you their contents too no?00:35
← rednaks left00:35
thiago git diff --name-only00:35
→ ErKa joined00:36
→ phpwn joined00:36
jenia ahhh okay thanks very much00:37
→ dreiss_ joined00:37
→ Mars` joined00:37
→ Goplat joined00:38
→ LuxuryMode joined00:38
← Mars` left00:39
→ Mars` joined00:40
← zacts left00:41
→ breck7 joined00:43
→ zacts joined00:44
← penguin42 left00:44
← Mars` left00:45
→ danecando joined00:46
← LuxuryMode left00:46
← stamina left00:46
← Squarism left00:49
← breck7 left00:50
razieliyo I add a submodule to 'project', then I change the submodule and commit the changes within it but don't do the same with the parent project00:50
I remove the project, clone it later, and after git submodule init and git submodule update, if I enter the submodule folder and say git branch, I get that I'm on (no branch)00:51
of course I can git checkout master00:51
does anyone know the reason of this behaviour?00:52
→ bryce11 joined00:52
← dreiss_ left00:53
preaction git submodules do not track branches, they track single commits00:55
razieliyo so, why does I get I'm on * (no branch)?00:56
s/does/do00:56
→ Pyrogerg joined00:56
preaction because you're not on a branch. it's just like when you check out a commit in the main project, you have a "detached HEAD"00:56
razieliyo but I don't have the last files I commited until I do git checkout master00:57
preaction because you didn't update the main project repository to update which commit the submodule should point to00:58
razieliyo I see00:58
← uman left00:58
razieliyo so, as a rule, when I update just the submodule, I should update the main project I guess00:58
by update I mean commit00:59
preaction yes00:59
razieliyo preaction: fine, thank you01:00
I think submodules is the thing I want01:00
→ Balliad joined01:00
razieliyo I'm a bit scared of stuff I've read like this: http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/01:00
but this are going to be one man projects, so I guess I don't have to worry about what that guy talks about01:00
s/this/these01:00
thiago are you a company?01:00
razieliyo haha I'm not01:01
thiago if not, then it doesn't apply to you :-)01:01
razieliyo fine =)01:01
because I see submodules fit my context pretty nice01:01
thiago submodules work fine when you want to track exact dependencies between two codebases01:01
← travisstaton left01:02
thiago it only works if you're not developing both in a group of people01:02
milki razieliyo: like i said, its catered towards a particular workflow01:02
razieliyo: if you dont follow that workflow, you are trying to make submodules do what they arent designed to do01:02
and thats bad (tm)01:02
← dougsland left01:03
razieliyo yes, what i want to achieve is to have several frameworks and use them on my projects, and be able to update them for every project that uses a concrete framework from any other project that uses that framework01:03
milki: yes, I see now that you meant that, if I'm gonna work with other devs, it may not suit my needs01:03
→ endiruna joined01:04
→ kpreid joined01:04
← Balliad left01:04
← cmpera left01:05
razieliyo I'm just starting to organise all my code in a local git 'server', because I always keep on updating common stuff on several projects when I make a single change01:05
← therealGent left01:05
← mklappstuhl left01:05
endiruna hi is there a way to import everything from repository. like git clone but i have most of the branches so i do not want to download everything.01:05
razieliyo I have to change it across the projects that use that common code, and submodules can let me change just once, and pull when I need it01:05
→ mklappstuhl joined01:05
endiruna git pull does only one branch at a time01:06
→ Balliad joined01:06
← SHyx0rmZ left01:06
milki endiruna: you dont have the links setup correctly then01:06
endiruna: if you git pull -u, i think it will attempt to automatically link things01:07
m01:07
nope01:07
thats only for push >.>01:07
endiruna: git push -u first beforing pulling i suppose01:07
endiruna: otherwise, manually branch --set-upstream for each branch01:07
← DuncanNZ left01:08
endiruna milki: i am not sure i understand. push and pull should be simmetric operations? why do i need to push and than pull?01:09
zacts what's the deal with stale beer in the /topic?01:09
milki endiruna: try figuring out what -u does in apull01:10
→ dyng joined01:10
← mklappstuhl left01:10
→ DuncanNZ joined01:11
→ freestyl3r joined01:11
razieliyo I'm just realizing that if I make a change into a submodule, I have to commit both on the submodule folder and the parent folder01:14
is this right? or maybe am I doing something wrong?01:14
← dyng left01:14
→ cmpera joined01:14
milki razieliyo: yes that is right01:15
they are seperate repos01:15
razieliyo milki: fine01:16
→ PaulCapestany joined01:16
← worstadmin left01:16
razieliyo another thing I've noticed is that if I make a change in the submodule and try to commit on the parent, it says no change was done, but if I commit first on the submodule, and later on the parent, it works ok01:16
I suppose that fits on the philosophy of being separate repos01:17
→ thierryp joined01:20
→ Mars` joined01:21
→ MrBlueSky joined01:21
→ toothr joined01:22
← looper left01:23
← Misan left01:23
milki right01:24
→ tmcmahon joined01:24
← chrisss404 left01:25
→ intripoon_ joined01:25
→ looper joined01:26
← DuncanNZ left01:26
← ScottE left01:26
→ ScottE joined01:27
→ travisstaton joined01:27
→ chrisss404 joined01:27
→ DanielKarp joined01:27
→ Risto joined01:28
← intripoon left01:28
← thierryp left01:28
← Vampire0 left01:29
← MacWinner left01:29
← beastd left01:29
→ z^ joined01:31
→ asQuirreL joined01:31
← worblehat left01:31
← z^ left01:32
→ Vampire0 joined01:34
← Risto left01:34
→ uman joined01:36
← MrBlueSky left01:37
← Balliad left01:38
← tmcmahon left01:38
→ angelsl joined01:39
← DanielKarp left01:39
→ Vampire0_ joined01:39
← Vampire0 left01:41
→ mribeirodantas joined01:42
← Mars` left01:43
→ str joined01:43
→ Mars` joined01:43
← phpwn left01:46
→ Risto joined01:47
← Risto left01:47
← Mars` left01:48
→ Mars`_ joined01:48
← cmpera left01:48
→ DuncanNZ joined01:49
← asQuirreL left01:50
→ phpwn joined01:52
→ GODDOG joined01:53
← jenia left01:54
→ dyng joined01:56
← jalama left01:57
← gzg left01:57
→ kao0012 joined01:57
→ rjhunter joined01:58
→ cmpera joined01:58
← uman left01:58
← kwmiebach left01:58
→ jalama joined01:59
← jalama left01:59
← cmpera left01:59
→ cmpera joined02:01
← cmpera left02:02
→ fcrs joined02:03
← Zarthus left02:03
fcrs someone gave me a .gitignore file containing both "project/target" and "target". wouldn't "target" also match all occurrences of "project/target"?02:05
← freestyl3r left02:05
← yhager left02:06
← lunarjar left02:06
← AWinterman left02:07
→ lunarjar joined02:07
→ AWinterman joined02:07
← mdiers left02:08
← dyng left02:09
→ dyng joined02:09
← kao0012 left02:10
thiago fcrs: yes02:11
← AWinterman left02:11
→ mdiers joined02:13
← leprechau left02:13
← dyng left02:14
← iderik left02:14
← ereslibre left02:14
← Bombe left02:17
→ fuzzybunny69y joined02:17
→ infynyxx joined02:18
← m0ltar left02:18
fuzzybunny69y hey guys I was just on one branch(test) and I stashed my changes from it and checked out another branch(dev) and I tried to apply my stash onto my dev branch and got a few conflicts. CONFLICT (content): Merge conflict in index.html02:19
CONFLICT (modify/delete): css/style.css deleted in Updated upstream and modified in Stashed changes. Version Stashed changes of css/style.css left in tree.02:19
← hahuang65 left02:19
← Joshi3s` left02:19
fuzzybunny69y what does the 2nd conflict mean?02:19
← fcrs left02:19
fuzzybunny69y does it mean that in the branch I am in now there was no css/style.css02:19
thiago right02:19
→ hahuang65 joined02:20
fuzzybunny69y so then it just left the style.css from my stashed changes?02:20
thiago yes02:20
fuzzybunny69y oh ok02:20
and if I do a git status it says02:20
# deleted by us: css/style.css02:20
← bryce11 left02:20
fuzzybunny69y # both modified: index.html02:20
so if I want to keep the style.css from my stash02:20
thiago git add it02:21
fuzzybunny69y what would I do02:21
← travisstaton left02:21
fuzzybunny69y if I git add css/style.css would I tell git to erase style.css02:21
→ x684867 joined02:22
→ Bombe joined02:22
← Narven left02:22
thiago the file is there, isn't it?02:22
git add never deletes02:22
→ Narven joined02:23
→ m0viefreak joined02:23
← infynyxx left02:23
fuzzybunny69y thiago it has a style.css and a style.css.orig02:24
← TomyLobo left02:24
thiago check which one you want02:25
← GODDOG left02:25
→ GODDOG joined02:25
← rjhunter left02:25
fuzzybunny69y hmm actually I have some changes in another branch that I better put on first02:26
← Narven left02:27
← x684867 left02:27
← valgrind left02:29
→ yhager joined02:29
fuzzybunny69y hmmm what is the best way to get my changes from my menu branch onto my dev branch?02:32
← CheckDavid left02:33
thiago are they already committed?02:34
→ jenia_ joined02:34
← ErKa left02:34
jenia_ when i do git log --graph, it shows me only the graph for this branch02:34
what about the entire graph?02:35
thiago jenia_: that is the entire graph02:35
← Fissure left02:35
thiago maybe you want git log --graph --all02:35
jenia_ ahhh okay thanks02:36
← eletuchy_ left02:37
→ eletuchy joined02:37
→ uman joined02:37
→ AWinterman joined02:38
→ tgs3 joined02:38
→ Fissure joined02:39
fuzzybunny69y thiago yeah it is committed already02:39
thiago fuzzybunny69y: git merge is the recommended way, which means getting all of the changes from that branch02:39
fuzzybunny69y oh02:40
thiago you should make branches so that they can be merged02:40
fuzzybunny69y what about a rebase02:40
and why is merging the recommended way02:40
thiago rebasing is also fine02:40
→ oojacoboo joined02:40
thiago but you can only do that if you haven't shared the current branch with other people02:41
fuzzybunny69y I have 3 commits on my menu branch that aren't on my dev branch02:41
and 1 commit that is on my dev branch that isn't on my menu branch02:41
thiago have you shared either branch with anyone?02:41
fuzzybunny69y no02:41
well might have put them on github02:41
but it is just me doing stuff on my page02:41
thiago ok02:41
then rebase one on top of the other02:42
then delete the other02:42
fuzzybunny69y oh ok02:42
so if I am on my menu branch02:42
→ beingbrown joined02:42
fuzzybunny69y would I type git rebase dev02:42
thiago yes02:42
→ renatow__ joined02:43
← mobileblue left02:43
beingbrown hello02:43
fuzzybunny69y hmm thiago my changes aren't showing up on dev02:43
thiago fuzzybunny69y: are they in the current branch?02:44
fuzzybunny69y hmmm02:44
it looks like it brought the stuff from dev into my menu branch02:44
thiago right, that's the expected result02:44
fuzzybunny69y I wanted the changes from my menu log to go onto my dev branch though02:45
thiago then you did it the other way around02:45
fuzzybunny69y like I wanted the commits from my menu branch to go onto the dev branch02:45
thiago you check out the branch that you want the changes to be in02:45
fuzzybunny69y hmmm02:45
→ mobileblue joined02:45
fuzzybunny69y so how do I get back to before I did the rebase02:46
because now it has the commit from the dev branch in the menu branch02:46
← renatow_ left02:46
thiago git reset --hard menu@{1} while on the menu branch02:46
← tinti left02:46
fuzzybunny69y hmm02:47
← AWinterman left02:47
fuzzybunny69y thiago this is my git reflag here https://gist.github.com/695755002:48
← M-ou-se left02:48
→ kerrick joined02:48
fuzzybunny69y reflog02:49
thiago that's why I said menu@{1}02:49
→ M-ou-se joined02:49
← raijin left02:49
← edude03 left02:49
fuzzybunny69y oh I did that02:50
I get scared02:50
doing all this business02:50
ok so I switched to my dev branch02:51
so would I do a git rebase menu02:51
← str left02:51
→ str joined02:52
← str left02:52
→ Katafalkas joined02:52
→ petey joined02:53
thiago yes02:54
fuzzybunny69y thiago I think it did it02:55
what a miracle02:55
thiago no, just git02:55
fuzzybunny69y thiago: so when I am rebasing I always checkout the branch that I want the commits to go onto02:55
thiago yes02:55
like merge and cherry-pick and commit and everything else02:55
fuzzybunny69y I always get confused about whether I should be on the branch I want the stuff to go onto02:55
or if I should be on the other one that has the changes02:55
thiago everything that requires a working tree affects only the branch that you have checked out02:55
→ quixotic_chris joined02:56
fuzzybunny69y thiago so if I was doing a merge02:56
thiago same thing02:56
fuzzybunny69y I would checkout the branch that I wanted the changes to go onto02:56
and type git merge <branch that has changes>02:56
thiago all commits that require the working tree affect the working tree only02:56
that means the branch that the tree was checked out from02:56
← Katafalkas left02:56
fuzzybunny69y hmmm02:57
I am a bit confused by that02:57
thiago how so?02:57
fuzzybunny69y I just don't really understand what you mean02:57
by that02:57
thiago let's start by parts02:57
do you know what a working tree is?02:57
fuzzybunny69y is that just like when I checkout a commit02:57
the files that get put in the directory02:57
thiago yes02:58
fuzzybunny69y from the commit is my working tree02:58
← petey left02:58
← Goplat left03:00
← banisterfiend left03:00
→ Davey joined03:01
fuzzybunny69y thiago: what would I do with my menu branch now03:02
should I just erase it?03:02
← joki left03:02
fuzzybunny69y or do I have to do something else with it to make sure it is in my dev branch03:02
→ frgtn joined03:02
thiago yes03:02
you can now delete it03:02
← oojacoboo left03:02
→ raijin joined03:03
← byprdct left03:03
← m0viefreak left03:03
fuzzybunny69y thiago: do you know why on this page http://git-scm.com/book/en/Git-Branching-Rebasing after the rebase he says At this point, you can go back to the master branch and do a fast-forward merge (see Figure 3-30).03:05
do I have to do that on mine?03:05
← GODDOG left03:06
← frgtn left03:06
thiago no need03:06
→ ereslibre joined03:07
← ereslibre left03:07
→ ereslibre joined03:07
← DonRichie left03:07
fuzzybunny69y oh what is a fast forward merge?03:07
thiago suppose branch 1 is A-B-C03:08
→ joki joined03:08
thiago and you want to merge branch 2 A-B-C-D-E03:08
that's a fast-forward because E is a direct descendant of C03:08
fuzzybunny69y oh03:09
thiago if you wanted to merge branch 3 (A-B-F-G-H), then it would be a regular merge03:09
fuzzybunny69y oh03:09
thiago H is not a descendant of C, so git merge needs to create a merge commit that has both C and H as parents03:09
fuzzybunny69y hmmm03:09
it is quite confusing03:10
thiago on the other hand, if you tried to rebase, it would create A-B-F-G-H-C'03:10
→ dyng joined03:10
thiago no, it isn't03:10
git log --graph or gitk show the branches03:10
you just need to understand the commit history03:10
→ fobius joined03:13
→ leprechau joined03:14
← dyng left03:14
← uman left03:15
← leprechau left03:16
← ereslibre left03:16
← fuzzybunny69y left03:16
→ iamjarvo joined03:17
← glosoli left03:17
→ fuzzybunny69y joined03:19
← iamjarvo left03:19
→ iamjarvo joined03:20
→ leprechau joined03:20
fuzzybunny69y hmmm my computer went all crazy03:21
→ gzg joined03:21
← Mars`_ left03:22
→ Mars` joined03:22
→ vkz joined03:23
← iamjarvo left03:24
→ redrocket joined03:25
→ iamjarvo joined03:25
← gzg left03:25
← acharlieh left03:26
→ bryce11 joined03:26
← fobius left03:26
← Mars` left03:27
→ acharlieh joined03:28
← iamjarvo left03:29
→ DTrejo joined03:30
DTrejo hi, does anyone know how I can make git output color codes when output is piped into a file? e.g. `git status -s >> file.txt`.03:30
I know it has something to do with telling it to think it is in tty mode?03:31
→ jenia joined03:31
← raonyguimaraes left03:34
→ rjhunter joined03:34
← neaer left03:34
→ GODDOG joined03:38
← phpwn left03:42
→ Goplat joined03:43
← bryce11 left03:44
→ phpwn joined03:48
→ gzg joined03:49
→ preflex_ joined03:49
← vkz left03:50
→ ereslibre joined03:50
← ereslibre left03:50
→ ereslibre joined03:50
← preflex left03:50
preflex_ → preflex03:50
→ cannonball joined03:52
→ GT4066 joined03:52
← danecando left03:53
→ ewnd9_ joined03:56
→ trusktr joined03:59
← phpwn left04:02
→ wrouesnel joined04:03
→ cmpera joined04:03
beingbrown if I were to use URL as a column of a mysql table, what how would I case it?04:03
I'm camel casing everything else, if that matters?04:03
(I know that isn't strictly git, but it relates to managing my databases inside git04:04
← ereslibre left04:04
→ ErKa joined04:07
→ phpwn joined04:08
← GODDOG left04:09
← razieliyo left04:09
← Droolio left04:11
→ ehmatthes joined04:11
→ edude03 joined04:11
→ dyng joined04:11
→ Droolio joined04:11
→ travisstaton joined04:11
← PaulCapestany left04:13
→ byprdct joined04:15
← byprdct left04:15
→ mgberlin joined04:15
← the_cybersphinx left04:16
← mgberlin left04:16
← dyng left04:16
→ mgberlin joined04:16
← shinnya left04:17
fuzzybunny69y hey thiago thanks for all your help earlier!!04:17
← mgberlin left04:20
→ s2013 joined04:21
s2013 wtf.. im pushing something to github.. it pushed but on github its not showing04:21
then i tried pushing again and it says everything upto date04:21
i switched to the branch and everything04:21
← GT4066 left04:26
s2013 some of my older commits are lost. wtf04:26
i commited stuff and now they are lost04:27
← phpwn left04:30
→ lolouislol joined04:31
← travisstaton left04:31
→ juvenal joined04:35
← s2013 left04:35
→ phpwn joined04:36
← phpwn left04:39
← chamunks left04:39
→ chamunks joined04:40
→ jaseemabid joined04:41
→ phpwn joined04:44
← jaseemabid left04:46
← Boohbah left04:47
→ Boohbah joined04:48
← lresende left04:49
← quixotic_chris left04:51
→ Tommy[D]_ joined04:51
← cannonball left04:51
→ bwreilly joined04:52
→ bryce11 joined04:53
→ rurufufuss joined04:54
← Droolio left04:55
← Tommy[D] left04:55
→ Droolio joined04:55
→ bwreilly_ joined04:56
← bryce11 left04:56
→ cigarshark joined04:57
← bwreilly left04:57
← cigarshark left04:58
← phpwn left05:03
← edude03 left05:03
← pen left05:05
→ pen joined05:07
→ irqq joined05:07
← ewnd9_ left05:08
→ ewnd9 joined05:08
→ phpwn joined05:08
← jenia left05:10
← DTrejo left05:11
→ dyng joined05:11
← Gamecubic left05:14
→ cagedwisdom joined05:14
← dyng left05:16
← thehodapp left05:18
→ therealGent joined05:18
→ varlog joined05:18
← phpwn left05:22
→ twld joined05:22
← twld left05:25
→ GODDOG joined05:26
← joshh__ left05:28
→ phpwn joined05:28
← phpwn left05:30
→ eletuchy_ joined05:31
→ joshh__ joined05:31
← mribeirodantas left05:33
← ErKa left05:33
← yhager left05:33
← eletuchy left05:34
→ kate_r joined05:35
→ phpwn joined05:36
→ ErKa joined05:37
← Goplat left05:41
→ hoschi joined05:41
← raijin left05:43
beingbrown anyone have any use for a pre-commit hook that grabs a database in its current state and breaks it into install scripts?05:43
→ GT4066 joined05:44
thiago you can use a smudge/clean filter set05:45
→ pantsman joined05:46
← pantsman left05:46
→ pantsman joined05:46
← madewokherd left05:46
← phpwn left05:50
← ErKa left05:51
offby1 sounds crazy05:54
→ phpwn joined05:56
beingbrown fill me in on a smudge/clean filter set?05:56
I wrote a custom hook for it.05:56
← DuncanNZ left05:59
→ epicowl joined06:02
→ DuncanNZ joined06:03
← wagle left06:04
← kerrick left06:04
← phpwn left06:07
← pantsman left06:07
→ dyng joined06:12
→ phpwn joined06:12
← crazydiamond left06:13
← wrouesnel left06:14
← xerxas left06:15
← cmpera left06:16
← ThomasCompix left06:16
← dyng left06:16
← akurilin left06:16
→ byprdct joined06:18
← byprdct left06:18
→ jenia joined06:18
← GT4066 left06:22
→ kerrick joined06:26
← phpwn left06:26
→ yhager joined06:27
→ guns joined06:28
→ phpwn joined06:32
→ a-l-e joined06:33
← nicedice left06:33
→ nicedice joined06:34
← girishr_ left06:35
Eugene You're crazy.06:35
← kate_r left06:35
ChanServ set mode: +o06:35
Eugene changed the topic to: Welcome to #git, the place for git-related help and empty cardboard boxes | Current stable version: 1.8.4 | Start here: http://jk.gs/git | Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice | May the forks be with you06:36
Eugene set mode: -o06:37
← beingbrown left06:37
→ Jackneill joined06:39
← phpwn left06:42
→ ngladitz joined06:44
← Cassiel left06:45
→ ereslibre joined06:46
← ereslibre left06:46
→ ereslibre joined06:46
→ phpwn joined06:48
→ _iron joined06:49
← vigs left06:49
→ vigs joined06:50
← ereslibre left06:52
← kukks left06:54
→ petey joined06:54
← maroloccio left06:56
← petey left06:58
← phpwn left06:58
→ phpwn joined07:04
→ h0bbit_ joined07:05
← acharlieh left07:06
← endiruna left07:07
← phpwn left07:11
→ dyng joined07:12
→ PaulCapestany joined07:15
→ phpwn joined07:16
← chepre left07:17
← h0bbit_ left07:17
← dyng left07:18
← GODDOG left07:18
← phpwn left07:23
← darinm left07:24
← vigs left07:25
→ HelloShitty joined07:27
→ ereslibre joined07:27
→ terminalRepeat joined07:27
← leprechau left07:28
→ phpwn joined07:28
→ leprechau joined07:29
→ BiggFREE joined07:29
→ RatSalad joined07:29
← PaulCapestany left07:30
← yhager left07:31
← ereslibre left07:32
→ longbeach joined07:34
← phpwn left07:34
→ GT4066 joined07:35
← RatSalad left07:35
→ RatSalad joined07:36
→ danicampa901 joined07:36
← RatSalad left07:36
→ mklappstuhl joined07:37
→ AWinterman joined07:39
← kerrick left07:40
→ phpwn joined07:40
→ crazydiamond joined07:42
← phpwn left07:42
→ dreiss joined07:43
← mklappstuhl left07:43
→ mklappstuhl joined07:44
→ p3lim_ joined07:44
→ vince_prignano joined07:47
← p3lim left07:47
→ phpwn joined07:48
← mklappstuhl left07:48
→ ereslibre joined07:49
← ereslibre left07:49
→ ereslibre joined07:49
→ vurma joined07:49
← dreiss left07:49
→ matanya_ joined07:49
→ thierryp joined07:51
← KillYourTV left07:51
→ koda joined07:52
← therealGent left07:52
← ereslibre left07:53
→ kate_r joined07:55
← phpwn left07:58
← bwreilly_ left07:59
→ JohnBat26 joined08:00
← gzg left08:00
← thierryp left08:00
→ danicampa9011 joined08:00
← danicampa901 left08:00
→ thierryp joined08:00
→ kerrick joined08:01
→ phpwn joined08:04
← DuncanNZ left08:04
→ gzg joined08:05
← epicowl left08:08
← thiago left08:12
→ dyng joined08:13
→ King_Hual joined08:14
→ ThomasCompix joined08:15
→ xerxas joined08:15
→ banisterfiend joined08:17
← dyng left08:18
→ Zarthus joined08:18
→ rudak joined08:18
→ sm0ke joined08:20
← phpwn left08:27
→ mishok13 joined08:28
→ noname001__ joined08:29
← thierryp left08:29
→ thierryp joined08:30
← koda left08:32
→ phpwn joined08:32
← sm0ke left08:34
← thierryp left08:34
→ jnavila joined08:35
← AWinterman left08:36
→ AWinterman joined08:36
← guns left08:37
← AWinterman left08:41
← matanya_ left08:42
→ _nova joined08:43
→ nova_ joined08:44
→ neure joined08:44
→ matanya_ joined08:45
→ Mode-M joined08:48
← _nova left08:48
← crazydiamond left08:49
Brando753 so I got a question, I am using git with a shared group of people and I noticed there is now a BRANCH called HEAD, it looks like it would just be a symbollic reference to the default master in a bare repo and I have no way of accessing it on my local system, however bitbucket is showing commits to the HEAD branch that do not exist on the master branch it points to, on top of this while I do not have access to08:49
these commits the CI server IS seeing them and saying the master branch is failing to compile, any idea on what to do to get access to these commits on a local system?08:49
← matanya_ left08:50
→ snql joined08:50
→ matanya_ joined08:52
→ k4rtik joined08:52
← neure left08:53
← angelsl left08:56
→ angelsl joined08:57
← JohnBat26 left08:59
← angelsl left08:59
→ angelsl joined08:59
cbreak Brando753: HEAD is the current branch09:00
it's the branch you have checked out09:00
each repository has its own.09:00
Brando753 cbreak: indeed, except I now have a branch called head...09:00
cbreak then you made one.09:00
Brando753 well someone else made one09:01
cbreak HEAD and head are obviously different.09:01
Brando753 indeed09:01
except HEAD points to origin/master and yet it contains data in this branch09:01
that master does not09:01
cbreak that sounds idiotic.09:01
how did you get HEAD to point to that?09:01
Brando753 I know...09:01
I did not...09:01
someone used a git GUI09:01
against my recommendation09:02
cbreak HEAD should only point to local branches09:02
which HEAD do you think points to origin/master?09:02
yours? the one on the remote?09:02
← gzg left09:02
Brando753 the one on remote claims to point to origin/master09:02
cbreak ah, that's normal.09:03
Brando753 yet bitbucket and CI says HEAD is also a branch09:03
which seems to exist only on those09:03
and has data master does not09:03
cbreak do you have local access to those?09:03
if so, run git symbolic-ref HEAD09:04
→ ereslibre joined09:04
← ereslibre left09:04
→ ereslibre joined09:04
Brando753 cbreak: well, I have a HEAD which links back to master, not showing the data the HEAD on the servers show09:05
cbreak so?09:05
your HEAD probably points to your master09:05
Brando753 which is expected09:05
cbreak your master is independent from any other master09:05
Brando753 indeed09:05
but the HEAD branch on the server has broken code09:06
cbreak do you have local access to those?09:06
← snql left09:06
Brando753 well there is a way I am sure, I just dont know how to get access to it09:07
→ AWinterman joined09:07
cbreak can you pastebin git ls-remote origin?09:07
Brando753 cbreak: http://pastebin.com/Cn6N0usk09:08
→ linuxmint joined09:08
cbreak looks good09:08
HEAD seems to point at master09:09
→ chepre joined09:09
→ milStaja joined09:09
cbreak just git push --delete origin refs/heads/HEAD to remove that other one09:09
Brando753 here is where the breakage occurs, bitbucket shows master having different code then HEAD, I only see master without HEAD, and CI sees master with HEAD's code and no HEAD...09:09
cbreak (maybe fetch it first so you can save its history)09:10
Brando753 and of course all updated in all of them09:10
← ereslibre left09:10
cbreak refs/heads/HEAD must go.09:10
→ snql joined09:10
← Davey left09:10
→ corehello joined09:11
← corehello left09:11
→ bwreilly joined09:13
→ dyng joined09:14
Brando753 cbreak: yea that seems to have fixed the bitbucket and CI server issue09:14
cbreak: can you tell me why that ever happened in the first place?09:14
→ babilen joined09:14
linuxmint Hi, I'm new to git and I'm trying to connect my first connection from my computer to a new repository in github. The instructions are unclear and messed up a few tries, so I thought a real human might help? https://help.github.com/articles/create-a-repo09:16
The step 1 doesn't show what directory I should be in when mkdir Hello-World?09:17
selckin wherever you want09:17
patagonicus linuxmint: It does have a ~/ in it, so Hello-World will be created in your home directory (probably /home/$USER), but it doesn't matter. Place it where you want it.09:17
linuxmint selckin: the thing is the git setup 'git init' seems to have setup a .git folder somewhere I haven't found, so following this step1, I think I need to find where this .git file is?09:18
← dyng left09:18
patagonicus If you have called just "git init" without adding a folder name, .git will be in the folder you ran the command in.09:18
linuxmint patagonicus: okay, so it seems to be on the desktop, so now when I 'mkdir Hello-World' should I be in Desktop or Desktop/.git?09:20
← terminalRepeat left09:20
cbreak Brando753: someone created a normal branch named HEAD and pushed it09:20
Brando753 cbreak: yes, but why did that cause the master branch on CI to show the commits included in the HEAD branch?09:21
← AWinterman left09:21
cbreak there should be no HEAD branch09:21
Brando753 well of course09:21
cbreak HEAD should be a symbolic ref to the current branch09:21
Brando753 so weird problems occur if you create one?09:22
like what we just saw?09:22
cbreak it is probably used in all kinds of locations inside git, so if HEAD points to something weird, weird things happen09:22
Brando753 yea09:22
alright thanks for the help cbreak09:22
→ lifechamp joined09:22
→ PeterBooker joined09:24
← rjhunter left09:25
← danicampa9011 left09:27
→ shinnya joined09:29
→ marhaban joined09:30
→ thierryp joined09:30
→ VictorCL joined09:30
← mishok13 left09:31
← lifechamp left09:31
← marhaban left09:32
← catsup left09:34
← Milossh left09:34
→ catsup joined09:34
← thierryp left09:35
← ianmcorvidae left09:38
→ ianmcorvidae joined09:38
→ Milossh joined09:38
patagonicus linuxmint: You shouldn't really create anything inside a .git directory yourself. Create Hello-World whereever you want to keep your files, then cd into it and run git init there.09:40
← King_Hual left09:40
patagonicus Also, I'll be gone for a while, so by *not* highlighting me (and therefore asking everyone here), you'll probably get an answer quicker.09:40
← Pyrogerg left09:41
cbreak linuxmint: make a directory for your project. cd into it. git init it.09:42
done.09:42
you now have a git repository09:42
luto \o/09:43
← bwreilly left09:43
→ ereslibre joined09:44
← ereslibre left09:44
→ ereslibre joined09:44
← jenia left09:44
← rudak left09:45
→ Pyrogerg joined09:46
← Droolio left09:47
→ AWinterman joined09:47
→ Droolio joined09:47
← lolouislol left09:48
← ereslibre left09:49
→ RatSalad joined09:50
→ fairuz joined09:53
fairuz Hi guys. Is it normal that I have no errors when doing git apply --check the.patch, but when I applied it using git am < the.patch, it failed.09:54
→ TomyLobo joined09:55
← k4rtik left09:56
← echo-area left09:56
← phpwn left09:58
→ pantsman joined10:00
→ thierryp joined10:01
← AWinterman left10:01
← GT4066 left10:02
→ rednaks joined10:02
moritz fairuz: git am and git apply do different things10:03
→ Norm__ joined10:03
moritz fairuz: so it's not unreasonable that 'git am' fails, but 'git apply' succeeds10:03
fairuz moritz: hm agrees10:04
→ marhaban joined10:04
→ tirengarfio joined10:04
→ phpwn joined10:04
← bdavenport left10:05
← neobii left10:05
← thierryp left10:05
← jnavila left10:06
← RatSalad left10:06
→ bdavenport joined10:08
→ stamina joined10:09
→ thierryp joined10:13
→ atSetKey joined10:13
→ dyng joined10:14
→ neobii joined10:15
← noname001__ left10:16
→ noname001__ joined10:16
← atSetKey_ left10:17
← thierryp left10:17
→ heroux joined10:18
→ Balliad joined10:19
← dyng left10:19
→ germanstudent joined10:20
← phpwn left10:22
→ FernandoBasso joined10:23
→ ThomasLocke joined10:23
→ Misan joined10:24
← frogonwheels left10:25
→ Narven joined10:28
→ phpwn joined10:28
→ AWinterman joined10:28
← ThomasLocke left10:29
← mnathani left10:30
← VictorCL left10:30
→ mnathani joined10:31
← Narven left10:32
← glebihan left10:34
→ glebihan joined10:35
← geomyidae left10:35
→ neure joined10:36
neure hi10:36
im looging for a gui for windows10:36
tango_ !gui10:37
no?10:37
what was the thing?10:37
!ui10:37
grawity the thing is "gitinfo is down"10:37
tango_ mehah10:37
lol10:37
moritz but, WE CAN'T WORK LIKE THIS! :-)10:38
→ ereslibre joined10:41
← AWinterman left10:43
← Droolio left10:43
→ irqq_ joined10:43
← irqq left10:43
irqq_ → irqq10:43
← phpwn left10:46
→ geomyidae joined10:47
← ereslibre left10:47
← vince_prignano left10:47
→ VictorCL joined10:52
→ phpwn joined10:52
→ bandroidx joined10:53
← Boohbah left10:53
← Kabaka left10:54
← bandroidx left10:54
→ bandroidx joined10:54
→ Amandil joined10:54
→ rjhunter joined10:54
→ petey joined10:55
→ arand joined10:55
→ plasticboy joined10:55
→ Kabaka joined10:57
← petey left10:59
→ gzg joined11:01
← shinnya left11:01
← donmichelangelo left11:02
→ Boohbah joined11:02
→ donmichelangelo joined11:04
← marhaban left11:05
MrDHat|offline → MrDHat11:08
← babilen left11:08
← rednaks left11:08
→ penguin42 joined11:08
→ rednaks joined11:09
→ AWinterman joined11:10
← varlog left11:10
→ sm0ke joined11:11
← luigi69 left11:13
← arvind_khadri left11:13
→ asQuirreL joined11:14
→ DonRichie joined11:14
→ dyng joined11:15
→ Droolio joined11:15
← phpwn left11:18
← dyng left11:19
→ babilen joined11:20
← magu|m left11:21
→ magu|q joined11:23
→ phpwn joined11:24
← babilen left11:25
← AWinterman left11:25
→ babilen joined11:26
→ zarubin joined11:27
axrfnu using git 1.7.10.4 (debian wheezy) how do i remove a submoodule _completely_? i looked into .gitmodules, .git/config, .git/modules/...11:27
← Balliad left11:29
← VictorCL left11:29
arand axrfnu: In addition to those you need to remove the special versioned submodule pointer.11:30
→ atSetKey_ joined11:30
arand Hmm, gitinfo has a factoid iirc, but ey is gone...11:31
← Misan left11:31
→ atSetKe__ joined11:33
← atSetKey left11:33
→ arvind_khadri joined11:34
→ ZujkisNx joined11:35
← atSetKey_ left11:36
→ peroht joined11:36
← arand left11:36
← ZujkisNx left11:36
← rednaks left11:37
← nova_ left11:38
← atSetKe__ left11:38
→ maroloccio joined11:40
← Mode-M left11:42
← phpwn left11:42
→ reskp___ joined11:44
→ dyng joined11:45
→ jceb_ joined11:46
← reskp___ left11:46
← dyng left11:47
← reskp left11:48
→ dyng joined11:48
→ glosoli joined11:48
→ phpwn joined11:48
→ CheckDavid joined11:50
→ harobed_ joined11:50
← sm0ke left11:51
→ AWinterman joined11:51
← dyng left11:53
← Droolio left11:53
← chamunks left11:53
→ dyng joined11:58
← phpwn left11:58
← zarubin left11:59
→ threesome joined12:01
→ srji joined12:03
cmn axrfnu: git rm --cached submodule-path (without trailing slash)12:03
after that git won't consider that a submodule, you can remove the rest of the stuff, but git won't look at it12:04
→ phpwn joined12:04
dyek Hi! I am on branch1, when I perform "git pull origin branch2". Does the changes pulled down go into my local branch2? Or branch1 that I am on?12:05
cmn merges always happen into the branch you're on12:06
but you probably don't want to use that form of pull; fetch and then merge12:06
dyek cmn: Is "git pull" a merge? OK... I guess that's it. I forgot "git fetch"!12:06
cmn yes12:07
→ chamunks joined12:07
cmn rather, it calls the merge command, which may or may not perform a merge depending on the situation12:07
dyek cmn: Thanks!12:07
← AWinterman left12:07
← Amandil left12:10
← dyng left12:10
axrfnu cmn: thx!12:10
→ dyng joined12:10
← kerrick left12:11
→ kerrick joined12:12
← cagedwisdom left12:13
← fairuz left12:13
← dyng left12:15
→ pantsman- joined12:15
→ cagedwisdom joined12:15
→ DanielKarp joined12:18
← matanya_ left12:18
→ SHyx0rmZ joined12:18
← pantsman left12:19
← neure left12:22
← babilen left12:22
→ dyng joined12:22
→ Fiouz joined12:23
→ ZujkisNx joined12:23
← Nickeeh left12:24
→ Nickeeh joined12:25
← ewnd9 left12:26
→ HicksD joined12:28
→ thierryp joined12:29
← thierryp left12:29
→ Mode-M joined12:30
→ thierryp joined12:30
→ conan joined12:30
→ the_cybersphinx joined12:31
→ AWinterman joined12:33
← linuxmint left12:33
→ ereslibre joined12:34
← ereslibre left12:34
→ ereslibre joined12:34
→ Misan joined12:34
← thierryp left12:35
← noname001__ left12:35
← AWinterman left12:36
→ Sonderblade joined12:36
→ travisstaton joined12:37
→ zarubin joined12:38
→ raijin joined12:38
→ Lancien joined12:39
← ereslibre left12:39
← dyng left12:40
dyek Hmm... Why is it that "git fetch origin branch2" doesn't pull down all Commits leading to branch2? After "git fetch", my local branch2 is still out-dated compared to at origin.12:40
→ dyng joined12:40
cmn those are two different things12:41
grawity In current git versions, the four-word `git fetch` does *not* update remote-tracking branches – it only fetches into FETCH_HEAD12:41
cmn it pulls them down, but you've overriden the configuration that makes it update the remote-tracking branch12:41
grawity this was changed just in git.git12:41
if you want to update a remote, do `git fetch origin` instead12:42
also, even *that* only updates "remote-tracking" branches12:42
→ sq-one joined12:43
→ worblehat joined12:43
← harobed_ left12:44
→ sony joined12:44
← dyng left12:45
bremner or "git remote update"12:47
sony hi all, i'm doing css style for gitweb, but can't use css, i configure gitweb.cgi and set path to css style, but isn't work. Please help me =)12:47
default path "static/gitweb.css"12:48
dyek Still don't get it... "git push" appears to push a branch to the remote. Now, "git fetch" doesn't appear to be the complement of "git push". Is there a complement of "git push"? I think if I do "git checkout branch2" and then "git pull", I can update the branch to the latest, but without doing "git checkout" first, I can't seem to pull down a branch of my interest (or maybe it fetches into FETCH_HEAD, but I don't know how to use FETCH_HEAD).12:49
bremner: "git remote update" doesn't do it for me too.12:49
cmn they're not complements of each other12:49
fetch updates your repo's idea of what's in the remote12:50
if you want to merge those changes into your current branch, run merge12:50
→ francisfish joined12:51
→ xpe joined12:52
→ ewnd9 joined12:53
← DanielKarp left12:53
→ wrouesnel joined12:53
dyek cmn: Is there a way to merge into non-checkout branch? What I want is just to mirror a remote branch locally, ideally, without having to check it out.12:53
cmn that's not a merge12:54
git branch somebranch somesource12:54
same as any other; add -f if appropriate12:54
or you can add the refspec to the remote's configuration so it happens every time12:54
add fetch = refs/heads/some-branch:refs/heads/some-branch12:55
but then you have to make sure you're not on that branch when you fetch12:56
deryni And don't have any unpushed changes on it either presumably.12:57
← sniffell1 left12:57
cmn that depends on how you do things12:58
but if you do have them, then it's a flaw in your workflow12:58
rather than anything git12:58
← conan left12:59
→ Guest77984 joined12:59
deryni Having work on a branch that is intended to be a remote mirror? Sure. Doesn't mean it won't happen or that throwing away that work is a good idea.13:00
cmn this is why remote-tracking branches exist13:00
they *are* the mirror13:00
and they're not local branches, so you can't switch to them13:01
if you don't mean it to be a true mirror, then don't haveit13:01
→ doev joined13:03
← travisstaton left13:03
dyek cmn: It worked now! Thanks! When I did "git branch -f branch2 origin/branch2", nothing showed up in qgit's graph. But after I blindly did a "git merge" onto my current branch (a later step that I wanted to do), both branch2 and origin/branch2 label showed up and everything is up-to-date now. Don't understand the process, but it sure worked!13:03
deryni I'm not debating that. I'm just pointing out a potential issue with your refspec idea.13:04
← Milossh left13:04
cmn what issue?13:04
what you're pointing out is qgit failing to update its view13:04
nothing to do with git or additional refspecs13:04
deryni I'm not him.13:04
→ dyng joined13:05
cmn oh, right; sorry, it's the same colour13:05
deryni HEh.13:05
→ Milossh joined13:05
cmn the refspec was what you asked13:05
to have fetch update a local branch13:05
→ conan joined13:06
← kcj left13:06
← banisterfiend left13:06
deryni Sure. It was exactly what he wanted. You pointed out one caveat. I added another. That's all.13:06
→ shinnya joined13:08
→ marhaban joined13:10
← phpwn left13:10
← Guest77984 left13:11
← dyng left13:14
→ dyng joined13:14
→ noname001__ joined13:15
→ phpwn joined13:16
→ merlin83_ joined13:18
← merlin83_ left13:18
→ merlin83_ joined13:18
← asQuirreL left13:18
← dyng left13:18
→ banisterfiend joined13:19
→ Pr3dator joined13:20
Pr3dator hi guys13:21
does this work?13:21
→ freestyl3r joined13:22
→ asQuirreL joined13:22
← phpwn left13:26
_ikke_ Pr3dator: We can read you13:26
dyek Hi! Lets say when I did "git fetch origin" and all Commits leading to my tracking branch is pulled down. At that stage, I might not see the tracking branch label in qgit or it might still be out-dated. Is there a way for me to confirm that the latest SHA1 exists locally that mirror remote branch (without using qgit that doesn't work)?13:27
→ dyng joined13:28
Mode-M git log origin/branch?13:29
→ DanielKarp joined13:30
← merlin83_ left13:31
dyek Mode-M: That does appear to be what I need. Thank you all for your help!13:31
→ Gamecubic joined13:31
→ babilen joined13:32
→ sift joined13:32
→ phpwn joined13:32
Nevik jast:13:33
→ herdingcat joined13:33
→ tmcmahon joined13:34
→ germanoak joined13:34
← sift left13:34
→ merlin83_ joined13:35
← merlin83_ left13:35
→ merlin83_ joined13:35
← snql left13:36
→ mizu_no_oto joined13:38
← kate_r left13:39
← Fandekasp left13:39
← phpwn left13:42
→ harobed joined13:43
← harobed left13:43
→ harobed joined13:44
← bgerber left13:45
← jceb_ left13:45
→ bgerber joined13:46
← srji left13:46
← dyng left13:47
← merlin83_ left13:47
→ dyng joined13:48
→ phpwn joined13:48
← dyng left13:48
→ dyng_ joined13:48
→ liquidmetal joined13:48
liquidmetal I'm trying to create a webhook with github... any help?13:48
← cagedwisdom left13:49
liquidmetal what user/permissions should I create on my remote server?13:49
→ frgtn joined13:49
→ vince_prignano joined13:49
→ ereslibre joined13:49
_ikke_ liquidmetal: there is a #github channel13:50
liquidmetal wow13:50
_ikke_ But what do user / permissions have to do with it?13:51
liquidmetal: A webhook is just a web request that is executed on your server13:51
liquidmetal The hook is supposed to run a git pull... but it would be run from the username of the server13:52
_ikke_ yes, it would indeed13:52
liquidmetal wouldn't that mess up things?13:52
if the .git dir is owned by someone else/etc13:52
_ikke_ It might indeed13:53
→ merlin83_ joined13:53
← merlin83_ left13:53
→ merlin83_ joined13:53
← |Freeman| left13:54
← tmcmahon left13:54
← ereslibre left13:55
→ kate_r joined13:55
→ gitinfo joined13:55
ChanServ set mode: +o13:55
← vurma left13:57
← frgtn left13:57
← vince_prignano left13:57
→ frgtn joined13:57
→ srji joined13:58
← babilen left13:58
← dyng_ left13:58
→ kcj joined13:59
→ dyng joined13:59
→ vince_prignano joined13:59
← vince_prignano left14:00
→ rednaks joined14:01
← frgtn left14:01
→ aard_ joined14:01
→ babilen joined14:01
← niggler left14:03
← dyng left14:03
← merlin83_ left14:05
→ valgrind joined14:07
← Baluse left14:07
→ Baluse joined14:08
← phpwn left14:10
← conan left14:11
← valgrind left14:12
← chepre left14:15
→ phpwn joined14:16
← marhaban left14:16
← phpwn left14:18
→ LBV_User joined14:19
→ valgrind joined14:22
← xpe left14:23
← mdiers left14:23
→ phpwn joined14:24
→ xpe joined14:25
→ Sigma joined14:28
← fuzzybunny69y left14:29
→ mdiers joined14:31
→ jumperswitch joined14:32
→ vurma joined14:34
→ dyng joined14:34
→ travisstaton joined14:35
← francisfish left14:38
← phpwn left14:38
→ mfulz joined14:38
→ francisfish joined14:39
← francisfish left14:39
← rednaks left14:39
→ francisfish joined14:40
→ tmcmahon joined14:40
gitinfo set mode: +v14:40
→ delianides joined14:41
→ cmpera joined14:41
→ michas joined14:43
← Mode-M left14:44
delianides Anyone have any suggestions for aliasing this command? https://gist.github.com/delianides/696309714:44
→ phpwn joined14:44
→ InvidFlower joined14:44
← valgrind left14:45
← dyng left14:45
bremner delianides: it doesn't make sense to me pass the output of git-describe to git-log14:45
→ dyng joined14:45
← cmpera left14:45
← glosoli left14:46
← asakura left14:46
delianides bremner: the command shows all the commits from the most recent tag to head14:46
→ rednaks joined14:46
delianides so it would look like v0.9..HEAD14:46
bremner I see.14:46
delianides the command runs in terminal just fine14:46
but i'm stuck as to how it should be aliased14:47
→ ereslibre joined14:47
← ereslibre left14:47
→ ereslibre joined14:47
← francisfish left14:48
← rjhunter left14:49
→ francisfish joined14:49
← dyng left14:49
← ereslibre left14:52
→ Gamecubic_ joined14:52
← francisfish left14:53
bremner you are starting with "!" ?14:54
→ glosoli joined14:54
bremner other than that, it's common to define a shell function and then invoke it.14:55
← Gamecubic left14:56
← Kabaka left14:57
← skorgon left14:57
→ Kabaka joined14:58
→ skorgon joined14:58
wrouesnel urgh. if i mark a set of files as binary in gitattributes, how do i stop git mergetool from trying to send them to my text merge program?15:00
→ asakura joined15:00
← xpe left15:01
← peroht left15:04
← noname001__ left15:04
_ikke_ not sure if there is an option for that15:04
← phpwn left15:06
← rurufufuss left15:07
← _iron left15:07
→ mgberlin joined15:09
← tmcmahon left15:11
delianides bremner: thanks, i'm gonna have to tinker some more15:11
→ mrballcb joined15:12
→ phpwn joined15:12
← phpwn left15:14
→ dreiss joined15:15
mrballcb → cannonball15:16
← cannonball left15:16
→ cannonball joined15:16
→ rgr joined15:17
→ Quintus joined15:17
→ victorbjelkholm joined15:20
→ rurufufuss joined15:20
→ phpwn joined15:20
← DanielKarp left15:21
→ corehello joined15:22
← corehello left15:22
→ CKyle joined15:22
← cannonball left15:22
→ cannonball joined15:23
→ jnavila joined15:23
→ ambro718 joined15:24
← phpwn left15:26
→ ereslibre joined15:26
→ nicknisi joined15:28
→ jenia joined15:28
→ crazydiamond joined15:28
← mgberlin left15:29
← CKyle left15:30
← jnavila left15:30
→ jnavila joined15:31
→ Destos joined15:31
→ CKyle joined15:31
← rgr left15:31
← worblehat left15:31
→ kukks joined15:32
→ phpwn joined15:32
← phpwn left15:34
← ereslibre left15:35
← Sigma left15:36
← Pyrogerg left15:36
← mizu_no_oto left15:38
← sony left15:39
→ phpwn joined15:40
→ rath joined15:41
→ DoniRS joined15:42
→ bryce11 joined15:42
→ worblehat joined15:42
→ GT4066 joined15:45
→ yhager joined15:45
← CKyle left15:46
← phpwn left15:50
→ valgrind joined15:51
← srji left15:52
→ GODDOG joined15:52
← Quintus left15:52
→ phpwn joined15:56
→ cmpera joined15:57
→ thiago joined15:57
← bryce11 left15:58
← germanoak left15:59
← rednaks left15:59
→ k4rtik joined16:00
← yhager left16:01
← vurma left16:02
← kerrick left16:02
→ mizu_no_oto joined16:03
← pen left16:03
← asQuirreL left16:04
→ pen joined16:04
→ jumperswitch_ joined16:05
→ bryce11 joined16:05
← jumperswitch left16:05
← Gitzilla left16:06
→ marhaban joined16:06
→ asQuirreL joined16:07
→ srji joined16:08
→ bwreilly joined16:09
← banisterfiend left16:10
→ byprdct joined16:10
← byprdct left16:10
→ |Freeman| joined16:11
→ rwhitey joined16:11
← rwhitey left16:12
← dreiss left16:14
→ jnavila_ joined16:15
← jnavila left16:15
jnavila_ → jnavila16:15
→ kerrick joined16:16
→ m0ltar joined16:16
→ Sigma joined16:17
→ _nova joined16:17
← mizu_no_oto left16:18
→ banisterfiend joined16:20
→ Gitzilla joined16:20
← hendry left16:21
← asQuirreL left16:23
→ snql joined16:23
→ RatSalad joined16:23
← valgrind left16:24
← RatSalad left16:26
← nicknisi left16:26
← leprechau left16:27
→ Hetu joined16:27
← threesome left16:27
→ xpe joined16:27
→ arietis joined16:28
→ atSetKey joined16:28
← aspiers left16:28
← atSetKey left16:29
← babilen left16:29
→ leprechau joined16:30
→ nicknisi joined16:30
→ babilen joined16:31
→ asQuirreL joined16:32
← angelsl left16:33
← babilen left16:33
← srji left16:34
→ srji joined16:35
→ bitkiller joined16:36
→ Kaisyu joined16:37
→ Frank81 joined16:38
Frank81 can some one help me maybe?16:38
i run on git commit -m "inital commit" into16:38
error: pathspec '"check-in\342\200\235"' did not match16:38
where does he get this pathes from or what does that mean16:38
→ babilen joined16:39
← babilen left16:39
_ikke_ Frank81: perhaps a pre-commit hook?16:39
Frank81 what means that ?16:39
:D16:39
_ikke_ Did you setup this repo?16:39
Frank81 yes i did but i runned a little .sh in it i need the repo for publishing to elastic beans talk of amazon16:40
it modifyed some content in the .git dir of the repo16:40
_ikke_ ah ok16:40
Frank81 so there is probally a fail?16:40
← herdingcat left16:40
_ikke_ Frank81: I don't know, it depends on what that script does16:41
Frank81 i never befor runned into that stuff with git befor i use it realy as novice sometimes wanna use it more but i am not as familary with all its options16:41
ill look16:41
:D16:41
_ikke_ I suspect it has added some hooks (like a pre-commit hook in .git/hooks)16:41
That's a script that runs before the actual commit is made16:41
→ babilen joined16:42
Frank81 it did16:42
i am reading em16:42
there are some .sample files16:42
in that folder16:42
_ikke_ You can ignore those16:42
Those come automatically with git, but don16:43
don't do anything16:43
→ Xethron joined16:43
Frank81 did not match any file(s) known to git.16:44
what can that mean16:44
he has a problem with some files in that repo probally16:44
← InvidFlower left16:44
Frank81 but why can it complain about that16:44
← GT4066 left16:45
→ ereslibre joined16:45
← kerrick left16:46
→ danicampa901 joined16:46
→ str joined16:46
← marhaban left16:47
← corni left16:48
→ marhaban joined16:48
Frank81 lol i found out its a git bug :D16:49
← ereslibre left16:50
→ corni joined16:50
Frank81 sudo git commit -m “first check-in” <- produces the fail i told here about and sudo git commit -m “ss” <- Works without fails16:50
:D16:50
← dyek left16:51
Frank81 have a nice day guys :D16:51
← Frank81 left16:51
cbreak git bug?16:51
bremner he left before you could yell at him ;)16:51
cbreak I don't see a git bug.16:52
jumperswitch_ → jumperswitch16:52
iveqy I don't understand the bug16:52
cbreak probably a user error.16:52
bremner I see somebody using sudo and tuned out.16:52
iveqy I see someone typing the same command twice and reports different results16:53
cbreak sounds like user error indeed.16:53
← cmpera left16:53
→ dreiss joined16:54
→ lite_ joined16:54
← lite_ left16:56
← srji left16:56
← snql left16:56
→ lite_ joined16:56
← Sigma left16:58
← xpe left17:00
← lite_ left17:01
_ikke_ I guess the hook expects the commit message in a format where the thing after a space is a file name17:01
→ King_Hual joined17:02
← rath left17:03
← cannonball left17:03
← doev left17:03
← nicknisi left17:03
← marhaban left17:03
→ Risto joined17:04
→ kerrick joined17:05
← GODDOG left17:06
→ marhaban joined17:06
← imarcusthis- left17:06
← zacts left17:07
→ Sigma joined17:07
→ therealGent joined17:07
→ demiurgo joined17:08
→ tbmiller joined17:08
← tbmiller left17:08
→ tbmiller joined17:09
← tbmiller left17:10
→ tbmiller joined17:10
← tbmiller left17:11
→ tbmiller joined17:12
← marhaban left17:12
← Sigma left17:12
← jumperswitch left17:12
← freestyl3r left17:14
→ aspotashev joined17:15
→ sm0ke joined17:15
← tbmiller left17:16
← FernandoBasso left17:17
← aard_ left17:17
← wrouesnel left17:21
→ srji joined17:22
→ germanoak joined17:22
← germanoak left17:23
← arietis left17:25
← crazydiamond left17:26
← SHyx0rmZ left17:29
→ germanoak joined17:30
← germanoak left17:30
→ germanoak joined17:31
← germanoak left17:31
← ambro718 left17:31
→ Davey joined17:32
→ Bogdan_ joined17:33
← Pr3dator left17:34
← sm0ke left17:34
← stamina left17:35
← banisterfiend left17:36
← Kaisyu left17:37
→ Bogdan__ joined17:39
→ lucha joined17:39
← Shaladdle left17:40
→ banisterfiend joined17:41
← boz_v1 left17:42
→ ereslibre joined17:42
← ereslibre left17:42
→ ereslibre joined17:42
→ zacts joined17:43
← Bogdan_ left17:43
→ boz_v1 joined17:44
→ conan joined17:45
→ dyng joined17:46
→ Octalot joined17:47
← ereslibre left17:48
→ crazydiamond joined17:49
← dyng left17:50
→ ErKa joined17:51
← danicampa901 left17:51
→ girishr_ joined17:53
→ epicowl joined17:54
→ helpD joined17:54
→ vurma joined17:55
← dreiss left17:56
→ tbmiller joined17:56
→ dreiss joined17:57
← ZujkisNx left18:00
→ intripoon joined18:01
→ vince_prignano joined18:03
→ yhager joined18:03
← intripoon_ left18:04
→ mribeirodantas joined18:04
← nicedice left18:05
→ nicedice joined18:05
← srji left18:06
→ srji joined18:06
→ acharlieh joined18:08
← OOPMan left18:12
← srji left18:13
→ OOPMan joined18:14
→ DanielKarp joined18:16
← causasui left18:16
→ zhost joined18:18
→ covi joined18:18
covi How can I convert a fully complete git repo (full with commits that I want to retain) into a svn repo? My ultimate purpose is to keep the commit messages in the svn repo, and to distribute the svn repo.18:19
All tutorials I found online about `git svn' seems to be talking about initialize a new svn repo, then work on it in git style.18:19
cbreak covi: make an empty svn repository18:19
← yhager left18:19
cbreak then make a commit that creates trunk18:19
then git svn clone -s that repository18:20
→ maestrojed joined18:20
cbreak fetch your other repository's history, rebase it onto that git svn clone18:20
then git svn dcommit18:20
← tbmiller left18:20
cbreak you'll probably get into a lot of trouble if you have branches18:20
→ tbmiller joined18:20
covi cbreak: yes I have branches... can I specify ONE branch that I want to keep and throw away others?18:20
cbreak you'll see once you try it18:21
→ ereslibre joined18:21
cbreak rebase will flatten your hierarchy18:22
covi cbreak: also, how can I do 'fetch your other repo's history'?18:22
cbreak git remote add other path/to/other18:22
git fetch other18:22
← jaimef left18:22
→ jaimef joined18:23
covi I will give it a shot, thanks.18:23
Eugene Typically people want to go the other way in that conversion; a git history is much more self-contained and workable than a SVN one18:23
← DanielKarp left18:23
covi Eugene: unfortunately, I have to go git to svn this time.18:24
→ FernandoBasso joined18:24
→ Jacob2000 joined18:24
Eugene !beer18:24
gitinfo Beer! It's what's for dinner!18:24
← dreiss left18:24
← Risto left18:24
← tbmiller left18:25
→ Advocation joined18:25
→ hi_ joined18:25
→ tbmiller joined18:26
← ereslibre left18:26
covi Shit.18:27
http://pastebin.com/NcDh4tsD18:27
What does this mean? `git svn' not installed?18:27
← ErKa left18:27
covi git vesion is 1.7.1218:27
cbreak covi: that's ancient18:29
how about upgrading? :)18:29
looks more like svn not being installed though18:30
covi cbreak: svn is installed. i don't have freakin' root access on this machine...18:30
cbreak the perl modules for svn aren't there18:30
→ lifechamp joined18:31
→ jumperswitch joined18:32
← raijin left18:33
← str left18:37
← babilen left18:37
← Spyro left18:39
← vurma left18:39
→ Spyro joined18:41
← jenia left18:42
← k4rtik left18:44
← phpwn left18:46
_ikke_ yay. gitinfo is back18:47
!botsnack18:48
gitinfo Om nom nom18:48
hi_ that is so true ^18:48
om nom18:48
← worblehat left18:50
→ chepre joined18:50
← maestrojed left18:51
→ phpwn joined18:52
→ rudak joined18:53
← harobed left18:53
hi_ git commit -m 'Om nom nom directory created'18:53
→ PaulCapestany joined18:54
← SamB left18:55
→ petey joined18:56
← Advocation left18:56
→ otherj joined18:59
← penguin42 left18:59
← otherj left18:59
→ otherj joined18:59
→ howlymowly joined19:00
← petey left19:00
→ CKyle joined19:01
← hoschi left19:02
→ cs2s joined19:02
→ fobius joined19:03
→ maestrojed joined19:03
→ JEEB joined19:04
cs2s Hey, I'm researching for my term papers about "Subversion vs. Git" and currently looking for projects that switched from svn to git. With rails and samba I got some prominent ones, but I'd like to have some sources about why they switched that I can quote – any ideas?19:05
← LBV_User left19:06
→ snql joined19:06
→ wirapuru joined19:07
→ SamB joined19:09
← lucha left19:10
← howlymowly left19:10
← mribeirodantas left19:11
→ VictorCL joined19:11
← bwreilly left19:11
← phpwn left19:14
hi_ wow look at all the responses cs2s is getting!19:16
← ewnd9 left19:17
→ goshawk joined19:17
delianides hi_: not sure, did PHP move from SVN to Git?19:18
I think so: http://news.php.net/php.internals/5529319:18
2 years ago19:18
Hetu Google says Atlassian did: https://blogs.atlassian.com/2013/01/svn-to-git-how-atlassian-made-the-switch-without-sacrificing-active-development/19:19
← vince_prignano left19:19
→ phpwn joined19:20
← snql left19:20
→ yhager joined19:20
→ Georg3 joined19:21
← Pengoo left19:22
← Gamecubic_ left19:22
→ rednaks joined19:23
← kcj left19:23
→ pr0ton joined19:23
→ Gamecubic joined19:25
moritz cs2s: KDE, parrot virtual machine, OTRS19:26
just to name three off the top of my head19:26
oh wait no, OTRS used CVS first, sorry19:26
→ malkface joined19:26
moritz the Apache foundation also hosts both git and svn projects, and offers semi-automatic migration19:26
I know that Lucy (a search engine and an Apache project) use that to switch from svn to git, but I'm sure many more high-profile projects did too19:27
→ Pengoo joined19:29
→ jceb_ joined19:29
← yhager left19:31
← malkface left19:31
→ dreiss joined19:32
← JokerxHarley left19:33
→ Tommy[D] joined19:33
→ yhager joined19:34
← Tommy[D]_ left19:35
→ JokerxHarley joined19:35
← DoniRS left19:36
← Gamecubic left19:37
→ ereslibre joined19:37
← ereslibre left19:37
→ ereslibre joined19:37
osse cs2s: also interesting to note is how many projects mainly use svn, but also offer Git repos "on the side" (ruby, llvm, openttd). I see that as a sort of admission :P19:38
← Kabaka left19:39
← Jackneill left19:40
offby1 adding the git repository on the side is probably a lot easier than doing a proper svn-to-git conversion19:40
→ atSetKey joined19:40
← michas left19:41
→ mizu_no_oto joined19:41
osse I thought Perl switched to Git from Svn but it was from Perforce, apparently19:41
← cs2s left19:41
← ereslibre left19:41
← yhager left19:42
← Hetu left19:43
→ Kabaka joined19:44
→ cagedwisdom joined19:44
→ threesome joined19:44
→ valgrind joined19:45
→ Gamecubic joined19:46
→ rednaks_ joined19:49
← pr0ton left19:49
← maestrojed left19:50
← mizu_no_oto left19:50
← rednaks left19:51
← dreiss left19:51
← rednaks_ left19:53
← PaulCapestany left19:54
← Xethron left19:55
→ germanoak joined19:56
← antoks left19:57
→ vurma joined19:57
→ ereslibre joined19:58
← kpreid left19:58
→ raijin joined19:58
→ Xethron joined19:59
→ antoks joined20:00
← phpwn left20:02
← benizi left20:03
← vurma left20:03
← asQuirreL left20:04
← lifechamp left20:05
← tbmiller left20:05
→ benizi joined20:05
→ tbmiller joined20:05
→ germanoa_ joined20:06
← ereslibre left20:06
← banisterfiend left20:06
← germanoak left20:07
← Burer left20:08
→ nicknisi joined20:08
→ phpwn joined20:08
→ HicksD_ joined20:09
← tbmiller left20:09
← HicksD left20:09
→ kpreid joined20:10
← asedeno_ left20:12
→ ugug87 joined20:14
← boz_v1 left20:14
→ rednaks joined20:14
← ugug87 left20:15
← kpreid left20:15
← epicowl left20:15
MrDHat → MrDHat|offline20:16
→ kpreid joined20:16
→ tbmiller joined20:18
→ wagle joined20:18
→ boz_v1 joined20:19
← travisstaton left20:19
→ pencilcheck joined20:20
→ delta6 joined20:20
→ xplosivant joined20:20
← pen left20:22
← xplosivant left20:23
← Davey left20:24
→ asedeno joined20:25
→ stamina joined20:26
← conan left20:27
→ travisstaton joined20:28
→ chirayuk joined20:29
← chirayuk left20:29
→ AWinterman joined20:30
→ freestyl3r joined20:31
← pencilcheck left20:32
→ Davey joined20:32
→ mishok13 joined20:33
← a-l-e left20:33
← s0ber left20:33
← rudak left20:34
← MarkusDBX left20:34
→ rudak joined20:35
→ s0ber joined20:35
← Norm__ left20:35
→ Norm__ joined20:36
→ cs2s joined20:37
← germanoa_ left20:38
← wirapuru left20:38
cs2s hey, thanks for your answers – sorry for the delay, forgot to check back20:38
the php link is interesting20:39
→ Amandil joined20:40
cs2s I found the blog post, announcing the switch to git, but sadly there is no reason http://weblog.rubyonrails.org/2008/4/2/rails-is-moving-from-svn-to-git/20:41
ah, KDE is a good one :) http://techbase.kde.org/Projects/MovetoGit#Why.3F20:44
← jceb_ left20:46
← phpwn left20:46
→ R1KRDO joined20:48
→ atal421 joined20:49
← tbmiller left20:50
← stamina left20:50
→ tbmiller joined20:50
→ Mars`_ joined20:50
atal421 how can i tell if there will be a merge bubble if i do 'git merge branch_name' ?20:50
Hello71 what is a bubble20:50
← _nova left20:51
atal421 Hello71: 'merge buble' it's when you merge a branch and it equires a commit so your log ends up having a "merged" message whenver a merge happens (assuming you wrote "merged")20:51
Hello71 english?20:51
→ banisterfiend joined20:52
← girishr_ left20:52
atal421 Hello71: yes, i am speaking english, and it appears you do as well.20:52
→ phpwn joined20:52
skorgon i guess he means an actual merge and not just a fast forward20:52
atal421 can anyone explain how i can avoid merge bubbles without prematurly commiting to a rebase?20:52
→ Frank81 joined20:53
Frank81 hi i later added .gitignore how can i remove from git cache20:53
Eugene "merge bubbles" ?20:53
Frank81 that it tracks the now ignored folders20:53
skorgon Eugene: merge commits20:53
→ NicolasTarzia joined20:53
atal421 sorry all, merge bubbles also means merge commits, apologies20:53
→ _nova joined20:54
Eugene !merge_vs_rebase20:54
gitinfo [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html20:54
Eugene merges are not evil; they are the whole point.20:54
Without merges you may as well be using SVN20:54
atal421 Eugene: that's fine, only probablem is that i don't want to have to write a commit message when it was a clean commit20:55
i mean, clean merge20:55
Eugene So don't.20:55
skorgon Eugene: nah, rebasing etc works way better in git20:55
Eugene man git-merge; ctrl-f --no-edit20:56
gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html20:56
atal421 k20:57
→ yhager joined20:57
← Destos left20:57
← AWinterman left20:58
→ tpollard joined20:58
→ AWinterman joined20:58
atal421 perhaps i could do 'git merge --ff-only' and then depending on that response… i could do a 'git merge --rebase'20:58
← maroloccio left21:00
← raijin left21:00
→ raijin joined21:00
skorgon jsut remeber to execute those commands on different branches. you most likely dont want to rebase master when you fail to merge in a top branch as fast forward21:01
← King_Hual left21:01
Baluse hello21:03
gitinfo Baluse: 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.21:03
atal421 merging happens on remotes via pull requests, local master only pulls from origin… so a rebase of master never really happens… but then merging into local branches, that's what i'm trying to solve21:03
← AWinterman left21:03
← cs2s left21:03
Eugene man git-config; see branch.<name>.rebase21:04
gitinfo the git-config manpage is available at http://jk.gs/git-config.html21:04
← sq-one left21:04
skorgon well in that case, it'll never be a fast forward. just rebase21:04
Eugene It's a no-op if it's a ff ;-)21:05
It just FFs21:05
← longbeach left21:06
← Vinnie_win left21:06
Eugene You only really want this on unpublished stuff(IOW, per-branch locally)21:06
→ asQuirreL joined21:07
atal421 hmmm21:07
→ koda joined21:07
→ Vinnie_win joined21:07
→ oojacoboo joined21:08
→ stamina joined21:08
→ bigLanky joined21:08
← aspotashev left21:09
bigLanky hello, i currently have a git repo on github.com that a few collaborators use and submit to. What I want to do is be able to pull any updated code from that repo, but any changes that I make will be totally separate. what is the best way to do this?21:09
branch?21:09
← nicknisi left21:10
skorgon well, if all those people have write access to that repo, i guess they could mess up your branch21:10
separate repos with multiple remotes would probably be better21:11
toothr → toothrot21:11
→ Xethron_ joined21:11
← tbmiller left21:11
← Xethron left21:11
← fobius left21:12
bigLanky well, they wouldnt be touching my code21:12
→ tbmiller joined21:12
bigLanky i am using the code from the main repo as helper modules21:12
← glosoli left21:12
bigLanky and then i have my own completely separate files that I am using classes and functions from those helper modules21:12
i would be the only one modifying these separate files, while multiple people would be editing the helper modules21:13
so when a helper module is updated, i want to be able to pull21:13
← Mars`_ left21:13
bigLanky and get that updated file21:13
jan1337z → Jan21:13
bigLanky is this possible or would it need to be manual?21:13
→ Mars` joined21:13
Jan → jan1337z21:13
→ nicknisi joined21:14
← chepre left21:15
← tbmiller left21:16
→ chepre joined21:16
→ starfox21 joined21:17
→ chirayuk joined21:17
→ bklane joined21:17
→ Mars`_ joined21:18
← rudak left21:18
← Mars` left21:18
← starfox21 left21:21
← jnavila left21:22
← Kabaka left21:22
→ germanoak joined21:23
→ Kabaka joined21:23
← germanoak left21:24
← yhager left21:24
→ causasui joined21:25
← CKyle left21:25
→ germanoak joined21:26
← helpD left21:27
→ AWinterman joined21:28
← mfulz left21:29
← ngladitz left21:31
→ girishr_ joined21:31
← phpwn left21:34
← bklane left21:35
→ conan joined21:36
← trusktr left21:37
→ aard_ joined21:38
← aard_ left21:38
← aartist left21:40
→ phpwn joined21:40
← TomyLobo left21:41
→ yhager joined21:43
→ Sigma joined21:44
→ lresende joined21:45
← atal421 left21:46
← yhager left21:49
→ razieliyo joined21:50
razieliyo anyone there using git python? I have a question about it21:50
I know how to create the commit object, but then, to push stuff you just have Remote.push(), so I don't know how to associate the commit to the push21:51
milki doesnt use git python21:53
milki uses dulwich though21:53
milki razieliyo: it sounds like either it tries to push everyone or you need to give it a branch to push21:54
s/everyone/everything/21:54
razieliyo milki: hmmm dulwich21:54
yes, I got you21:54
adaptr → gohadaptr21:54
razieliyo I think that's the behaviour, yes, makes sense21:54
gohadaptr → adaptr21:54
razieliyo milki: would you tell me to take a look at dulwich? is it good?21:55
→ aspiers joined21:55
razieliyo I tried gittle, but I got a strange error, so I'm staying with git python21:55
milki i found dulwich api makes more sense to me21:55
thats all21:55
also, i dev it21:55
so im biased :P21:56
razieliyo lol hahaha21:57
→ glosoli joined21:57
→ fobius joined21:57
razieliyo well, I think I'll take a look at it21:58
also, the name reminds me to some good stuff21:58
milki: would you say it's stable?21:59
← corni left21:59
milki sure22:00
google uses it22:00
rhodecode uses it22:00
bzr-git and probably other conversion cvs tools use it22:01
er22:01
vcs22:01
>.<22:01
→ Nicholas_Rishel joined22:03
← Nicholas_Rishel left22:03
razieliyo milki: phine22:04
→ fluxdude joined22:04
← fluxdude left22:04
→ fluxdude joined22:04
razieliyo taking a look at the tuts22:04
← Xethron_ left22:04
← aspiers left22:04
← rednaks left22:05
→ Balliad joined22:05
razieliyo milki: btw, that you said is the behaviour of git python, thanks!22:06
← zacts left22:06
milki cool22:06
razieliyo never figured it out by myself, feel a bit stupid22:06
← harv left22:06
→ rednaks joined22:07
→ g0bl1n joined22:08
→ harv joined22:08
← jumperswitch left22:08
← demiurgo left22:09
→ theRealGentleman joined22:11
→ demiurgo joined22:11
→ cmpera joined22:11
→ nephyrin joined22:11
← zarubin left22:12
← rednaks left22:12
→ Xethron joined22:13
→ snuffeluffegus joined22:13
← ehmatthes left22:14
→ nova_ joined22:14
← therealGent left22:14
← Misan left22:14
← cmpera left22:16
razieliyo does the repo.do_comit() function actually make the push operation on dulwich?22:17
← Zarthus left22:17
← chirayuk left22:17
← _nova left22:17
milki no22:17
you need to use a dulwich client to push to a remote repo22:18
← glosoli left22:19
razieliyo hm, I see22:20
→ maestrojed joined22:21
← rurufufuss left22:21
← R1KRDO left22:22
→ mizu_no_oto joined22:22
← HelloShitty left22:22
razieliyo hm, can't see any client.push() function, just client.fetch() looking here http://www.samba.org/~jelmer/dulwich/apidocs/dulwich.client.GitClient.html22:23
← pantsman- left22:23
razieliyo also, the docs aren't very well explained on that part of push contents: http://www.samba.org/~jelmer/dulwich/docs/tutorial/remote.html22:24
→ EMGMatt joined22:24
milki rektide: https://github.com/jelmer/dulwich/blob/master/dulwich/tests/test_client.py22:25
er22:25
razieliyo:22:25
← PeterBooker left22:25
milki looks like its send_pack22:25
→ rednaks joined22:25
milki so theres no wrapper for a high level push yet22:25
ya...docs are on my todo list22:25
→ ehmatthes joined22:25
milki after my current feature im working on, its pep8 and docs next22:26
← bryce11 left22:26
→ petey joined22:27
← Sigma left22:29
→ DrShoggoth joined22:29
→ R1KRDO joined22:31
→ ewnd9 joined22:34
← phpwn left22:34
→ dyng joined22:36
← germanoak left22:37
← redrocket left22:37
← dyng left22:38
→ logic_prog joined22:38
→ dyng joined22:38
logic_prog I'm interestted in understanding the datastructures of git. Is there a document on how the files in /.git are stored? (I am looking for something at the level of details where, theoretically, one could implement an actual git client with it.)22:39
→ phpwn joined22:40
→ zbcm joined22:40
← dyng left22:42
← phpwn left22:42
razieliyo milki: sorry, I was afk22:43
thanks, I'll take a look at that too22:44
→ tomnewmann joined22:44
← Amandil left22:45
→ ereslibre joined22:47
← |Freeman| left22:48
→ phpwn joined22:48
← Bogdan__ left22:48
milki logic_prog: Documentation/Technical in the git repo22:50
logic_prog: https://github.com/git/git/tree/master/Documentation/technical22:50
→ tbmiller joined22:51
milki start with pack-format i suppose?22:51
← ereslibre left22:52
logic_prog milki: nice; thanks22:54
← victorbjelkholm left22:55
← rednaks left22:55
logic_prog the documentation looks pretty badass22:56
→ dreiss joined22:56
logic_prog short, concise, to the point22:56
bullet points, don't even always use complete sentences22:56
I like22:56
← goshawk left22:56
→ rednaks joined22:56
logic_prog clearly written by engineer, not englieh major22:56
offby1 generally, "written by engineer" would be considered a -bad- thing22:58
← tbmiller left22:59
→ tbmiller joined22:59
→ Joshi3s` joined23:00
← Milossh left23:01
← koda left23:02
→ tbmiller_ joined23:02
← tbmiller left23:03
← Mars`_ left23:03
← stamina left23:03
← nicknisi left23:05
← maestrojed left23:05
← Balliad left23:06
→ Milossh joined23:06
← ewnd9 left23:06
← dreiss left23:08
→ Droolio joined23:08
← zhost left23:08
→ Mars` joined23:08
← R1KRDO left23:09
← VictorCL left23:10
← Milossh left23:11
→ m0viefreak joined23:11
← looper left23:11
→ dyng joined23:11
← travisstaton left23:12
← tbmiller_ left23:13
→ tbmiller joined23:14
← dyng left23:14
→ dyng joined23:15
→ fuzzybunny69y joined23:15
→ Goplat joined23:15
← MaddHatter left23:15
→ ErKa joined23:17
milki lolol23:17
← tbmiller left23:18
→ dsdeiz joined23:18
← dyng left23:19
← logic_prog left23:22
→ dyng joined23:23
← asQuirreL left23:24
→ Fandekasp joined23:24
← Hubicorn left23:25
← milStaja left23:25
→ starfox21 joined23:27
→ ciampix1 joined23:28
← starfox21 left23:28
← dyng left23:29
→ dyng joined23:29
← dsdeiz left23:31
→ yhager joined23:31
← m0ltar left23:31
→ chrob joined23:31
← ciampix1 left23:32
← dyng left23:33
→ gdmfsob joined23:36
→ akurilin joined23:37
→ nicknisi joined23:37
← demiurgo left23:38
← yhager left23:39
← mishok13 left23:40
← delianides left23:41
← nicknisi left23:41
→ lesterc joined23:43
→ PaulCapestany joined23:44
→ dyng joined23:44
← petey left23:46
← rednaks left23:47
→ rednaks joined23:47
→ petey joined23:49
← tomnewmann left23:49
← chrob left23:50
→ Bogdan__ joined23:50
→ Sigma joined23:50
← Mars` left23:53
← petey left23:53
← threesome left23:55
→ nicknisi joined23:57
→ petey joined23:58
→ joshbetz joined23:58
→ BSaboia_ joined23:59
← BSaboia_ left23:59
→ BSaboia joined23:59

Logs Search ←Prev date Next date→ Channels Documentation