IRCloggy #git 2014-05-14

Logs Search ←Prev date Next date→ Channels Documentation

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

2014-05-14

→ cjsarette joined00:00
Oran and i can play around with it to test if git works as i suppose them to do, without to ask some to commit stuff or somethink to try it out00:00
bremner If you want the second clone to be automatically updated every time you push to the first, then you have to understand the deploy link people keep posting00:00
otherwise, it's no different than a clone on your workstation.00:00
you decide.00:00
← codeurge left00:00
Oran i want every clone to be updated everytime00:00
bremner then read the link00:01
Oran i did00:01
but iam confused00:01
→ rfoust joined00:01
Oran rith now i think i jsut got 1 branch per repo00:01
and 1 repo per "project"00:01
← Balliad left00:01
Oran (rigth now there is just 1 project00:01
bremner well, it's not a great "beginner's task" for git.00:01
there's nothing I can do to make something complicated easy, other than suggest that you maybe don't really want to do that now.00:02
→ LucasKA joined00:02
Oran but is there any other way all the workstations always get the uptodate version on its own?00:02
← JorgeRuiz left00:03
bremner not really. it amounts to the same thing00:03
← bwreilly left00:04
bremner maybe git is not what you are looking for, if keeping things in lockstep is your main goal.00:04
Oran so can u point out what i need to do please00:04
i guess the figthclub option seem to be what i need00:04
← imachuchu left00:06
→ heedly joined00:07
heedly How do I manage remote branches properly?00:07
← Blaster left00:07
heedly It seems like no combination of push or pull keeps them in sync on different computers.00:07
← martinklepsch left00:09
→ espringe joined00:10
ToxicFrog heedly: how do you mean?00:10
heedly ToxicFrog: I do push origin local_branch00:10
then I make some changes, commit, and push again.00:10
ToxicFrog push and fetch/pull are both pretty simple, so if you're undirectedly experimenting with them in the hopes that something will happen the way you want, you probably have an understanding gap00:10
Ok, sounds good so far00:11
← godgodgodgo left00:11
heedly Then I pull on another computer and get the first push00:11
← vanillajohn left00:11
→ johnkevinmbasco joined00:11
→ rchavik joined00:11
→ Lemony joined00:13
→ Reskp joined00:13
ToxicFrog heedly: you're sure you're pulling from the same origin? You're sure the second push succeeded?00:14
← bluesm left00:14
heedly would a basic git pull, be sufficient?00:15
ToxicFrog I would expect it to either be sufficient, or tell you why it isn't.00:15
It should not silently fail or give you the "wrong" branch head.00:15
→ vanillajohn joined00:15
ToxicFrog So double check that all your pushes are working and that you are using the right remotes and branches.00:15
← dannymichel left00:16
← dik_dak left00:16
heedly ok, a basic git pull, doesn't work00:16
I need to specify origin and branch00:16
→ hellopat joined00:17
ToxicFrog heedly: as in 'git pull origin master'00:17
Hang on there's a faq for that, it may not do what you think it does00:17
!pull400:17
gitinfo [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).00:17
→ codeFiend joined00:18
← Reskp left00:18
ToxicFrog 'git pull origin master' will update FETCH_HEAD and your local master branch but not origin/master00:18
→ johnkevi_ joined00:19
→ gargola_ joined00:20
→ Blaster joined00:21
← Blaster left00:21
→ Blaster joined00:21
← hellopat left00:21
→ SilverBln joined00:21
→ jason237 joined00:21
← SilverBln left00:21
← johnkevinmbasco left00:22
Vampire0 Oran, you can't do what you want if you want to do what you said00:22
Oran o.O ?00:22
could u explan this to me please?00:23
→ fragamus joined00:23
Vampire0 You can't automatically keep the local clones of all your mates automatically updated if something gets pushed to the remote repo00:23
← fragamus left00:23
Vampire0 besides setting up some background service on all the mates machines that does check for updates00:23
Oran is there a way how i can do this ?00:25
Vampire0 Well, with a serious amount of fiddling you could get somewhere beneath this, with hooks in the remote repo that connect to all local repos, pushing the just-pushed changes into them and then some hooks in those repos that does some other magic00:25
Hello71 a simpler way to put it would have been "that won't do what you want".00:25
Vampire0 But this is definitely not a beginnners task, not even an advanced task00:25
→ ianmcorvidae joined00:25
Vampire0 And it will for sure break as it sound very fragile00:25
Oran so any way to get the job done?00:26
Vampire0 and is completely reverting the concepts Git or and DCVS builds on00:26
Oran perhaps ide funktions which always fetch00:26
Vampire0 You can also set up a hook in the local repos that does a fetch on each commit or something like that00:27
But it is all not really optimal and not really what Git is built for00:27
Maybe you are actually searching for another tool00:27
← zzing left00:27
Oran i thoug the fancy stuff of git is thats decentrale00:28
btw what about ides ? doesnt they got anythink like auto fetch ?00:28
← kukks left00:29
Vampire0 That's the point Oran, it is decentral00:30
But you want to centrally push out new changes to the satellites, this is non-decentral00:30
I don't know, I didn't see any that does00:30
Because it is not how you work with git00:30
I guess00:30
Good UGT night00:31
← cjsarette left00:32
→ lyang0 joined00:33
nightcracker by the way, I asked yesterday about having a subrepo as a subdirectory in a parent repo, and you guys answered with subtrees and it works perfectly, thanks00:33
the syntax could be a bit sugared, but other than that it does exactly what I want00:33
← pbrobst left00:34
→ LuxuryMode joined00:35
→ cjsarette joined00:35
→ pbrobst joined00:35
← cjsarette left00:36
→ kcj joined00:36
← LuxuryMode left00:37
→ ErKa joined00:37
→ luc_ joined00:37
Oran so what the plan Vampire0 just always use fetch and be happy with this?00:37
← akushner left00:38
← jhuntley left00:39
← astrofog left00:40
← Nae|Air left00:40
← luc_ left00:41
→ cjsarette joined00:41
← EminenceHC left00:41
← cjsarette left00:41
← beyondcreed left00:41
← Maadison left00:41
→ EminenceHC joined00:42
→ SilverBln joined00:42
← aspiers left00:42
← Skrypter left00:43
← latenite left00:43
→ laserbeam joined00:44
← vanillajohn left00:44
→ jftf joined00:45
→ hellopat joined00:45
← EminenceHC left00:46
→ cjsarette joined00:46
→ debajit joined00:48
← cjsarette left00:48
← laserbeam left00:48
Primer A full migration of svn to git using "git svn ..." is taking over a day to finish. I'm wondering if I can just do the official migrate, then have people continue to commit to svn, then pick up the difference when we're ready to make the move?00:49
← kenneth left00:50
← jftf left00:51
markmarkmark Oran: it is up to the clients to keep their local repositories in sync00:51
→ cjsarette joined00:52
→ maglnet joined00:54
← ascarter left00:55
→ thiago joined00:55
← DolphinDream left00:55
← pheaver left00:57
← jhulten left00:57
← moritzs left00:58
← moritzschaefer left00:58
← kcj left00:58
← fenerlitk left00:59
← boombatower left00:59
← whitby left00:59
← LucasKA left01:00
→ ivan\ joined01:01
→ moritzschaefer joined01:01
← espringe left01:01
→ Goplat joined01:01
← hyperair left01:02
→ espringe joined01:03
→ delight joined01:05
→ JorgeRuiz joined01:05
← JorgeRuiz left01:05
← moritzschaefer left01:05
← shinnya left01:05
→ JorgeRuiz joined01:05
← JorgeRuiz left01:05
← debajit left01:06
→ moritzs joined01:06
→ JorgeRuiz joined01:06
← JorgeRuiz left01:06
→ JorgeRuiz joined01:07
← JorgeRuiz left01:07
→ JorgeRuiz joined01:07
← JorgeRuiz left01:07
→ JorgeRuiz joined01:08
← JorgeRuiz left01:08
← JosephFerano left01:08
→ ilyam joined01:08
→ JorgeRuiz joined01:09
← JorgeRuiz left01:09
→ quazimodo joined01:09
→ JorgeRuiz joined01:09
← JorgeRuiz left01:09
→ Devastatr joined01:10
→ JorgeRuiz joined01:10
← JorgeRuiz left01:10
→ timmymarion joined01:10
→ codeurge joined01:10
→ JorgeRuiz joined01:10
← JorgeRuiz left01:11
→ nicksloan joined01:11
→ diegoviola joined01:11
→ JorgeRuiz joined01:11
← JorgeRuiz left01:11
← ilyam left01:11
← the_hugme left01:12
→ ilyam joined01:12
→ Vampire0_ joined01:13
→ DolphinDream joined01:13
← codeurge left01:13
→ Reskp joined01:14
← happytux left01:15
← delight left01:16
← espringe left01:16
← Vampire0 left01:16
→ daito joined01:17
← codeFiend left01:17
→ tokik joined01:17
← Reskp left01:18
→ Diemuzi joined01:19
gitinfo set mode: +v01:19
← Blaster left01:20
→ robustus joined01:21
→ reaverb joined01:21
← timmymarion left01:21
→ Skrypter joined01:21
→ espringe joined01:22
← pbrobst left01:22
← jxf left01:22
→ pbrobst joined01:25
→ woollyams joined01:25
← tpollard left01:26
← Lemony left01:27
← Diemuzi left01:28
→ otter768 joined01:29
← Oran left01:29
← woollyams left01:30
→ mizu_no_oto joined01:30
← dreiss left01:32
→ Blaster joined01:32
← Blaster left01:32
→ Blaster joined01:32
← aartist left01:32
← cjsarette left01:33
← espringe left01:33
→ mjsmith2 joined01:34
→ k_sze[work] joined01:35
→ Entomo joined01:35
→ hgl joined01:35
→ cjsarette joined01:37
← Blaster left01:37
→ watabou joined01:38
→ ojacobson joined01:38
← ojacobson left01:38
→ tpollard joined01:38
→ mdub joined01:38
→ ojacobson joined01:39
→ mmoretti joined01:40
← recycle left01:40
← cjsarette left01:40
← awc737_ left01:40
→ GT4066 joined01:41
→ awc737 joined01:41
← Celm left01:42
← DolphinDream left01:43
→ danecando joined01:43
→ pwnz0r joined01:43
→ jhuntley joined01:43
→ cjsarette joined01:44
→ DolphinDream joined01:44
← cjsarette left01:44
→ cjsarette joined01:44
← cjsarette left01:44
→ Mitchbones joined01:44
→ laserbeam joined01:45
→ Pigeon_ joined01:46
→ jftf joined01:46
← Devastatr left01:46
→ Devastatr joined01:46
Devastatr → Devastator01:46
→ cjsarette joined01:47
← cjsarette left01:47
← mmoretti left01:47
gitinfo set mode: +v01:47
Pigeon_ hello01:47
gitinfo Pigeon_: 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.01:47
→ Gooder joined01:48
← rchavik left01:48
→ jxf joined01:48
→ rchavik joined01:49
← laserbeam left01:49
Pigeon_ I am searching for help: I got a git repository on a server which is accessible over ssh with but with a custom port 1337, on my linux os with eclipse i was fine afte rchanging the port in the /etc/ssh/ssh_config, but my friend is on windows and uses eclipse with the egit plugin, How can he change to a custom ssh port?01:50
← awc737 left01:50
→ Blaster joined01:50
← jftf left01:50
← adamm left01:51
→ moparsthbest joined01:51
Pigeon_ I am searching for help: I got a git repository on a server which is accessible over ssh but with a custom ssh port, 1337, on my linux os with eclipse i was fine after changing the port in the /etc/ssh/ssh_config, But my friend is on windows and uses eclipse with the egit plugin, How can he change to a custom ssh port?01:51
← moparisthebest left01:51
→ adamm joined01:52
Pigeon_ I am searching for help: I got a git repository on a server which is accessible over ssh but with a custom ssh port, 1337, on my linux os with eclipse i was fine after changing the port in the /etc/ssh/ssh_config, But my friend is on windows and uses eclipse with the egit plugin, How can he change to a custom ssh port?01:52
← DolphinDream left01:52
Pigeon_ someone here?01:52
I am searching for help: I got a git repository on a server which is accessible over ssh but with a custom ssh port, 1337, on my linux os with eclipse i was fine after changing the port in the /etc/ssh/ssh_config, But my friend is on windows and uses eclipse with the egit plugin, How can he change to a custom ssh port?01:54
→ megawac joined01:54
Mitchbones jesus dude01:54
Pigeon_ yep?01:54
call me pigeon... :D01:54
Mitchbones I can't help you with your problem, but flooding the channel won't get you an answer any faster :\01:55
→ digital-shokunin joined01:55
Pigeon_ are you willing to help me? so thanks in advance...01:55
mattcen Asking a question more than once in a row isn't productive01:55
Pigeon_ ok01:55
→ dsdeiz_ joined01:55
Pigeon_ i am sorry01:55
mattcen In fact, it's really annoying. We're not glued to this channel 24/701:55
Pigeon_ got it, so when do you suggest me to push this question again?01:55
mattcen That sounds like a question for the egit devs or, at a pinch, eclipse01:56
In general though...01:56
← dsdeiz left01:56
mattcen If it supports standard git URLs it should look something like this:01:56
Pigeon_ egit uses msysgit portable, which github site got me here... https://github.com/msysgit/msysgit/wiki/GetHelp01:56
diegoviola i have a 'foo' branch and i have some specific commits i'd like to merge from my master branch in my foo branch, how do i pick those commits for merging into the foo branch?01:56
← lucastt left01:57
mattcen ssh://git.example.net:1337/path/to/git/repo01:57
Pigeon_: ^^01:57
Pigeon_: As is clearly explained in the !git-clone manpage01:58
Pigeon_ tried this^^01:58
also found this answer on stackoverflow..01:58
mattcen Well why don't you tell us everything you tried so we don't have to go looking up stuff you've already found?01:58
mattcen has a day job, and, believe it or not, doesn't get paid to sit in #git01:58
← moritzs left01:59
→ xcesariox joined02:00
Pigeon_ is sorry for bothering him and asks himself if this channel actually is for support purposes?02:00
skorgon diegoviola: git cherry-pick <commit>02:00
← kriks left02:01
← pbrobst left02:01
← otter768 left02:01
→ cjsarette joined02:02
Pigeon_ what i have tried: the ssh:// uri with the port, searching all the directories for config like files at the mysisgit portable included in eclipse (none ssh port config found)02:02
← cjsarette left02:02
Pigeon_ isnt it pretty common to change the ssh port to a custom one? i cant get why it is that complicated to set this thing up on windows...02:03
← mjsmith2 left02:04
→ happytux joined02:05
sreich because development tends to be overcomplicated on windows02:05
SamB Pigeon_: I think it'd be most common to have an extra port (in case you had to deal with moronic firewall operators that decided to blacklist port 22)02:05
diegoviola skorgon: thanks02:05
→ armyriad joined02:05
→ cjsarette joined02:06
Pigeon_ now, i pref dev on debian, but his frined... :D and because it was me to want a custom port (because of some great firewall...) i am allowed to figure out how (and right now im close to asking if) it may work on windows...02:07
→ hyperair joined02:07
SamB Pigeon_: which ssh client is it using?02:07
→ Droolio joined02:08
Pigeon_ i think theres one in the mysisgit folder, i dont know which and found no config file02:08
← SilverBln left02:09
→ jrvs joined02:09
← amikiri left02:10
→ richwest joined02:10
→ amikiri joined02:10
← akim left02:12
→ akim joined02:12
SamB Pigeon_: well is it plink.exe or ssh.exe ?02:12
Pigeon_ ssh02:12
← Blaster left02:13
Pigeon_ ssh.exe02:14
SamB your ssh_config(5) manpage should be able to tell you how to fix it, if you can figure out where ~ is ...02:14
→ Reskp joined02:14
← jrvs left02:15
→ sdwrage joined02:15
→ Celm joined02:15
→ mjsmith2 joined02:16
Pigeon_ well02:16
→ espringe joined02:16
← RyPeck left02:16
→ RyPeck joined02:16
RyPeck How could someone new to git "accidentally" create a commit without a parent? Without using the --orphan option for checkout.02:17
→ codeFiend joined02:17
→ razrunelord joined02:17
← xcesariox left02:19
← Reskp left02:19
← Celm left02:19
→ zajn joined02:21
← razrunelord left02:22
← codeFiend left02:22
Pigeon_ there is also a git-bash.bat in the folder and when i cd ~ i come to my02:22
users dir02:22
→ jrvs joined02:23
Pigeon_ i try now to make a .ssh dir and the config file in there, thanks for help so far...02:23
← jrvs left02:23
→ Blaster joined02:25
← Blaster left02:25
→ Blaster joined02:25
→ lb1a joined02:26
← ianmcorvidae left02:27
→ otter768 joined02:28
← Cheaterman left02:28
→ kenneth joined02:31
→ DolphinDream joined02:31
← Ethix left02:31
→ ianmcorvidae joined02:32
← Noldorin left02:33
→ ianmcorvidae|alt joined02:35
← ianmcorvidae left02:35
→ zzing joined02:35
← Pigeon_ left02:36
→ mike5w3c joined02:36
→ bgerber joined02:37
→ agorecki joined02:38
→ jonanin joined02:39
← mizu_no_oto left02:39
→ Gooder` joined02:41
← kburdett left02:42
→ BlooAlien joined02:42
→ mizu_no_oto joined02:42
← Tuna-Fish left02:42
← Gooder left02:42
→ the_hugme joined02:42
→ kburdett joined02:43
← espringe left02:43
→ EminenceHC joined02:45
→ laserbeam joined02:45
→ Tuna-Fish joined02:46
← Skrypter left02:46
→ jftf joined02:47
→ kukks joined02:48
← Kitty- left02:48
← the_hugme left02:48
→ zoso joined02:49
← EminenceHC left02:49
← laserbeam left02:50
← kukks left02:51
← jftf left02:51
← CheckDavid left02:52
← mellernoia left02:52
→ codeFiend joined02:52
→ bambams__ joined02:52
bambams__ → bambams02:52
← zivester left02:55
→ awc737 joined02:56
← sreich left02:57
← thiago left02:58
→ rnsanchez joined02:59
← kburdett left02:59
→ bwreilly joined03:00
→ kburdett joined03:00
← ifdm_ left03:00
← bwreilly left03:00
→ recycle joined03:00
← zoso left03:00
→ thiago joined03:01
← cjsarette left03:05
← momomomomo left03:06
→ johnny2600 joined03:07
→ Celm joined03:07
← zzing left03:08
← awc737 left03:09
→ treehug88 joined03:09
← pwnz0r left03:10
← amikiri left03:10
ianmcorvidae|alt → ianmcorvidae03:11
→ cjsarette joined03:11
← cjsarette left03:11
← ezio left03:13
→ quazimod1 joined03:14
→ zumba_ad_ joined03:15
→ Reskp joined03:15
→ zumba_a__ joined03:16
← zumba_ad_ left03:16
← koell left03:16
← mizu_no_oto left03:16
→ cjsarette joined03:17
← cjsarette left03:17
→ ezio joined03:17
← zumba_addict left03:18
← johnkevi_ left03:20
← Reskp left03:20
→ cjsarette joined03:20
← cjsarette left03:20
← yhager left03:20
→ cjsarette joined03:24
← daito left03:24
← Segfault_ left03:25
← St_Marx left03:25
← Exio4 left03:25
← asakura left03:25
→ yhager joined03:26
→ dreiss joined03:26
→ ifdm_ joined03:26
→ Skrypter joined03:28
→ Junior joined03:29
← thiago left03:35
← Celm left03:35
→ Sleepy63 joined03:36
→ Segfault_ joined03:36
→ Exio4 joined03:36
→ thiago joined03:36
→ yacks joined03:37
→ Sample joined03:38
← Sample left03:38
→ Sample joined03:38
→ fobelx joined03:40
→ Celm joined03:40
fobelx i want to get a list of files that differ between two branches. how?03:40
→ pheaver joined03:41
→ asakura joined03:42
→ liuzhoou joined03:43
mike5w3c so I have a ref "refs/remotes/origin/pr/991" and I have in my git config [branch "pr/991"] remote = origin merge = refs/heads/pr/991 (with newlines in there of course). But when I'm on the pr/991 branch I I do a git pull, git says "Your configuration specifies to merge with the ref 'pr/991' from the remote, but no such ref was fetched."03:43
fobelx: git diff foo..bar03:43
right?03:43
← tummy left03:43
mike5w3c fobelx: though I guess that gives you the full diff, not just the files that differ. You could filter that output easily enough. pipe03:44
← johnny2600 left03:45
← jonanin left03:45
→ tummy joined03:45
→ Cheaterman joined03:45
→ beautifulmind joined03:45
← mdub left03:45
← recycle left03:46
→ EminenceHC joined03:46
← ErKa left03:46
→ laserbeam joined03:46
mike5w3c fobelx: git diff branch1..branch2 | grep "diff --git" | cut -c14-03:46
→ recycle joined03:46
mike5w3c for something quick and dirty03:46
→ skorgon joined03:47
→ ErKa joined03:47
→ jftf joined03:48
→ laserbea_ joined03:48
← otter768 left03:48
← beautifulmind left03:48
→ ariscop joined03:50
← EminenceHC left03:50
← laserbeam left03:50
← nb_bez_ left03:51
← jftf left03:52
← laserbea_ left03:52
fobelx okay thank you03:53
→ beautifulmind joined03:54
← mjsmith2 left03:54
→ laserbeam joined03:54
← ErKa left03:54
← armyriad left03:55
← laserbeam left03:55
← agorecki left03:56
← hyperair left03:57
fobelx and i have another query.03:57
how do i increase context of diff?03:58
→ aspiers joined03:58
→ fatalhalt joined03:58
mike5w3c fobelx: -C4 or so03:59
where "4" is the number of more lines of context you want03:59
← recycle left03:59
mike5w3c assuming that git's diff supports the -C switch03:59
→ recycle joined04:00
mike5w3c ah maybe it doesn't04:00
← JerryT left04:01
fobelx i found a -U switch that works. thank you mike5w3c04:01
mike5w3c fobelx: ah -U4 I guess04:01
yeah04:01
fobelx hehe yes i just found it :)04:01
mike5w3c cheers04:01
← recycle left04:02
→ recycle joined04:03
→ Tommy[D]_ joined04:03
→ daito joined04:04
← aretecode left04:04
→ woollyams joined04:04
→ acharlieh joined04:05
→ aretecode joined04:06
→ fatalhalt_ joined04:09
← aretecode left04:09
← acharlieh left04:09
→ robzilla joined04:11
← yhager left04:12
→ codeurge joined04:12
← fatalhalt left04:12
→ yhager joined04:13
→ JerryT joined04:13
← JerryT left04:14
→ Reskp joined04:16
← Sample left04:16
← daito left04:16
→ sdwrage_ joined04:16
→ agrajag42 joined04:16
→ St_Marx joined04:16
→ astrofog joined04:17
← nnyk_ left04:17
← recycle left04:18
← codeurge left04:18
← sdwrage left04:18
→ recycle joined04:18
→ nnyk_ joined04:18
← nnyk_ left04:18
→ nnyk_ joined04:18
← dreiss left04:19
→ razrunelord joined04:19
→ acharlieh joined04:20
← Reskp left04:21
← CKyle left04:22
← razrunelord left04:24
→ fatalhalt joined04:26
← nkouevda left04:26
→ nkouevda joined04:27
← fatalhalt_ left04:28
← cjsarette left04:30
→ EveBird joined04:31
← nkouevda left04:31
→ JerryT joined04:31
← kermit left04:34
→ codeman joined04:35
→ kermit joined04:35
→ e^0 joined04:35
← Arkaniad left04:36
→ cjsarette joined04:38
→ mennea joined04:38
← RyPeck left04:39
← cjsarette left04:40
→ Sample joined04:41
← knownasilya left04:42
→ Bombe joined04:43
← scarabx left04:43
→ kalimist joined04:43
← kalimist left04:43
← recycle left04:43
→ recycle joined04:44
→ kalimist joined04:45
← robzilla left04:45
← hellopat left04:45
→ awc737 joined04:47
← Tuna-Fish left04:47
→ jonanin joined04:48
→ jftf joined04:49
→ maveneagle joined04:49
→ EminenceHC joined04:50
→ nhayashi joined04:51
→ Tuna-Fish joined04:51
→ kcj_ joined04:51
← jftf left04:53
← pheaver left04:54
← yhager left04:54
← EminenceHC left04:55
← k_sze[work] left04:55
→ hyperair joined04:56
→ xcesariox joined04:56
← danecando left04:57
← liuzhoou left04:58
→ Lyqyd_ joined04:58
← JerryT left04:59
→ hoschi joined04:59
← awc737 left05:00
← Zengod2 left05:00
← Lyqyd left05:01
→ JerryT joined05:01
← JerryT left05:02
→ zumba_addict joined05:02
← fatalhalt left05:03
→ dccc joined05:03
→ daito joined05:04
← megawac left05:05
→ sinkensabe joined05:05
← zumba_a__ left05:05
← Skrypter left05:07
→ LucasKA joined05:07
← akim left05:09
→ armyriad joined05:10
← Junior left05:11
→ kulkarp joined05:12
→ pantsman joined05:13
← pantsman left05:13
→ pantsman joined05:13
→ Raging_Hog joined05:15
→ Anatidaephobia joined05:16
← recycle left05:16
← Cheaterman left05:16
→ Reskp joined05:17
→ recycle joined05:17
→ MagePsycho joined05:17
← mennea left05:17
→ mennea joined05:17
→ zumba_ad_ joined05:18
→ awc737 joined05:19
→ ErKa joined05:19
→ JerryT joined05:19
← zumba_addict left05:20
→ zumba_addict joined05:21
← FreezingCold left05:21
← Reskp left05:21
← Sample left05:22
← daito left05:22
→ marthinal joined05:23
→ daito joined05:23
← zumba_ad_ left05:23
→ eaj joined05:26
← daito left05:27
→ FreezingCold joined05:28
← acharlieh left05:28
→ tokkee joined05:28
← awc737 left05:30
→ luc_ joined05:30
→ luc__ joined05:31
→ yhager joined05:31
← codeman left05:31
← astrofog left05:32
← Lyqyd_ left05:33
← Entomo left05:34
← luc_ left05:34
← jonanin left05:37
← gargola_ left05:39
→ Junior joined05:39
→ gargola joined05:40
← nnyk_ left05:40
→ hellopat joined05:40
← JerryT left05:41
← mennea left05:42
← pantsman left05:43
→ lite joined05:43
← codeFiend left05:43
← diegoviola left05:43
→ k_sze[work] joined05:44
→ dobalina joined05:44
← recycle left05:44
← hellopat left05:45
→ recycle joined05:45
← tpollard left05:45
→ diegoviola joined05:45
→ ThomasLocke joined05:46
→ pwnz0r joined05:46
← kulkarp left05:46
→ jftf joined05:49
→ sanjayu joined05:50
← pwnz0r left05:52
→ Sample joined05:53
← jftf left05:54
→ a-l-e joined05:54
→ bwreilly joined05:54
← ezio left05:54
← kcj_ left05:54
→ albel727 joined05:55
→ kcj joined05:55
← recycle left05:55
← Junior left05:55
← Mitchbones left05:55
→ EminenceHC joined05:56
→ jonanin joined05:56
→ dfinly joined05:56
← dfinly left05:56
→ dfinly joined05:57
→ msm joined05:58
→ mishok13 joined05:58
← Gamecubic left05:59
→ Junior joined06:00
← EminenceHC left06:00
→ FilipNortic joined06:01
→ teran joined06:02
→ codeFiend joined06:03
→ kulkarp joined06:03
→ papegaaij joined06:04
← ErKa left06:04
→ ezekielnoob6 joined06:05
→ nfk joined06:05
→ freimatz joined06:05
→ twb joined06:06
→ Macaveli joined06:06
→ jceb joined06:06
← starkhalo left06:07
twb When I'm on a branch and I want the branch to look like some other commit, I can "git reset --hard abcdefg".06:07
← woollyams left06:07
← sinkensabe left06:07
twb When I'm on commit abdefgh, how do I do the same thing for branch "foo" ?06:07
plan B is to do "git checkout foo" then "git reset --hard abcdefg" but there's probably a one-step way06:07
→ sinkensabe joined06:07
→ Gooder`` joined06:07
← ezekielnoob5 left06:08
j416 twb: git-symbolic-ref iirc06:08
← Gooder` left06:08
j416 but it's not something you'd normally use06:09
→ Yomi joined06:09
twb I'm doing Bad Things rebasing topic branches06:10
j416 git-update-ref, sorry06:11
← sinkensabe left06:11
→ nkouevda joined06:12
→ daito joined06:13
→ cvanball joined06:14
osse twb: git config alias.resetbr '!f() { head=$(git rev-parse HEAD); git checkout "$1"; git reset "$head"; }; f'06:14
there, now it's one step06:15
ooops, forgot the hard06:15
→ Skrypter joined06:15
← codeFiend left06:16
j416 if you have so many branches that you are saving a lot of time by that shorthand, perhaps you have a strange workflow06:16
← armyriad left06:16
twb thanks06:16
j416 twb: ^06:16
osse on second thought, that alias shouldf probably use symbolic-ref under the hood06:17
twb j416: yeah it is a dumb workflow. I have a handful of branches I keep pushing to the top of master so the graph is pretty and it looks like I never made any mistakes06:17
→ armyriad joined06:17
→ Flowinho joined06:17
← jonanin left06:17
Flowinho → Flowinho|away06:17
→ roelmonnens joined06:19
→ _FvG joined06:19
osse twb: why is 'git checkout abcdefg' part of that work?06:20
twb oh well I was doing "git rebase --onto master orig/master topic"06:20
And that was fine, but then some topics branched off before orig/master06:20
So then I did "git rebase --onto master 23ab123 topic", but that isn't updating the local branch to point to the end result.06:21
→ maqr joined06:21
→ Manny joined06:22
j416 twb: it should06:23
twb Oh, it does that *if* I'm already on the topic branch06:23
Since I was specifying all three points I wasn't bothering to checkout topic first06:24
← joelm left06:24
← zajn left06:24
twb Nope, I'm wrong.06:24
→ sinkensabe joined06:24
→ jagob joined06:25
twb Oh well whatever, I'm nearly done06:25
← fobelx left06:25
→ FunkyAss joined06:25
j416 :)06:26
get those merged already06:26
← Rastus_Vernon left06:26
→ Hardcheese joined06:26
j416 twb: another reason that your workflow sucks is that rebase recreates commits on top of something new06:27
meaning, there's a good chance you may get errors introduced06:27
twb nod06:27
j416 so you _should_ check each branch out anyway, to test that it works as expecged06:27
expected*06:28
← treehug88 left06:28
twb I can't easily test it because it's a repo of a script that builds an OS rootfs, so testing it would involve not only building it, but booting it in the special network it expects to run in.06:28
If this was a C program I'd being doing "make test" out the wazoo tho06:29
→ ferreum joined06:30
← quazimod1 left06:30
→ Gizburdt joined06:30
j416 tests are not all06:30
← quazimodo left06:30
j416 tests don't and shouldn't cover every inch of your code06:30
← teran left06:31
← maveneagle left06:32
twb Not sure what you mean then.06:32
← agrajag42 left06:33
j416 if you test every inch of your code, it will make it much safer. But the downside is changing it costs a lot.06:33
← Sample left06:34
j416 I have a friend who works at a company where they test their stuff to the extreme, so even a very small change takes a very long time to do.06:34
in any case06:34
← thiago left06:34
→ teran joined06:34
→ nikita joined06:35
→ Zathrus joined06:35
j416 what I'm getting at is, your tests probably don't cover _all_ cases anyway, so you probably want to manually check that your code still looks sane06:35
→ thiago joined06:35
← GT4066 left06:36
← FreezingCold left06:36
← mishok13 left06:36
twb oh just eyeballing it06:37
yeah I do that06:37
→ SunilJoshi joined06:37
→ toomanysecrets joined06:37
→ zapotek6 joined06:37
← zapotek6 left06:37
j416 :)06:38
point was, it's often easier to do that when you have the branch checked out06:38
→ ayaz joined06:39
teran → teran[p]06:39
teran[p] → teran06:40
→ Slarv joined06:40
← thiago left06:40
→ _Vi joined06:41
→ PeterBooker joined06:41
→ mennea joined06:41
← bwreilly left06:42
→ robbyoconnor joined06:42
→ Sample joined06:42
gitinfo set mode: +v06:43
→ bluesm joined06:43
Slarv If I have a git repo established at ./myproject/../somecode/, what happens to it if I run git init at ./myproject/? Does this break anything?06:44
← Manny left06:44
→ Entomo joined06:44
j416 Slarv: it'll ignore your other repo iirc06:45
Slarv: but, really, don't nest repos06:45
← MagePsycho left06:45
Slarv what would be a better solution to nesting repos when ./myproject/../somecode/ is a self contained module already in version control?06:48
→ jnavila_ joined06:49
osse Slarv: git submodule06:49
or start maintaining them as one06:49
→ rob_w joined06:49
dfinly Unless the dependency is updated frequently... Then it becomes a bit of a chore06:50
→ jftf joined06:50
dfinly in which case, hope your project has a built in dependency management system :)06:50
← Gizburdt left06:50
osse you can now track a submodule's branch instead of single commits. that helps.06:51
→ Xethron joined06:51
dfinly I didn't know that. It's been ~6months since I last dealt with one. Thats exciting06:52
→ LeMike joined06:52
dfinly actually, thats really exciting. the single commit was a real drag06:52
osse it's been infinity since I did :O06:52
well, 13.7 billion years or whatever it is06:52
→ msm` joined06:52
dfinly Better at keeping up than me, that is for sure.06:53
Slarv the context is a CMS that has one or more themes installed. The themes are kept in their own repos and are updated more often than the CMS itself.06:53
dfinly Submodules is the way to go for that then06:53
→ hkon__ joined06:53
osse themes, eh. To be honest I'd experiment with not tracking them at all. In the CMS make a .gitignore that ignores themes/06:54
dfinly Do you use git to deploy?06:54
← msm left06:54
← jftf left06:55
Slarv Don't use git to deploy at this stage but would like to set it up that way.06:55
← dobalina left06:57
dfinly Submodules might be good for that over untracked themes, otherwise they could end up in a weird undefined state06:57
← jceb left06:57
← kulkarp left06:58
osse I'm not a web dev, but are themes so dependent on the CMS (or vice versa) that it's useful keep them "in sync"?06:58
→ ciampix joined06:59
→ Gizburdt joined06:59
→ johnkevinmbasco joined06:59
dfinly No, but i've seen some shitty themes break components outside their realm before06:59
and knowing when the change was would help07:00
→ EminenceHC joined07:00
→ snql joined07:00
← Raging_Hog left07:00
dfinly but if he wants to deploy with git, submodules make it a onestep process, vs fetching other external resources07:00
→ woollyams joined07:00
← kalimist left07:00
← ifdm_ left07:01
→ m0nkmaster joined07:02
→ cjsarette joined07:02
← gargola left07:02
← EveBird left07:03
→ bvi joined07:03
← bvi left07:03
← il left07:03
→ xificurC joined07:03
← SunilJoshi left07:03
→ SunilJoshi joined07:03
→ Jeremy_Nodasys joined07:04
→ ngladitz joined07:04
← cjsarette left07:04
→ MagePsycho joined07:04
dfinly Plus, when you have a marketer freaking out because the buttons are in the wrong place, it's always good to have a way to tell wtf they are talking about.07:04
→ jargon joined07:04
← EminenceHC left07:04
← hgl left07:05
osse I see your point(s)07:06
→ cjsarette joined07:07
→ alorence joined07:07
→ Gonzo89 joined07:07
→ rishabh_ joined07:08
← ThomasLocke left07:08
← Gizburdt left07:10
← jagob left07:11
← teran left07:11
→ MouseTheLuckyDog joined07:12
→ endiruna joined07:12
→ teran joined07:12
→ mishok13 joined07:12
→ bailon joined07:13
← Gonzo89 left07:13
→ martinklepsch joined07:13
→ TomyWork joined07:14
MouseTheLuckyDog I have a project that I'm making modifications to. I thought the project was going to be easy, but it turns out harder then I thought. I would like to work on it oin a seperate branch. How can I create a branch that begins at the last commit without losing the changes that I have made to files.07:14
→ Ardenzi joined07:14
→ HelperW joined07:14
→ blackmesa joined07:15
Slarv Thanks for your help dfinly, osse, j416.07:15
→ hebz0rl joined07:15
_ikke_ What do you mean with the last commit?07:15
nkouevda MouseTheLuckyDog: git checkout -b branchname07:15
_ikke_ MouseTheLuckyDog: ^07:15
→ jceb joined07:16
MouseTheLuckyDog nkouevda, won't that overwrite any changes, and cause me to lose anything staged?07:17
Jupelius I have a github repo for one of my projects but right now I'm the only one working on it and I have a lot of wip commits I don't want to push all the time07:17
_ikke_ MouseTheLuckyDog: nope07:17
Jupelius And I have to computers at home which I frequently use07:17
→ Gavrisimo joined07:17
_ikke_ MouseTheLuckyDog: It will only create a new branch based on the current commit and check it out07:17
Jupelius Can I easily pull commits between these two machines without the need to push the commits to github?07:17
→ ifdm_ joined07:17
_ikke_ the working tree won't be touched07:17
→ harobed joined07:18
← harobed left07:18
_ikke_ Jupelius: If you can use ssh it,s quite easy to do07:18
Jupelius My desktop machine has sshd running07:18
→ harobed joined07:19
_ikke_ well, both should ideally07:19
MouseTheLuckyDog _ikke_, git commit -m "latest commit"; edit file1; git add file1; edit file2; edit file3 ; now branch based at the last commit.07:19
→ MafooUK joined07:19
→ Kicer86 joined07:19
_ikke_ MouseTheLuckyDog: then what nkouevda said07:19
→ Lemony joined07:20
Jupelius _ikke_: well, the other machine is a laptop and rarely have the need to push things to that one07:20
← endiruna left07:20
MouseTheLuckyDog _ikke_, it kind of seems to me that when I check it out the checked out files will overwrite any changes I made?07:20
nkouevda MouseTheLuckyDog: assuming you're making a new branch, checkout -b will create it at HEAD and switch you onto it, without affecting the working tree07:20
if you try to checkout an existing branch with uncommitted changes, git will yell at you07:21
→ Gizburdt joined07:21
_ikke_ Jupelius: In this workflow, it's best to only pull, not push07:21
So the machine you want to pull from should have sshd07:21
→ razrunelord joined07:22
← Slarv left07:22
_ikke_ Jupelius: Pushing is possible, but only to non-checked out branches07:22
Jupelius So I would push and then merge the branch?07:23
→ gua_ould joined07:24
← Sample left07:24
_ikke_ Do you know what remote-trackin branches are?07:24
→ _W_ joined07:24
Jupelius Not really07:25
← albel727 left07:25
→ anry joined07:25
_ikke_ origin/master is an example of one07:25
← razrunelord left07:26
→ jagob joined07:27
_ikke_ You basically push to a branch prefixed with a name: git push desktop master:refs/remotes/laptop//master07:27
on your desktop, you can then merge laptop/master for example07:27
← cvanball left07:28
→ hellopat joined07:28
← hebz0rl left07:29
← snql left07:29
→ teran_ joined07:29
→ albel727 joined07:30
← eaj left07:30
→ ThomasLocke joined07:30
→ hebz0rl joined07:30
_ikke_ That way you keep your local branches and things you push seperate, avoiding problems07:30
→ eaj joined07:30
← blackmesa left07:32
→ cvanball joined07:32
← teran left07:32
HelperW For some reason there are some ZIP files in my GIT prpoject07:33
am I allowed to remove them?07:33
There are +10 like: /.git/objects/f6/41f0f73fd1cf6d1cecf8f079c74434e73a7f16 [56.26MB]07:33
Jupelius Well, it's your project07:33
HelperW Can I just remove them without problems/conflicts?07:33
← hellopat left07:33
_ikke_ You cannot just remove those blobs07:33
You can remove them in your project, and commit it07:33
But that won't remove those blobs07:34
HelperW hmm the thing is those are back-up files generated by the system but I got them arlready stored somewhere else.07:34
And I don't need them in my GIT repo07:34
← eaj left07:34
→ eaj joined07:35
_ikke_ You have to rewrite history to get those eliminated07:35
→ elbeardmorez joined07:35
HelperW hmmm07:35
nkouevda HelperW: if past commits relevant to those files were exclusive to those files, you can rebase and drop them, then prune the blobs07:35
→ intellix joined07:36
nkouevda otherwise the process would be much more involved07:36
_ikke_ filter-branch does the job07:37
HelperW That sound all so new to me :p07:37
→ ghostlines joined07:37
← cjsarette left07:38
→ konadr joined07:38
← konadr left07:38
→ konadr joined07:38
→ zapotek6 joined07:38
← daito left07:38
→ xai_beha joined07:39
→ lavong joined07:39
← eaj left07:39
← beautifulmind left07:39
→ dreiss joined07:40
→ cjsarette joined07:41
→ joki joined07:41
xai_beha i’m managing a visual studio project on mac (much faster and the VS is in a VM anyway); however i have constant line ending conversion issues. what’s the recommended settings for “keeping everything windows” but still running the git on mac? unsetting autocrlf on the project and setting eol=crlf didn’t seem to do it.07:41
→ matteo joined07:41
→ CodePulsar joined07:42
← cjsarette left07:42
→ aworkerbee joined07:43
aworkerbee hi. how to set git ignore to everything except for *.pl or other files ?07:44
dfinly Is the working directory on HFS drive or the NTFS?07:44
xai_beha hfs. parallels share in the vm.07:44
→ Exancillatus joined07:44
dfinly Yeah, your screwed07:44
I tried that07:44
nkouevda xai_beha: i have no experience with that but maybe http://stackoverflow.com/q/2825428/ (which points to http://stackoverflow.com/q/170961/ )07:44
dfinly I'm in VS2010 now :)07:44
← roelmonnens left07:45
→ roelmonnens joined07:45
xai_beha dfinly: have a hard time believing that contents of regular files have much dependency on the fs the repo is on07:45
dfinly Its not the contents07:45
I found that VS acts strangely when working from a network drive07:46
you should be able to get the line endings work07:46
ing07:46
But until I moved it over to the VM i had issues. It could just be me.07:47
→ user258467 joined07:47
xai_beha never had a problem with vs on its own; just unwanted conversion happening in git07:47
dfinly So git is converting from crlf to newlines?07:48
xai_beha need the files on the mac because that’s where the backups are. basic yak shave limiting not to have a fourth kind of backups.07:48
dfinly: yeah, partially07:48
→ cjsarette joined07:48
_ikke_ xai_beha: !crlf07:48
gitinfo xai_beha: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/07:48
← Goplat left07:48
xai_beha nkouevda: thx, but that’s the usual stuff (turn off autocrlf, possibly do eol=crlf). that got me mixed results.07:48
→ Sonderblade joined07:48
← Sonderblade left07:49
nkouevda xai_beha: i meant the .gitattributes bit07:49
← Celm left07:49
dfinly did you set core.eol = crlf07:49
xai_beha _ikke_: ?07:49
→ Sonderblade joined07:49
← jxf left07:50
_ikke_ xai_beha: check the link gitinfo gave07:50
← sdwrage_ left07:50
← ifdm_ left07:50
→ jftf joined07:51
jast eol=crlf is pointless, and the article doesn't recommend that at all07:51
xai_beha gitinfo: huh, so .gitattributes is the way to go. hoped to find one/a few settings, not a pattern list to be maintained with every new .extension07:52
jast gitinfo is a bot07:52
xai_beha jast: well, now i feel smarter07:52
thx07:53
→ shingshang joined07:53
jast well, the thing is that you don't want binary files to go through line ending conversion07:53
you *can* tell git to go with its best guess for all file extensions07:53
but if it gets it wrong your binary files get hosed :) that's not a risk I'm willing to take, myself07:53
dfinly the other option would to be using git FROM the windows VM, but leave the repo on the OSX machine07:53
xai_beha jast: core.safecrlf should take care of that, though07:54
jast in most cases, yes... but not all07:54
xai_beha dfinly: my experience, msysgit a *lot* slower than git on any unix, even osx07:54
jast if a binary file contains both 0x0d 0x0a and lone 0x0a sequences, safecrlf will prevent corruption07:54
dfinly Absolutely it is07:54
jast otherwise it won't07:54
xai_beha since i’m using magit, which generally invokes git for every keystroke, that’s a pain07:54
dfinly ah, yeah that would be burdensome07:55
← xcesariox left07:55
xai_beha jast: assuming, everyone has the same platform & git settings where stuff actually gets used (as opposed to backed up & stored) there *is* no corruption07:55
which is iffy, i know, but unless there’s visual studio for unix soon in this case it’s a good bet07:55
→ Balliad joined07:56
← jftf left07:56
← m0nkmaster left07:56
xai_beha i guess i’ll go with safecrlf for safety and the gitattributes for .cs files, which is by far most of the files; the rest i can take care of when it comes up. thx again.07:56
dfinly Hope it works07:57
← cvanball left07:57
→ tvw joined07:58
user258467 Hi, I pushed a new branch in a the wrong repo it is not a not problem because the branch doesn't exists before so no overwrite but now the repo is dirty how do I remove in the repo as it didn't exist? does git branch -d <branch> in the repo dir is enough?07:58
← xai_beha left07:58
→ watermel0n joined07:58
→ oodavid joined07:58
→ eaj joined07:59
→ Raging_Hog joined08:00
← tvw left08:02
→ shruggar joined08:03
→ cvanball joined08:03
→ daito joined08:03
→ maveneagle joined08:03
← maveneagle left08:03
← eaj left08:04
← jnavila_ left08:04
→ ws2k3 joined08:04
→ jnavila_ joined08:04
→ EminenceHC joined08:05
← kburdett left08:05
← konadr left08:05
→ vurma joined08:05
← githogori left08:06
← dreiss left08:07
→ ifdm_ joined08:07
moritz user258467: git push --delete <remote> <branchname>08:08
→ m0nkmaster joined08:08
→ eaj joined08:08
← EminenceHC left08:09
→ konadr joined08:10
→ kburdett joined08:10
→ Kayra joined08:10
→ ArSn joined08:11
← mike5w3c left08:12
→ _tpavel joined08:13
← Xethron left08:14
user258467 moritz, thanks08:14
nkouevda user258467: or git push <remote> :<branchname>08:16
→ eletuchy_ joined08:17
← Exancillatus left08:17
davve__ or just. git push :branch // right?08:17
→ cvanball_ joined08:17
← Hardcheese left08:18
← Lemony left08:18
→ Hardcheese joined08:18
← Gizburdt left08:19
← sinkensabe left08:19
c0rnel in 'git diff commitfoo commitbar', which is the "new" commit, which can be created by applying the resulting patch??08:19
j416 davve__: need the remote name afaicr08:19
← toomanysecrets left08:19
→ sinkensabe joined08:20
j416 c0rnel: not sure I understand your question, please clarify08:20
nkouevda davve__: $ git push :master -> fatal: You are pushing to remote ':master', which is not the upstream...08:20
c0rnel i want to create a patch, using the difference between two commits08:20
j416 c0rnel: your command will produce the diff of the changes between commitfoo and commitbar, i.e. the patch that makes commitfoo into commitbar08:20
c0rnel than i want to use this diff and aplly it as a patch08:20
← cvanball left08:20
← eletuchy left08:20
j416 c0rnel: but, git format-patch08:20
c0rnel: that'll include author info and that as well, and the patch can be applied using 'git am'08:21
very handy08:21
c0rnel j416, is this available in git 1.7?08:21
j416 yes08:21
← Skrypter left08:21
c0rnel j416, thank you very much08:21
← eletuchy_ left08:21
j416 bows 15°08:21
c0rnel :)08:21
j416 !next08:21
gitinfo Another satisfied customer. NEXT!08:21
→ razrunelord joined08:22
j416 c0rnel: fwiw, you can also use 'git apply' to apply something created by 'git diff'08:23
c0rnel: but 'git format-patch' + 'git am' keeps the author info so it's nicer if both sides are using git08:23
→ mikecmpbll joined08:23
→ githogori joined08:24
→ kulkarp joined08:24
c0rnel thank you, j41608:24
j416 c0rnel: as for compatibility between 'git diff' and regular 'patch', I'm not sure. Git has some extra things, iirc.08:24
c0rnel i'm applying the patch outside of git :(08:24
j416 c0rnel: binary diffs for instance, not sure patch supports those, does it?08:24
ah08:24
← sinkensabe left08:24
→ WormDrink joined08:25
→ plitzenberger joined08:25
← m0nkmaster left08:26
→ dipendra joined08:26
→ dipendra12 joined08:26
← razrunelord left08:27
→ GT4066 joined08:27
→ canton7-mac joined08:27
← Hardcheese left08:29
← GT4066 left08:29
→ Hardcheese joined08:29
← kcj left08:30
→ tango_ joined08:30
→ Xethron joined08:32
← Xethron left08:32
→ Xethron joined08:32
← Kayra left08:32
→ Gizburdt joined08:33
← aworkerbee left08:34
→ johnkevi_ joined08:34
j416 c0rnel: I'm not sure how that can be achieved08:34
← _W_ left08:34
j416 c0rnel: please do report if you find it08:34
→ welly joined08:35
→ allay joined08:35
c0rnel j416, git diff foo bar > patchfile, then patch -p1 < patchfile08:36
j416 yes, I suspect that'd work in most cases08:36
→ sinkensabe joined08:36
→ johnkev__ joined08:36
j416 c0rnel: what if you have a binary file though?08:36
c0rnel hopes will never face this problem :)08:37
← johnkevinmbasco left08:37
j416 format-patch ftw08:37
→ kcj joined08:37
c0rnel i noted that08:37
→ Sicp joined08:37
→ kirin` joined08:37
← Hardcheese left08:37
← polyzen left08:37
← yhager left08:38
← SunilJoshi left08:39
← johnkevi_ left08:40
← sinkensabe left08:41
→ sinkensa_ joined08:41
→ bezet joined08:41
→ toomanysecrets joined08:43
→ jooools joined08:45
← johnkev__ left08:47
← gua_ould left08:47
→ eletuchy joined08:48
→ m0nkmaster joined08:48
→ Celm joined08:50
→ datafly joined08:51
← eletuchy left08:51
→ eletuchy joined08:51
← eletuchy left08:51
→ eletuchy joined08:51
→ jftf joined08:52
← woollyams left08:52
← reaverb left08:52
→ _Harm_B_ joined08:53
← m0nkmaster left08:53
← toomanysecrets left08:53
← Celm left08:54
→ maveneagle joined08:54
→ goTAN joined08:56
← jftf left08:56
← mishok13 left08:57
→ Workinho joined08:57
→ mulinux joined08:57
mulinux hi08:58
→ mishok13 joined08:58
← cvanball_ left09:02
→ h0bbit joined09:03
← hkon__ left09:03
→ InFierno joined09:04
→ snql joined09:04
InFierno Anyone have any ideas why 1 particular user has really slow Push/pull speeds on our git repo?09:04
← jnavila_ left09:04
Vampire0_ → Vampire009:07
Vampire0 InFierno, maybe you should investigate where the time is spent. Maybe over the wire? Maybe his connection sucks?09:07
→ EminenceHC joined09:07
→ wagle joined09:07
← kulkarp left09:07
Vampire0 Broken network cable e. g., or VPN, or too bad WLAN reception09:07
→ zacts joined09:08
→ ubilli8 joined09:08
mulinux hello, can you help me:09:08
InFierno he gets 800Kb/sec over ftp to the same server and 1MBsec to a google code SVN, just git he is stuck at max 300kbsec09:08
mulinux error: refs/heads/master does not point to a valid object!09:08
fatal: failed to read object faaa509ff527076e00b48de007ea69b28f7858d6: Permission denied09:08
error: unpack failed: unpack-objects abnormal exit09:08
git reflog master09:08
4bf0037 master@{0}: branch: Created from refs/remotes/origin/master09:08
ubilli8 please i want to learn everying thing about git is that possible... how to use it what it is and github09:08
→ Korvin joined09:09
Korvin → Guest6107809:09
Vampire0 mulinux, As the error says "Permission denied" I'd guess you have a permissions problem. Check that your user has appropriate file system rights09:10
← tokik left09:10
Vampire0 Hm, no idea InFierno then, sorry09:10
ubilli8, !book09:11
gitinfo ubilli8: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable09:11
lb1a Vampire0, up so early again? :D09:11
→ SLY1986 joined09:11
← goTAN left09:12
← maveneagle left09:12
← EminenceHC left09:12
Vampire0 lb1a, since 4 hours, yes09:13
Need to work :-(09:13
→ blackmesa joined09:13
ubilli8 but gues you can help from here just buy comments please i want to learn to use this stuff but i dont have the time for books..09:13
→ drean joined09:13
Vampire0 Lotto didn't work out yet09:13
→ Zariel joined09:13
j416 ubilli8: if you don't have time, that's impossible I'm afraid09:14
ubilli8: !book09:14
gitinfo ubilli8: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable09:14
j416 that'll get you going way faster than asking random questions here09:14
ubilli8 well cool... just the book way i guess...09:15
InFierno There is also the other way09:15
run your own git server09:15
and go nuts09:15
tobiasvl ubilli8: if you have specific questions, feel free to ask them here. but if you don't have the time to read a book to learn git, we don't have the time to teach you everything about git09:16
j416 well said09:16
← ferreum left09:16
j416 there should be a !rtfb for that09:16
:P09:16
InFierno But guys I want to have a git related brain-transfer or knowledge09:16
← ilyam left09:16
← LucasKA left09:16
→ hellopat joined09:17
→ rath joined09:17
ubilli8 ok... thanks09:17
moritz sucks out his brain, and serializes it for IRC transfer09:18
← Internet13 left09:18
← mulinux left09:18
→ hgl joined09:18
InFierno Vampire0, No worries - Ive tried everything i can think of from out of date openSSL/openSSH (gettign him to reinstall) to using Plink Based auth and even tunneling09:18
→ hexagoxel joined09:19
→ Hounddog joined09:19
→ cvanball joined09:19
← hgl left09:19
→ xcesariox joined09:19
← xcesariox left09:19
→ hgl joined09:19
lb1a ssh -i nsa-backdoor.key brain@moritz09:20
← hexagoxel left09:20
← martinklepsch left09:20
← diegoviola left09:21
→ Internet13 joined09:21
← hellopat left09:21
→ hexagoxel joined09:22
← hoschi left09:23
→ hoschi joined09:23
→ razrunelord joined09:23
← blackmesa left09:23
Vampire0 initiates mitm between lb1a and moritz09:24
moritz -> afk09:25
← Sonderblade left09:25
→ nnyk_ joined09:25
→ Sonderblade joined09:26
→ adac joined09:27
← razrunelord left09:27
→ Fandekasp joined09:27
→ ferreum joined09:29
→ latenite joined09:31
→ xcesariox joined09:32
→ Kayra joined09:33
→ snql|bad_interne joined09:34
→ jnavila_ joined09:36
← hgl left09:37
← snql left09:37
→ hkon__ joined09:38
← e^0 left09:38
→ bu5hm4n joined09:39
bu5hm4n hi, I did git add -p added a few files, now I realiezed I made a misstake, what can I do now ?09:40
→ wrouesnel1 joined09:40
bu5hm4n to get this not hunged09:40
Vampire0 hunged?09:41
tobiasvl bu5hm4n: just ctrl+c ?09:41
it's asking you for input09:41
so just kill it09:41
← watabou left09:41
bu5hm4n tobiasvl: I did that but this it is still known as commit :/09:41
tobiasvl known as commit?09:41
Vampire0 Did you commit already?09:42
Or just git add?09:42
bu5hm4n no, just git add -p09:42
→ hgl joined09:42
Vampire0 Do you want to revert everything and start over, or just revert some hunks?09:42
for all git reset for just som e hunks git reset -p09:42
bu5hm4n awesome thx !09:43
→ zoso joined09:43
→ toomanysecrets joined09:43
bu5hm4n this interactive feature is new for me toooo much to handle :o09:43
Vampire0 you'll get it :-)09:43
Btw., did you know this channel records !karma? ;-)09:44
gitinfo This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them. Try ".karma <nick>" or ".topkarma", but please do it via private message to avoid mass highlighting people.09:44
gitinfo set mode: +v09:44
bu5hm4n Vampire0: thx :p09:45
:)09:45
Vampire0 :-)09:45
It seems you lost your nose :-D09:45
← kburdett left09:48
bu5hm4n Vampire0: wait, I found it :~)09:48
InFierno !karma isabitch09:50
gitinfo This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them. Try ".karma <nick>" or ".topkarma", but please do it via private message to avoid mass highlighting people.09:50
→ kburdett joined09:50
Vampire0 good for you bu5hm4n :-)09:51
→ jftf joined09:52
xender How to grep whole repo for change that introduced specific string (not whole line!)?09:53
→ pwnz0r joined09:53
xender s/change/commit/09:54
canton7 xender, man git log -S and friends09:54
gitinfo xender: the git-log manpage is available at http://jk.gs/git-log.html09:54
Vampire0 Hm, in gitk you can just use the GUI to do it, not sure about the command09:54
→ soc42 joined09:55
Vampire0 ah, git log -S it is, I have to remember that09:55
xender Vampire0: Wow, that gitk search is nice09:56
Vampire0 Though it is only of limited use when a code block was moved as it would not trigger if the doku is right09:56
git log -S I mean, dunno about gitk, could suffer from the same09:56
xender Does gitk have some keybindings to use in test fields?09:56
What is doku?09:57
bremner ,u09:57
← jftf left09:57
bremner !u09:57
bremner curses lazy bots.09:57
Vampire0 Ah, git log -G is for that case, nice09:57
← hkon__ left09:57
← pwnz0r left09:58
Vampire0 xender, keybindings in test fields?09:59
→ blackmesa joined09:59
Vampire0 and doku is man git log09:59
gitinfo the git-log manpage is available at http://jk.gs/git-log.html09:59
Vampire0 The gitk key bindings you can see in "Help -> Key Bindings"10:00
← eaj left10:02
→ eaj joined10:03
→ stamina joined10:03
Vampire0 bremner, did you expect that trigger to do?10:03
bremner Vampire0: say something useless but funny about how only silly people shorten you to u10:04
Vampire0: I sometimes confuse this channel with #emacs because offby1 is in both.10:04
xender Vampire0: I mean basic text-editing keys in search field etc.10:04
→ martinklepsch joined10:04
→ maveneagle joined10:04
← maveneagle left10:05
xender Like "← to move a character backwards"10:05
Tk ;_;10:05
And Vim or Emacs keybingd doesn't seem to work either10:05
Should i Just install qgit?10:05
→ SilverBln joined10:07
← eaj left10:07
Vampire0 !cake10:09
gitinfo [!botsnack] Om nom nom10:09
← supernaut left10:09
Vampire0 Still not sure what you mean xender. If I am in the text field besides the dropdown, I can move the caret with the arrow keys. That is what you asked for, isn't it?10:09
→ mlechner joined10:10
xender Vampire0: I can't move it o_O10:10
Arrow keys just do nothing10:10
→ nepochal joined10:10
← nepochal left10:10
← sinkensa_ left10:10
→ sinkensabe joined10:11
→ hkon__ joined10:11
← ubilli8 left10:11
← armyriad left10:11
→ armyriad joined10:12
→ supernaut joined10:13
← hgl left10:13
← nnyk_ left10:13
← Fandekasp left10:14
Vampire0 strange xender10:14
xender qgit is meh10:14
Vampire0 It always worked fro me on linux and on windows with git on cygwin10:14
dunno about msysgit10:14
← Gizburdt left10:15
xender Hmm10:15
Any other alternatives to gitk?10:15
← sinkensabe left10:15
→ eaj joined10:15
xender Qgit requeires you to click on "diff" every time you select another commit ;_;10:15
→ moritzs joined10:16
xender It just show log by default. Because remembering on which tab user was previously would be too hard10:16
→ moritzschaefer joined10:16
→ rnsanchez_ joined10:17
Vampire0 I guess there are many GUI tools out there10:18
beginning with !tig as ncurses commandline alternative to gitk10:18
gitinfo https://git.wiki.kernel.org/index.php/Tig - An ncurses (terminal) alternative to gitk.10:18
← maqr left10:18
Vampire0 over gitk which is shipped with git10:18
← twb left10:18
← Tuna-Fish left10:18
→ nafg joined10:19
← rnsanchez left10:19
Vampire0 up to tools that are tightly integrated into the windows explorer like TortoiseGit10:19
I actually use command line most of the times and just start gitk if I want to see a nicer overview or want to search for commits containing a string. But with knowing git log -S and git log -G now, the last point may be void.10:20
→ beautifulmind joined10:21
← beautifulmind left10:21
→ amcsi_work joined10:22
→ Tuna-Fish joined10:22
← rnsanchez_ left10:23
→ Vampire0_ joined10:23
← Vampire0_ left10:23
→ Vampire0_ joined10:23
← Vampire0_ left10:23
xender Just tried gitg10:24
Complete fail ;_;10:24
← moritzs left10:24
→ fr33 joined10:24
← kyb3r_ left10:24
xender Font is just too lanrge and... What did the author do to make it incompatible with tiling WMs?10:24
← moritzschaefer left10:24
xender But it has nice syntax coloring of files in tree view10:25
Industrial xender: great. theres about 50 pages of google listing git clients, and a wiki page etc.10:25
← plitzenberger left10:25
→ tvw joined10:25
xender Industrial: Welp, trying out 50 clients doesn't sound exciting10:26
→ treehug88 joined10:26
Industrial so pick one and go, or use the terminal :)10:26
xender What to say of 50 pages of clients10:26
→ King_Hual joined10:26
masscrx hi, when I make git rm --cached file, do I have to commit ?10:26
because I see in git status Changes to be committed: deleted: config/deploy.rb10:26
Vampire0 If you want to commit it, you need to commit it, yes10:27
git rm --cached just removes the file from the index, leaving the working copy alone10:27
← intellix left10:27
Industrial xender: I like SmartGit10:28
xender "Price: $79/user / Free for non-commercial use "10:28
Meh]10:28
masscrx yeah, but when I try to make cherry-pick for move one commit to another branch I have error: error: Your local changes would be overwritten by cherry-pick.10:28
so I dont understand something here10:28
→ beautifulmind joined10:28
tobiasvl masscrx: you have an uncommited, local change. that change is that you have deleted config/deploy.rb10:29
masscrx: if you want it to be removed from the repo, commit the deletion.10:29
→ intellix joined10:29
xender masscrx: I think repo must be clean before cherry-pivking10:29
So no unstaged nor staged changes10:29
masscrx tobiasvl: I dont want to delete this file from repo, I dont want to track them only10:30
tobiasvl masscrx: what do you mean by that?10:30
xender untrack == delete from repo10:30
masscrx ah ok10:30
xender You may also mean assume-unchanged10:30
Vampire0 assumee-unchanged is shit, don't ever use it, it will just make problems10:30
If you don't want a file tracked, remove it from the repo10:31
masscrx and then commit, ok10:31
Vampire0 If you need some starting point for others to use and customise, checkin a file.ext.sample file e. g.10:31
tobiasvl masscrx: the file was tracked in your repo. if you want to stop tracking it, that's the same as deleting it from the repo. if you want to achieve something else than that, explain your use case to us and we can suggest alternatives10:31
Vampire0 Before you commit it is not removed masscrx10:31
← Jeremy_Nodasys left10:32
tobiasvl masscrx: rm --cached means that you delete it from the repo but you keep the local file, btw. not sure if that's what you want10:32
Vampire0 It is only "sheduled for removal"10:32
tobiasvl but it might10:32
← SilverBln left10:32
masscrx tobiasvl: I understand now that untrack == delete, I tought that you mean delete as delete physically from the disk10:32
→ hgl joined10:32
Vampire0 that's what he did tobiasvl , he just didn't know he has to commit it10:32
xender tobiasvl: not from repo, from index.10:32
And also we all mean "HEAD" by "repo"10:33
Vampire0 indeed10:33
tobiasvl hehe, yes10:33
xender If he would want to delete it from whole repo, he would need to filder-branch or rebase.10:33
← hgl left10:33
xender But i doubt he wants it10:33
masscrx no no, I want to have local file because those are file for capistrano10:34
→ hgl joined10:34
→ rnsanchez_ joined10:34
xender masscrx: Ok, so you need to git rm --cached and commit that10:34
← hgl left10:35
← freimatz left10:35
→ plitzenberger joined10:36
→ hgl joined10:36
← hgl left10:37
→ frobrob joined10:38
→ vtunka joined10:38
← zoso left10:39
→ tokik joined10:39
← blackmesa left10:39
→ hgl joined10:40
← k_sze[work] left10:40
← hgl left10:41
← MagePsycho left10:41
→ hgl joined10:41
→ nepochal joined10:42
→ DarkLinkXXXX joined10:43
← DarkLinkXXXX left10:43
→ DarkLinkXXXX joined10:43
← teran_ left10:43
→ teran_ joined10:44
→ maqr joined10:44
← teran_ left10:44
→ teran_ joined10:45
→ Gizburdt joined10:45
← dsdeiz_ left10:45
→ freimatz joined10:46
teran_ → teran10:47
← intellix left10:48
← harobed left10:48
→ k-joseph joined10:50
← datafly left10:50
← ariscop left10:50
← maqr left10:52
→ Ringod2 joined10:53
← Gizburdt left10:53
→ Gizburdt joined10:53
→ jftf joined10:53
→ amikiri joined10:55
→ the_hugme joined10:56
masscrx ok i see that git rm --cached file - removes file physically from the repo10:56
so this is not what I want ;]10:57
← paulweb515 left10:57
← Entomo left10:57
→ sinkensabe joined10:57
Vampire0 masscrx, as multiple times said, what you want is NOT possible10:57
Either the file is tracked or not10:58
moritz !config10:58
gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas10:58
Vampire0 You cannot have it tracked but ignore local changes10:58
← jftf left10:58
← heedly left10:58
moritz I typically ship a myapp.config.example in git, and keep a myapp.config that's not tracked by git10:58
← amcsi_work left10:58
→ psoo joined10:58
→ mellernoia joined10:58
Vampire0 And yes, !config. Basically what I told you before with .sample instead of .example10:59
gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas10:59
→ amcsi_work joined10:59
masscrx ok Vampire0 so after I;ve made git clone some repo, how to disable for tracking changes in some file ?10:59
ok I'll read this link10:59
← Sicp left10:59
← amikiri left11:00
→ amikiri joined11:00
Vampire0 You CANNOT11:00
← SLY1986 left11:00
jast well there's sparse checkout11:00
Vampire0 You can tell git to ignore a file that is NOT tracked11:01
jast which kind of comes close11:01
← stamina left11:01
Vampire0 But you cannot ignore changes to a tracked file11:01
→ RofricTheBearded joined11:01
← kcj left11:01
masscrx Vampire0: files which are not tracked are in .gitignore right ?11:02
→ teran_ joined11:02
masscrx maybe I'm misunderstanding word "tracked file"11:03
← Ziber left11:03
osse masscrx: a tracked file is one that git keeps track of11:03
← c74d left11:03
osse masscrx: it has a log, it has changed in commits, etc.11:03
→ Ziber joined11:03
→ mewm joined11:04
masscrx ok11:04
→ hellopat joined11:05
← veebers left11:05
Vampire0 well, actually a file can be changed in commits and still be untracked11:05
→ astrofog joined11:05
← teran left11:05
Vampire0 if you deleted the file11:05
a file is tracked if it is part of the current branch11:05
or added to the index11:05
if it is untracked, you can add it to .gitignore to get it ignored11:06
→ carandraug joined11:06
→ Sicp joined11:06
Vampire0 but if you added the file previously, or forced (which works even if the file is in .gitignore), then it is tracked and .gitinore does not work anymore11:07
→ c74d joined11:07
→ carbon joined11:08
→ RyPeck joined11:08
← hellopat left11:09
← beautifulmind left11:11
→ EminenceHC joined11:11
→ Neon1024 joined11:12
→ rgr joined11:13
→ WaReZ joined11:14
→ deuti joined11:14
→ frobrob_ joined11:15
← daito left11:16
← EminenceHC left11:16
← DolphinDream left11:16
→ n1x joined11:17
← eletuchy left11:18
→ eletuchy joined11:18
← frobrob left11:19
← tokik left11:19
← h0bbit left11:20
← hkon__ left11:20
→ Fang0716 joined11:21
→ hkon__ joined11:22
→ sobczyk joined11:22
sobczyk did anything change in git 1.9? I try "git checkout -b b_name -t origin/b_name" but I get Cannot setup tracking information; starting point 'origin/b_name' is not a branch.11:23
→ MagePsycho joined11:23
sobczyk it worked before11:23
→ ascarter joined11:24
osse sobczyk: what does 'git show origin/b_name' say ?11:24
→ razrunelord joined11:25
sobczyk osse: displays the log for upstream11:25
osse sobczyk: git cat-file -p origin/b_name11:26
Vampire0 osse if I set a pushremote for a branch, git tells me that it does not know what to push. Can I config the "tracked" branch for the pushremote?11:26
sobczyk I did upgrade that system, so git went from 1.7.9 to 1.9.111:26
← FunkyAss left11:27
→ Ariadeno joined11:27
osse Vampire0: I don't know11:27
sobczyk osse: the top entry from previous command11:27
Vampire0 anyone else? :-/11:28
osse sobczyk: try removing the -t. I think it's implied11:28
← razrunelord left11:29
sobczyk osse: hmm, seems so, "branch -t origin b_name" works fine so alternatively I can switch to 2 commands11:30
→ pikaren joined11:30
→ tokik joined11:31
← frobrob_ left11:32
→ freestyl3r joined11:32
→ moritzs joined11:32
→ moritzschaefer joined11:32
→ MutantMahesh joined11:33
← MutantMahesh left11:33
→ MutantMahesh joined11:33
→ beautifulmind joined11:33
← luc__ left11:36
→ maveneagle joined11:36
← Zariel left11:38
← nicksloan left11:40
← moritzs left11:40
← moritzschaefer left11:40
← ascarter left11:41
← tokik left11:41
Vampire0 ah, it is a bug osse11:42
→ Ethix joined11:43
Vampire0 I have push.default set to simple and this fails with pushremote11:43
http://git.661346.n2.nabble.com/branch-lt-name-gt-pushremote-not-working-with-push-default-simple-or-upstream-td7588148.html11:43
→ SonikBoom joined11:44
← watermel0n left11:45
→ intellix joined11:45
← amikiri left11:45
→ CheckDavid joined11:46
→ daedeloth joined11:47
→ hide joined11:48
→ tmcmahon joined11:49
→ SidFerreira joined11:49
← snql|bad_interne left11:49
→ LaserChicken joined11:49
→ matheus23 joined11:50
→ DolphinDream joined11:50
→ nnyk_ joined11:51
← nnyk_ left11:51
→ nnyk_ joined11:51
← Raging_Hog left11:51
→ robinsmidsrod joined11:52
← robinsmidsrod left11:52
→ Zariel joined11:52
→ hplar joined11:52
→ snql joined11:52
← Workinho left11:53
→ FunkyAss joined11:54
→ jftf joined11:54
← nnyk_ left11:54
→ robinsmidsrod joined11:55
← armyriad left11:55
→ armyriad joined11:56
← HelperW left11:56
→ lsiv568 joined11:57
→ HelperW joined11:57
→ ascarter joined11:57
← jftf left11:59
← Fang0716 left11:59
→ carbon1 joined12:00
← carbon left12:00
← tmcmahon left12:00
← Xethron left12:00
→ Xethron joined12:02
← Xethron left12:02
→ Xethron joined12:02
← vtunka left12:02
→ Hayro joined12:02
← Hayro left12:02
← sanjayu left12:02
← aspiers left12:02
→ arlekin joined12:03
← beautifulmind left12:03
← Ethix left12:03
arlekin hello there12:03
→ Hayro joined12:04
← DolphinDream left12:04
arlekin i have a question about merge strategies: if i will do the pull and merge it to local repo with 'ours' strategy then it will completly overwrite fetched version and my local and remote repo (i assume) will be synced; is that correct ?12:05
jast yes. the things you're merging will be included in the history, but the actual files will not contain anything from that side of the merge.12:06
← Ringod2 left12:06
arlekin jast: great, but lets say i will push this, and then fetch it on another machine with local repo which is slightly different from preiouv local repo i mentioned12:07
→ harobed_ joined12:07
→ m0ltar joined12:07
arlekin jast: what happen if i will then merge it by default with normal conflict resolutionl; will i be able to push it ?12:08
← ascarter left12:08
→ dougsland_ joined12:08
← Tuna-Fish left12:08
← cvanball left12:08
→ phretor joined12:08
jast whenever you merge before pushing, the push will go through (unless someone else was faster than you ;))12:09
arlekin jast: thats not an issue - i work alone12:09
jast whether the second merge will work depends on whether the repo on the other machine has any changes that conflict with the main branch12:09
if there are, you'll get a standard merge conflict. otherwise it'll go through on its own.12:09
→ moritzs joined12:11
→ moritzschaefer joined12:11
arlekin jast: yup but what if i resolved this conflict, then i assume, i will hae effectively two versions of repo - one on remote and other-local which are pretty much exact as there was 'ours' merge and another one, locally, which will be different 'cause it was merged with manually resolved conflict (so in result is not neccessary exact)12:11
← Zariel left12:11
xender Hey, I just saw that when using git-new-workdir, when I run git fsck in workdir I have one dangling commit more than when I run it in original repo12:12
→ SicoWork joined12:12
→ Tuna-Fish joined12:12
→ osse joined12:12
xender Does this mean that running git-gc from workdir can cause data loss?12:12
← xcesariox left12:12
← carbon1 left12:12
← osse left12:12
→ osse joined12:13
← nepochal left12:13
← osse left12:13
→ osse joined12:13
→ beautifulmind joined12:14
← teran_ left12:14
→ teran joined12:15
→ EminenceHC joined12:15
→ h0bbit joined12:15
→ xcesariox joined12:15
← Kayra left12:15
← ifdm_ left12:16
← osse left12:17
← bambams_ left12:17
← Hayro left12:17
→ osse joined12:17
→ Hayro joined12:17
← teran left12:18
→ teran joined12:18
← Hayro left12:19
← EminenceHC left12:19
← eaj left12:21
→ zivester joined12:22
→ dsdeiz joined12:23
← rfoust left12:23
→ e^0 joined12:25
→ samsamm777 joined12:25
→ razrunelord joined12:25
← beautifulmind left12:26
→ watermel0n joined12:27
masscrx if someone invited me on github, does he has to add my public key to his account or how it work ?12:28
← Gavrisimo left12:29
→ paulweb515 joined12:29
Kartagis I'm guessing he doesn't12:29
stealthii hey. I'm reordering some commits using rebase -i. Some of these work fine when I have to merge (most of these commits include files moves)12:29
← eletuchy left12:29
tobiasvl masscrx: that's more of a #github question12:29
stealthii however, some commits did not detect the move, and consider it an add/delete. Merging in this case is impossible.12:30
→ eletuchy joined12:30
stealthii Is there a way I can increase the move detection ratio temporarily for the purpose of rebasing?12:30
Vampire0 masscrx, I think he just adds you as allowed pusher. Your public key is in your account.12:30
← razrunelord left12:30
Vampire0 So if you are added, I think you simply can push thereafter12:30
→ woollyams joined12:30
← teran left12:30
→ zorbash joined12:30
→ VinceThePrince joined12:31
→ teran joined12:31
← zorbash left12:31
← moritzs left12:32
Vampire0 I think so stealthii12:32
← moritzschaefer left12:32
← VinceThePrince left12:32
Vampire0 stealthii, man git rebase and search for rename-threshold12:32
gitinfo stealthii: the git-rebase manpage is available at http://jk.gs/git-rebase.html12:32
← n1x left12:32
stealthii awesome. Thanks a million Vampire012:33
← eletuchy left12:34
← Macaveli left12:34
← adac left12:34
→ Kayra joined12:35
← paulweb515 left12:35
→ paulweb515 joined12:35
Vampire0 yw12:35
← plitzenberger left12:36
→ Macaveli joined12:37
← robbyoconnor left12:37
→ n1x joined12:37
→ eletuchy joined12:37
→ dannybodmer joined12:38
← dannybodmer left12:39
→ jottr joined12:39
→ dannybodmer joined12:40
→ DolphinDream joined12:40
→ nnyk_ joined12:40
← dannybodmer left12:40
→ cdleonard joined12:41
→ Zariel joined12:41
← SonikBoom left12:41
→ dbods joined12:41
← m0ltar left12:41
← DolphinDream left12:41
← Macaveli left12:42
← dbods left12:42
→ JacobHayes joined12:43
← Ariadeno left12:44
→ moritzschaefer joined12:44
→ moritzs joined12:44
→ anglisc joined12:46
→ adac joined12:46
→ DoniRS joined12:46
→ jackneill joined12:46
→ JacobHay_ joined12:46
→ xsbeats joined12:47
← n1x left12:47
← JacobHay_ left12:48
xender masscrx: Adding someone's public key == giving access to own repos to that someone12:48
Generally you should have only your own keys added to your account12:48
→ polyzen joined12:49
xender Giving write access to repo is another thing.12:49
masscrx xender: yep but my client invite my to his repo for editing purposes12:49
← hexagoxel left12:50
masscrx so i see this repo but I'm wondering whether need I add my public key12:50
→ dowwie joined12:50
xender masscrx: GitHub should handle it12:50
If it says that you have access to push, then you have access to push12:51
dowwie hello all12:51
dcpc007 hello i have problem to open windows script with git-bash (msysgit), does anyone use it ?12:51
→ mjsmith2 joined12:51
dcpc007 they are detected as binary files12:51
canton7 many do. what's your problem12:51
dcpc007 it's .ps1 files, text script onpowershell12:51
i try toput windows admin on git :)12:52
→ rfoust joined12:52
dcpc007 but even a vim script.ps1 show strange characters each char12:52
dowwie question about rebasing.. if when I run "git rebase master" from a branch, is the commit set from the branch moved onto the master branch of my current working directory or onto the master branch of the upstream repo (remote origin)12:52
dcpc007 like : "^@F^@u^@n^@c^@t^@i^@o^@n^@ ^@M^@A^@I^@L^@_^@U^@n^@i^@n^@s^@t^@a^@l^@l^@_^@S^@E^@P^@1^@1^@^M^@"12:53
canton7 dcpc007, 'powershell -File path/to/file.ps1' ? or maybe 'start path/to/file.ps1' ?12:53
→ hellopat joined12:53
canton7 ooh, your problem isn't running it12:53
← zivester left12:53
canton7 gotcha12:53
← woollyams left12:53
dcpc007 i installed avec default conversion like recomanded12:53
for CRLF conversion12:53
→ ammar2 joined12:54
→ jftf joined12:55
→ Mitchbones joined12:55
← samsamm777 left12:55
dcpc007 wow it'ss UTF-16 encoding !12:56
← Gizburdt left12:56
→ Kartagis joined12:56
canton7 aah12:56
dcpc007 never seen it12:56
→ Gizburdt joined12:57
canton7 you can tell git that it's definitely a text file (if you want), using man gitattributes12:57
gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html12:57
canton7 you might not want to do line ending conversion in a ps1 file, though12:57
← hellopat left12:58
canton7 ah, but it will try and do a binary diff otherwise, of course. yeah, you can tell git that it's text with gitattributes12:58
← watermel0n left12:58
← jargon left12:59
dcpc007 the problem is even in console12:59
don't want to manage special utf-16 char in git12:59
→ noxd joined12:59
canton7 or just save it at ascii? :P12:59
dcpc007 boring Microsoft defaults !12:59
← mlechner left12:59
← jftf left12:59
← mjsmith2 left13:00
InFierno !time13:01
gitinfo [!reply_time] I only respond to !ECHO-REQUEST13:01
→ gargola joined13:03
← intellix left13:03
→ Macaveli joined13:03
polyzen → poly13:03
→ VictorCL joined13:03
→ AaronMT joined13:03
→ intellix joined13:04
dcpc007 foudn a solution it seems : https://groups.google.com/forum/#!msg/msysgit/c4TMlnBQPbM/axrXkuX28EgJ13:05
using iconv for converting and .gitattributes and filters13:05
→ nepochal joined13:06
canton7 dcpc007, or convert to ascii?13:06
dcpc007 maybe too violent ?13:07
→ amcsi_work_ joined13:07
dcpc007 don't know, i must ensure that Windows admindon't lostr anything13:07
→ scampbell joined13:07
dcpc007 utf-8 and utf-16 fully compatible (utf-&6 just useless)13:07
but convert utf-16 to ascii .... what happens13:07
canton7 if it's a powershell script, I doubt it's got anything fancy in it :P13:07
YoungFrog a conversion tool should actually tell you if the conversion is not possible13:08
so I'd suggest to try it and see.13:08
dcpc007 tested iconv manually : it'ss ok13:08
← dfinly left13:08
YoungFrog in fact, if it's pure ASCII, converting to UTF-8 should give exactly the same result as converting to ASCII IIRC.13:09
dcpc007 iconv -f utf-16 -t utf-8 script.ps1 : show a clean text13:09
xender Does cherry-pick handle file renames heuristically?13:09
dcpc007 i don't know what can be inside13:09
← amcsi_work left13:09
xender I just cherry-picked a commit which was mainly files renaming. And my HEAD has some of these files modified13:10
But i see no conflicts13:10
← gargola left13:10
xender So it actually knew to treat those changes as renames?13:10
→ dbods joined13:11
← sinkensabe left13:11
→ qwyeth joined13:11
→ livingstn joined13:11
→ sinkensabe joined13:11
lb1a xender, git does not know about explicit file renames13:14
→ FortySix2 joined13:14
lb1a xender, it figures it out by heuristic yes13:14
if it sees the same content but different "filename" in the tree metadata it treats them as a rename.13:15
xender lb1a: Yeah, I know that, but I was thinking that it uses that heuristin only in git status and git log with options to track renames13:15
← dsdeiz left13:15
← sinkensabe left13:15
→ sinkensabe joined13:15
lb1a but you can configure the amount of "same content"13:15
xender So it uses it also in merge strategies? That's cool13:16
lb1a default is 50% similar i think13:16
i just know it from a conference talk. would have to search the config option myself. but i would start at man git config and search for rename :D13:17
gitinfo the git-config manpage is available at http://jk.gs/git-config.html13:17
← rgr left13:17
→ m0ltar joined13:17
← maveneagle left13:17
→ ehmatthes joined13:17
← _tpavel left13:17
→ mgomezch joined13:18
← lite left13:18
→ lite joined13:19
→ m8 joined13:19
xender ok, thx13:20
← adac left13:20
→ vtunka joined13:21
← nikita left13:22
→ heedly joined13:23
→ Foldager joined13:23
← lite left13:23
← jottr left13:23
← hebz0rl left13:23
heedly I accidently did git pull origin branch on my master13:23
and it pulled in the changes, is there anyway to undo that?13:23
→ nikita joined13:23
canton7 heedly, git reset --hard HEAD^13:24
osse heedly: git reset --hard master@{1}13:24
heedly excellent, thanks :)13:25
← heedly left13:26
→ razrunelord joined13:26
→ freimatz_ joined13:26
→ maxorator joined13:27
dcpc007 canton7: have you see the link i post ? i don't understand allthoses config13:28
i'mtrying to put it in my new git-bash on my laptop13:28
← freimatz left13:29
→ thomaslnx joined13:29
canton7 read man gitattributes, understand how smudge/clean filters work, first13:29
gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html13:29
→ Gavrisimo joined13:29
→ IrishPrime joined13:30
→ joelmo joined13:30
→ _tpavel joined13:30
← razrunelord left13:31
→ Fullma joined13:31
→ Gavrisimooo joined13:31
xender Does git have a tool for finding whitespace errors across whole repo?13:32
← amcsi_work_ left13:32
→ adac joined13:33
← drean left13:33
xender Or should I just use sed?13:33
→ amcsi_work joined13:33
→ mizu_no_oto joined13:34
← Gavrisimo left13:34
→ ezio joined13:34
→ sreich joined13:35
← Gavrisimooo left13:36
→ aspiers joined13:36
cdleonard git-ls-files or git-grep can help you, but you'll probably end up using sed too13:37
→ jizanthapus-work joined13:37
→ tiblock joined13:37
→ shinnya joined13:38
← MutantMahesh left13:40
→ dsdeiz joined13:41
→ il joined13:41
→ momomomomo joined13:41
→ mgomezch_ joined13:41
← mgomezch left13:42
dowwie when I want to fetch from my remote, is it better to "git fetch" or "git fetch origin/master" ?13:44
→ Hardcheese joined13:44
← treehug88 left13:44
→ koell joined13:45
→ tranzfuse joined13:45
canton7 dowwie, well the latter is invalid...13:45
jast dowwie: 'git fetch'... or maybe 'git fetch origin' if you have multiple remotes and want to fetch a specific one (otherwise it picks one essentially at random ;))13:46
→ CKyle joined13:47
dowwie ugh!13:47
ok thanks for clarifying that13:47
→ daito_ joined13:47
→ chiromante joined13:47
jast there's an --all flag, too, I believe13:47
tiblock Hi. Im first time in git and reading book http://git-scm.com/book It says to do "git init", "git add file1", "git add file2", "git commit m 'initial project version'". When i do that last command i get "error: pathspec 'm' did not match any file(s) known to git.", "error: pathspec 'initial project version' did not match any file(s) known to git.". What im doing wrong?13:47
→ blackmesa joined13:47
Vampire0 At random? not the "upstream" remote?13:47
Yes, there is an --all flag13:48
dowwie, what you probably meant was "git fetch origin master", no?13:48
← Hardcheese left13:48
Vampire0 for this read !fetch4 dowwie13:48
gitinfo [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).13:48
osse xender: git ls-files -z | xargs -0 grep '[[:space:]]$'13:48
← lsiv568 left13:48
← momomomomo left13:49
→ davividal joined13:49
dowwie I'm just trying to synchronize my local working directory with the remote using the more idiomatic approach of "git fetch" and "git merge origin/master" rather than "git pull"13:49
→ akim joined13:50
→ DolphinDream joined13:51
→ momomomomo joined13:51
← DolphinDream left13:51
← daito_ left13:51
Vampire0 so "git fetch" is most probably what you wasn dowwie13:51
s/wasn/want/13:51
dowwie VampireO : thx :)13:51
→ lolmaus joined13:52
Vampire0 yw13:52
← bailon left13:52
← sreich left13:53
← koell left13:53
osse note that git fetch fetches from your current branch's upstream's remote if set and != origin13:53
it am the confusenicity13:53
→ koell joined13:54
← yacks left13:54
→ vanillajohn joined13:54
→ lsiv568 joined13:55
← arlekin left13:56
→ jftf joined13:56
→ fatalhalt joined13:56
← hkon__ left13:58
→ mjsmith2 joined13:59
← vtunka left13:59
← poly left13:59
← koell left13:59
→ _W_ joined13:59
← LeMike left13:59
← h0bbit left14:00
← Tuna-Fish left14:00
→ Iconate joined14:00
← jftf left14:00
→ thiago joined14:01
→ W0rmDr1nk joined14:01
→ Tuna-Fish joined14:01
→ vtunka joined14:01
← Iconate left14:02
→ vijay13 joined14:02
→ doener joined14:03
← ojacobson left14:03
tiblock solved my problem. Theres error in book, it must be "-m" not "m"14:03
← Macaveli left14:03
← Xethron left14:04
→ Ariadeno joined14:04
← vtunka left14:04
→ starkhalo joined14:05
→ garvank joined14:05
→ acharlieh joined14:05
→ igalic joined14:05
igalic hello happy people o/~14:06
Vampire0 !hi igalic14:06
gitinfo [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.14:06
← tranzfuse left14:06
igalic I have a subversion repository mirrored into git which I'm supposed to run a "report" over, to see who forgot to merge their stuff into $branch,14:06
→ yacks joined14:07
igalic anyway, right now I'm doing some dry land excersizes with Apache httpd's git mirror, essentially, I'm looking for an "easy" way to replace the git hash, with the subversion revision14:07
Vampire0 I guess you are searching man git cherry14:07
gitinfo the git-cherry manpage is available at http://jk.gs/git-cherry.html14:07
igalic git log --graph --format="$( git svn find-rev %h) <%an> - %s" is not it.14:07
Vampire0 ah, ok14:07
→ nhmood joined14:08
→ tranzfuse joined14:08
Vampire0 the rev is in the commit message of the commit14:08
igalic Vampire0: so far, the git log that I've got does pretty much what I want, I just need it formatted differently.14:08
osse tiblock: where is it? that is something that should be fixed14:08
← Sicp left14:08
igalic Vampire0: yesno. I can get it out with git svn find-rev, but as soon as I try to integrate that into the commandline, I'm getting fun like:14:08
Vampire0 ok, !www igalic14:08
gitinfo What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?14:08
→ Neozonz joined14:09
igalic Vampire0: https://gist.github.com/bbde6443bf434d91a08214:09
tiblock osse, its in book http://git-scm.com/book in 2.1.1 is says "git commit m '...'" and thats wrong for me. But i use windows git client so maybe its windows's problem.14:09
igalic I have also tried the same piped through perl or sed, with the exact same result:14:10
→ antlong joined14:10
← acharlieh left14:10
Vampire0 of course igalic, that wont work, the "$()" is evaluated by bash14:10
→ jftf joined14:10
→ LeMike joined14:10
igalic https://gist.github.com/3d519069f73fcf38177214:10
antlong hello, i added store credentials yesterday, and now a pull is taking 15 minutes, i see the processes seemingly hanging14:10
osse tiblock: are you reading the printed version?14:10
→ arlekin joined14:10
antlong i see, 6548 pts/0 00:00:00 git <defunct> 6576 pts/0 00:00:00 git-credential-14:10
igalic Vampire0: in the latter case I would assume that to be an advantage, but maybe I'm getting some order wrong.14:10
arlekin hello there14:10
tiblock osse, PDF from website14:10
→ Sicp joined14:10
← yaru22 left14:11
tiblock osse, oh. Web version have "-m" instead of "m". I read this https://github.s3.amazonaws.com/media/progit.en.pdf14:11
osse tiblock: ahh, look at that... It is fixed in the HTML version14:11
Vampire0 possible igalic14:11
osse tiblock: seems like a new PDF should be generated14:11
xender osse: There are also other kinds of whitespare errors, like tabs-after-some-other-whitespace14:11
arlekin is there a way to display differing commits between branches ? i know about git diff A..B but i dont want to deal with diff output (12k lines) and just want to see diverging commits14:12
xender osse: Would ( .*\t)|(\s+$) handle all cases?14:12
→ gargola joined14:12
← Sicp left14:12
← xcesariox left14:12
osse xender: which cases would that be14:12
→ Hardcheese joined14:13
→ dik_dak joined14:13
xender osse: All spacing patterns that are not sane in common sense14:13
Also, I don't want to grep binary files14:13
→ vtunka joined14:13
→ Sicp joined14:13
xender How to evaluate whether file is binary or textual? file command or git also has interface for that?14:13
osse no14:14
xender: maybe you're better off using find . -type f -name '*.py' -exec grep ... + or something then14:14
→ jamieshepherd joined14:14
xender osse: find will also return non-tracked files14:15
osse yep14:15
→ xenoterracide_ joined14:15
→ fenerlitk joined14:15
osse grep -I might help; that will skip binary files14:15
xender osse: I wouldn't want to sed -i something untracked, so ls-files looks better14:16
→ g0bl1n joined14:16
xender Grep won't fix it automatically14:16
osse xender: run it on a clean repo then14:16
→ happytux_ joined14:16
xender osse: not always feasible. I'll stay with git ls-files14:16
← deuti left14:16
osse xender: 'cd ..; git clone project project2'14:17
← tvw left14:17
→ axl_ joined14:17
osse xender: and how would you automatically fix the ( .*\t) case?14:17
xender That's not feasible at all14:17
← momomomomo left14:17
dcpc007 canton7: ok it' work14:17
osse xender: why not?14:17
xender osse: Hmm, that doesn't seem fixable. In that case I would just display a message14:17
canton7-mac dcpc007, cool. I still say ASCII ;)14:18
dcpc007 jsut have the 1st commit in UTF-16 and then no git diff,14:18
← dbods left14:18
→ Exancillatus joined14:18
dcpc007 but only the initial import of 1 script14:18
xender osse: ok, not "not feasible", but still, would it be superior to ls-files anyhow?14:18
dcpc007 don't know if possible to convert the script already commited14:18
→ happytux__ joined14:19
← chiromante left14:19
osse xender: you're guaranteed a clean repo and can use whatever non-git commands you wish without worry14:19
← axl_ left14:19
canton7-mac dcpc007, of course it's possible to change the encoding on a file14:19
← Hounddog left14:20
dcpc007 even if already in old commit ?14:20
repo is only local14:20
osse or: while IFS= read -d '' file; do files+=("$file"); done < <(git ls-files -<); from here you have all files in "${files[@]}" and can do whatever you want14:20
← intellix left14:20
canton7-mac you make a new commit. or rewrite the old one14:20
xender osse: Still requeires more boilerplate to introduce changes back to original repo. new-workdir could be better than clone, but also problematic in some other ways14:20
→ happytux___ joined14:20
← happytux left14:21
→ bdavenport joined14:21
← moritzschaefer left14:21
osse xender: consider my last suggestion then. that'll give you the freedom of both14:21
← moritzs left14:21
← ehmatthes left14:21
→ jargon joined14:22
← happytux_ left14:22
→ momomomomo joined14:23
← PeterBooker left14:23
xender o_O14:23
← papegaaij left14:23
→ tang^ joined14:23
→ happytux joined14:23
← happytux__ left14:23
→ Iniesta8 joined14:24
→ yaru22 joined14:24
→ intellix joined14:24
xender I don't queite understand it14:24
osse xender: or, if you're certain there are no malicious newlines in filenames: mapfile -t files < <(git ls-files); for f in "${files[@]}"; do sed this; grep that; whatever; done14:24
→ mgomezch joined14:24
osse xender: it creates a bash array of all the file names14:25
→ n1x joined14:25
osse that's all it does14:25
→ EminenceHC joined14:25
osse it looks complicated because of the null termination14:25
xender It looks like nulls were not printed in IRC14:25
Or empty string is same as null in bash?14:25
← mgomezch_ left14:26
osse in irc? I didn't print any nulls14:26
ahh, yes.14:26
'' can be used to mean null14:26
amcsi_work I accidentally committed my initial commit as all files being executable. How do I amend the commit but making all files not executable?14:27
→ axl_ joined14:27
← happytux___ left14:27
xender Leak of C null-termiated strings implementation?14:27
→ razrunelord joined14:27
→ treehug88 joined14:27
osse ?!14:27
→ PeterBooker joined14:27
YoungFrog beware: '' does not mean NUL character14:27
← yacks left14:27
YoungFrog it's just an empty argument14:27
← Kayra left14:27
xender YoungFrog: We'te trying to firegu this out just now14:27
*figure14:28
← tranzfuse left14:28
osse yeah it's probably specific to bash's read -d14:28
canton7-mac amcsi_work, have you pushed that commit?14:28
xender Ah, ok14:28
osse you can use $'\0' if you like14:28
amcsi_work canton7-mac, no14:28
canton7-mac amcsi_work, if not, 'chmod -R -x *' or whatever, then 'git commit --amend'14:28
(assuming the previous commit *was* the initial commit)14:28
Vampire0 igalic: git log --format="%h <%an> - %s" | head -n 30 | awk '{ "git svn find-rev " $1 | getline $1; print }'14:29
xender osse: There was a queite nasty whole class of bugs in PHP, because it couldn't decide how to handle strings.14:29
canton7-mac if not, 'git rebase -i --root', change the first commit to 'edit', the do the chmod and 'git commit --amend', followed by 'git rebase --continue'14:29
amcsi_work canton7-mac, thanks!14:29
→ Xethron joined14:29
← Xethron left14:29
→ Xethron joined14:29
← Hardcheese left14:29
← EminenceHC left14:29
canton7-mac :)14:29
xender There were implemented as lenght and pointer to array in one data structore. But any stray \0 in that array would end a string14:29
→ Hardcheese joined14:29
→ EminenceHC joined14:30
xender *They were14:30
Also, what is -< ?14:30
in <(git ls-files -<)14:30
← mgomezch left14:31
→ jottr joined14:31
osse a typo14:31
← razrunelord left14:31
← antlong left14:32
→ Gavrisimo joined14:32
→ tranzfuse joined14:32
→ coz joined14:33
← FortySix2 left14:34
xender So you meant -z?14:34
← _W_ left14:34
← Ariadeno left14:34
← ezio left14:34
→ johnny2600 joined14:34
osse yes14:35
← garvank left14:35
→ FortySix2 joined14:35
← ferreum left14:36
← Gavrisimo left14:36
→ garvank joined14:37
← garvank left14:37
→ garvank joined14:38
← Gizburdt left14:38
← CKyle left14:38
→ mgomezch joined14:39
← rob_w left14:40
→ jluc joined14:40
← n1x left14:40
→ Gamecubic joined14:40
← bgerber left14:41
→ hellopat joined14:41
→ Kayra joined14:42
→ devoldmx joined14:42
→ bgerber joined14:42
→ Gizburdt joined14:43
← dowwie left14:43
← martinklepsch left14:43
← ayaz left14:43
← Kayra left14:43
→ Kayra_ joined14:44
← axl_ left14:44
→ martinklepsch joined14:45
← hellopat left14:45
igalic Vampire0: so, yeah, 'slong as I don't try anything fancy (--graph) it should work out fine ;)14:45
← mgomezch left14:46
← k-joseph left14:46
← teran left14:47
→ daito_ joined14:47
← VictorCL left14:48
→ teran joined14:48
→ tplaner joined14:48
← tplaner left14:48
→ tplaner joined14:48
→ mgomezch joined14:49
→ JerryT joined14:50
← JerryT left14:50
→ DolphinDream joined14:50
→ JerryT joined14:51
← Droolio left14:52
← daito_ left14:52
← Sicp left14:53
← Iniesta8 left14:53
arlekin is there a way to display differing commits between branches ? i know about git diff A..B but i dont want to deal with diff output (12k lines) and just want to see diverging commits14:54
?14:54
← momomomomo left14:54
canton7-mac arlekin, use 'git log' instead of 'git diff'?14:55
→ momomomomo joined14:55
← rath left14:55
→ danecando joined14:55
→ codeurge joined14:56
← mgomezch left14:56
← shinnya left14:57
← qwyeth left14:57
→ Iniesta8 joined14:58
← FilipNortic left14:59
← sinkensabe left14:59
→ stfn joined14:59
→ sinkensabe joined15:00
← maxorator left15:00
← FortySix2 left15:00
← Joost` left15:00
→ qwyeth joined15:00
TomyWork arlekin git log A..B will show you the commits that B has and A doesn't.15:00
there's also gitk, which might be more helpful15:01
→ maxorator joined15:01
TomyWork "gitk A B" will show you a commit graph starting at A and B15:01
→ thomas_b joined15:02
→ codeFiend joined15:03
→ JanC_ joined15:03
← Iniesta8 left15:03
← Zariel left15:04
← Gizburdt left15:04
→ mgomezch joined15:04
→ Joost` joined15:04
← Joost` left15:04
→ Joost` joined15:04
→ plasticle joined15:04
JanC_ → JanC15:04
← sinkensabe left15:05
→ plasticl3 joined15:05
→ juvenal joined15:05
← hgl left15:05
→ klrr_ joined15:06
← mennea left15:06
klrr_ so i did "git rebase -i split-bins~8" but i get this error "Cannot 'squash' without a previous commit" this is the file i edited https://gist.github.com/klrr/f16bcfc4f766a061a5a915:08
MouseTheLuckyDog I have a project that I'm making modifications to. I thought the project was going to be easy, but it turns out harder then I thought. I would like to work on it oin a seperate branch. How can I create a branch that begins at the last commit without losing the changes that I have made to files.15:08
→ koell joined15:08
← l1kw1d left15:08
clever MouseTheLuckyDog: thats exactly how branching works by default15:08
canton7-mac MouseTheLuckyDog, !float ?15:09
gitinfo MouseTheLuckyDog: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.15:09
→ JSharpe joined15:09
← jargon left15:09
← rchavik left15:10
arlekin TomyWork: awesome man ! thanks a lot!!15:10
← Mitchbones left15:10
← cagedwisdom left15:10
MouseTheLuckyDog Thank you.15:10
→ JSharpe__ joined15:10
← roelmonnens left15:10
← teran left15:11
→ hebz0rl joined15:11
→ teran joined15:11
← jottr left15:11
← fenerlitk left15:11
← St_Marx left15:12
← TomyWork left15:12
→ dfinly joined15:12
← dfinly left15:12
→ jottr joined15:12
← cjsarette left15:13
← jottr left15:13
→ dfinly joined15:13
← dfinly left15:13
→ jottr joined15:13
← jottr left15:13
→ johnkevinmbasco joined15:13
→ Gavrisimo joined15:13
→ Jeremy_Nodasys joined15:13
← marthinal left15:13
← JSharpe left15:14
← ThomasLocke left15:14
→ robzilla joined15:14
→ jottr joined15:14
→ bliker joined15:14
← plasticl3 left15:14
→ St_Marx joined15:15
← TQzRdnMODr left15:15
← ezekielnoob6 left15:15
→ dangerousdave joined15:15
← LeMike left15:15
→ cjsarette joined15:16
← teran left15:16
→ Iniesta8 joined15:16
← cjsarette left15:17
← dangerousdave left15:17
→ hahuang65 joined15:17
→ Zariel joined15:18
← codeFiend left15:18
→ tyrannosaurus_be joined15:19
→ ErKa joined15:19
← tplaner left15:20
→ Pullphinger joined15:20
→ jxf joined15:20
→ ojacobson joined15:22
← King_Hual left15:23
← InFierno left15:23
← blackmesa left15:25
← CodePulsar left15:25
← BlooAlien left15:25
→ vanillajohn1 joined15:25
← ojacobson left15:25
← xificurC left15:25
→ __class__ joined15:25
→ boombatower joined15:25
→ johnkevi_ joined15:25
→ hahuang61 joined15:25
→ DolpheenDream joined15:25
→ Huevos joined15:25
→ knownasilya joined15:25
→ Bloo joined15:25
← lavong left15:25
→ Gooder``` joined15:25
→ King_Hual` joined15:25
→ ejnahc joined15:26
→ cjsarette joined15:26
→ fatalhalt_ joined15:26
→ weltall joined15:26
← plasticle left15:26
← fatalhalt left15:26
← MouseTheLuckyDog left15:26
→ stealthii joined15:26
← Gooder`` left15:26
← hahuang65 left15:27
→ MouseTheLuckyDog joined15:27
← johnkevinmbasco left15:27
→ plasticle joined15:27
→ Praise joined15:27
→ synfinatic joined15:27
→ cbreak joined15:27
→ ToothlessGear joined15:27
→ jaspertheghost joined15:27
← richwest left15:27
→ phantomcircuit joined15:27
→ SJS joined15:27
→ richwest joined15:28
← vanillajohn left15:29
← HelperW left15:29
→ regedit joined15:29
→ mike_af joined15:29
← adac left15:29
→ fenerlitk joined15:30
← _FvG left15:30
gitinfo set mode: +v15:30
← DoniRS left15:30
jaspertheghost Hello i am fairly new to GIT and tasked with setting up a dev environment and i need a staging (which is a sperate set of servers) and production servers staging & dev thing is i don't understand how i can use 1 repository for each seems like if i am adding multiple remotes for each thing staging and production it'll be 2 separate repo's can someone add some clarity as to how i should set things up so i can from my local laptop push to our15:31
staging env and then if all is well there push from staging into production (or if i wan tho be able to push from local laptop directly to production )15:31
→ ojacobson joined15:31
→ jonanin joined15:31
→ axl_ joined15:31
muep wonders if jaspertheghost should read about !deploy15:31
← kermit left15:31
muep hm, !deploy15:32
jaspertheghost !deploy15:32
gitinfo 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/deploy.html15:32
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/deploy.html15:32
→ ferreum joined15:32
→ FortySix2 joined15:32
→ kermit joined15:32
YoungFrog Perhaps gitinfo could use a timer for that kind of thing ?15:32
klrr_ if a file with "noop" shows up when you do git rebase -i , have you mesesd up your branch?15:32
← _tpavel left15:33
→ Celm joined15:33
YoungFrog noop means the commit you're rebasing introduces no more changes than those that were already introduced by the commits you're rabasing on. I hope that makes sense.15:33
← mizu_no_oto left15:34
kadoban It could be a sign that you're doing something wrong, but I don't think it necessarily is, really depends.15:34
← eletuchy left15:34
← Fullma left15:35
klrr_ well, first it showed up correctly but i forgot to do the "top most" commit to pick instead of squash, so i think i broke it15:35
anyway to fix this?15:35
i have the previous file could i just cp it into .git/rebase or will that just fuck up things further?15:35
← mewm left15:36
→ chrisshattuck joined15:36
kadoban klrr_: look into the reflog is probably the easiest way. it'll show you previous versions of branches and such, you should be able to undo your mistake there and then do it again right15:36
← astrofog left15:36
← FortySix2 left15:36
← latenite left15:38
← bliker left15:38
→ FortySix2 joined15:38
← DolphinDream left15:39
klrr_ kadoban: ive not pushed anything yet so i can re-clone and start over too, right?15:39
→ DolphinDream joined15:39
→ recycle joined15:39
kadoban klrr_: If you just cloned then made a mistake, you mean? Yeah should be able to. Reflog is super cool though, you should learn in for the future.15:40
jaspertheghost ok so if i am understanding all these tutorials right … its ok to have multi remote's one that links to the staging server and repo and another url that links to the production server and repo each which have post-receive calls backs?15:40
kadoban jaspertheghost: If you're reading them right, you should take from them that using git to deploy to staging/production/anywhere is probably not a good idea.15:41
← recycle left15:41
kadoban klrr_: examples: git log master@{1} will show you master before the last change to it. git log master@{"20 minutes ago"} will show you master as it was 20 minutes ago15:41
jaspertheghost what is a good idea then … i have no one to fall back on for advice and i see different tuts advocating this idea and that idea...15:41
klrr_ thanks15:41
← koell left15:41
kadoban jaspertheghost: Other tools or procedures. I just use rsync for deploying myself, but it can be as simple as pulling from a specific remote/branch on the staging server when you get an email from the devs saying "hey, it's ready for staging", etc.15:42
arlekin i checked that i can ff my master to branch, but when i try to checkout to my master it says i have untracked changes in working tree... but when i do git status i see nothing... wtf?15:42
→ tvw joined15:42
→ TQzRdnMODr joined15:43
→ lungaro joined15:43
→ nb_bez_ joined15:43
← nnyk_ left15:43
gitinfo set mode: +v15:43
→ joelm joined15:43
TQzRdnMODr Anyone know howto get a git rebase after you have a git-subtree add to work? (Related SO unanswered question: http://stackoverflow.com/questions/12858199/how-to-rebase-after-git-subtree-add/23094756)15:44
← jonanin left15:44
← Gamecubic left15:44
kadoban jaspertheghost: in short, git isn't a deployment tool. You can hack it into one if you want, I guess, but why? There's already other tools out there for that.15:44
arlekin and btw if i want to make some cleaning and remove branches and ff stuff a bit do i need to merge it with remote repo then ?15:44
→ rudisimo joined15:44
← klrr_ left15:44
← tranzfuse left15:44
← ciampix left15:44
→ tranzfuse joined15:45
jaspertheghost so perhaps i should just have 1 repo… production branch and staging branch and have a URL on the staging machine that rsyncs the production branch to the live server?15:45
→ yhager joined15:45
← Celm left15:45
kadoban jaspertheghost: That sounds like a plan, sure.15:46
→ Celm joined15:47
← ghostlines left15:47
← arlekin left15:49
→ bwreilly joined15:49
→ adsc joined15:49
→ dreiss joined15:49
adsc is it normal that git shortlog -sn take ages?15:49
→ Fullma joined15:49
← vtunka left15:50
→ Throdne joined15:50
← Celm left15:51
kadoban It doesn't seem like it should, but I've used it only rarely...always seemed quick to me. Maybe there are bad cases?15:51
← yhager left15:51
→ bakflash joined15:52
→ nnyk_ joined15:52
← Fullma left15:52
← mishok13 left15:52
← oodavid left15:53
← plasticle left15:53
→ Fullma joined15:53
adsc it's been running for 10 minutes without return now15:53
an it's a pretty small repo15:53
→ LostDatagram joined15:53
← LostDatagram left15:53
kadoban Hmm. Is the repo like ridiculously huge or something?15:53
Weird...that doesn't sound right.15:53
→ LostDatagram joined15:54
adsc it doesn't even have 100 commits15:54
kadoban Is it actually doing anything? I can't imagine it'd take that long...15:55
adsc i don't know...the command doesn't return15:55
→ supermat joined15:55
→ liuzhoou joined15:55
← snql left15:55
← pikaren left15:56
← freestyl3r left15:57
osse adsc: abort it, then run 'GIT_TRACE=1 git shortlog -sn'15:57
→ sdwrage joined15:58
← lsiv568 left15:58
→ jargon joined15:58
→ bambams_ joined15:58
Vampire0 igalic, well, do you also get all your food pre-chewed? git log --graph --format="%h <%an> - %s" | awk '{ i = 1; while ($i !~ /[[:xdigit:]]+/ && i <= NF) i++; if (i < NF) "git svn find-rev " $i | getli ne $i; print }'15:58
→ leeN joined15:59
→ xcesariox joined15:59
← xcesariox left15:59
← Jeremy_Nodasys left15:59
Vampire0 Only drawback, it looses some few spaces between the graph and the has, but it should be acceptable I think15:59
→ plasticle joined15:59
→ xcesariox joined15:59
→ zzing joined16:00
→ bartman`` joined16:00
← _Harm_B_ left16:00
adsc osse: this is the only output: trace: built-in: git 'shortlog' '-sn'16:00
← konadr left16:00
adsc then it hangs16:00
→ freestyl3r joined16:01
→ vtunka joined16:01
← jnavila_ left16:01
← chrisshattuck left16:02
osse weird, I don't have an explanation16:02
→ chrisshattuck joined16:02
← zapotek6 left16:03
igalic Vampire0: I was just making a remark on the nature of awk's $1, I'm sorry, I didn't mean for you to do my job._.16:03
← Throdne left16:03
→ Peekay joined16:04
→ moritzschaefer joined16:04
→ moritzs joined16:04
adsc osse: np, thanks for the suggestion anyway16:04
→ Ankhers joined16:05
← alorence left16:05
→ eletuchy joined16:05
← adsc left16:05
→ MTecknology joined16:06
→ lsiv568 joined16:06
→ jhulten joined16:06
→ Celm joined16:07
← MTecknology left16:07
← jceb left16:08
→ mike_af_ joined16:08
← Fullma left16:08
← mike_af left16:09
→ Asandari joined16:09
→ Sieve joined16:10
← eletuchy left16:10
gitinfo set mode: +v16:10
Sieve Hello16:10
→ snql joined16:10
→ ciampix joined16:11
← martinklepsch left16:11
← johnny2600 left16:12
→ endiruna joined16:12
→ beyondcreed joined16:12
← thomas_b left16:12
Sieve Alright, I'm having a terribly difficult time with Git16:12
← toomanysecrets left16:12
PerlJam Sieve: what's the problem?16:13
Vampire0 igalic, sure, as you see it is pretty easy to dynamically determine the "1" replacement :-)16:13
← intellix left16:13
→ Gizburdt joined16:13
Sieve My local copy of a repo was a few commits behind, I hit commit, and it failed to push and told me to merge16:13
→ DolpheenDream_ joined16:13
Sieve So I hit merge, and now it fails because it needs to push the commit16:13
← EminenceHC left16:14
Sieve I'm stuck in a loop of nothing going anywhere and everything I find about makes it seem like it's supposed to be ever so simple16:14
canton7 "and now it fails because it needs to push the commit" what?16:15
PerlJam Sieve: how did you merge exaclty?16:15
Sieve Well I was in Eclipse using the right-click context menu and hit "merge"16:15
In Eclipse it gives the error "Failed to merge", with both TortiseGit and command line it gives me the other error16:16
I'll pull it up again16:16
← lsiv568 left16:16
→ recycle joined16:16
← aspiers left16:16
PerlJam Sieve: sorry, I know nothing of eclipse, but normally if you're local repo is behind, you need to pull ( which is fetch+merge), and then you can push (Because your local repo and your remote repo will then be in sync)16:16
Sieve "fatal: You have not concluded your merge (MERGE_HEAD exists).16:17
Please, commit your changes before you can merge."16:17
→ Fullma joined16:17
Sieve On the merge16:17
→ antons joined16:17
PerlJam so, was there a conflict on the merge?16:17
→ SunilJoshi joined16:17
← vanillajohn1 left16:17
← chrisshattuck left16:17
→ LBV_User joined16:18
→ thomas_b joined16:18
gitinfo set mode: +v16:18
→ chrisshattuck joined16:18
Sieve Well, it said there was a conflict but there actually wasn't one so I marked it as resolved after checking it out16:18
← ArSn left16:18
canton7 and did you finish off the merge?16:19
Sieve That's the error I get when I try to16:19
osse Sieve: commit is how you conclude a merge16:19
← mellernoia left16:19
→ ghoti joined16:20
→ lucastt joined16:20
← lucastt left16:21
Sieve If I commit I get the error message telling me to merge16:21
→ imachuchu joined16:21
→ lucastt joined16:21
PerlJam Sieve: you're doing this through eclipse or CLI?16:21
→ roelmonnens joined16:21
← lucastt left16:22
Sieve Well, both and TortiseGit16:22
→ lucastt joined16:22
Sieve Eclipse's error messages are pretty useless16:22
← W0rmDr1nk left16:22
osse Sieve: you probably need to git add then git commit16:22
to conclude the merge16:22
← snql left16:23
← lb1a left16:24
← roelmonnens left16:26
→ Relsak joined16:26
← vtunka left16:26
← Gavrisimo left16:27
← antons left16:27
← Balliad left16:28
← MagePsycho left16:28
→ [1]nick joined16:28
→ mewm joined16:29
← axl_ left16:29
→ neurodrone_ joined16:29
→ hellopat joined16:30
→ NimeshNeema joined16:30
→ axl_ joined16:30
Sieve Dammit, how was I supposed to finish the commit message in the CLI?16:30
← soc42 left16:31
→ razrunelord joined16:31
← johnkevi_ left16:31
kadoban Sieve: Save and quit in the editor that comes up...if it's not an editor that you know how to use, switch it to one you do.16:32
Sieve It's the save and quit command I can't remember16:32
osse which editor is it?16:32
Sieve VIM16:32
tang^ probably vi, so ESC :wq16:32
osse :wq16:32
Sieve Thanks16:33
→ toomanysecrets joined16:33
→ Gamecubic joined16:33
← phretor left16:34
← mikecmpbll left16:34
← hellopat left16:34
→ yhager joined16:35
← razrunelord left16:36
← Peekay left16:36
→ Shusshu joined16:36
← axl_ left16:36
→ mattstratton joined16:37
sdwrage Sieve, you can also set the commit message via the -m flag.16:37
← Shusshu left16:37
← DolpheenDream_ left16:37
sdwrage git commit -m "This is a simple commit that does something"16:37
→ Peekay joined16:38
Sieve Dammit16:38
It just commited a bunch of files that didn't need to be commited and went back to giving me the exact same error message16:38
← recycle left16:38
← welly left16:39
← regedit left16:39
← canton7-mac left16:39
sdwrage Sieve, How did you stage your files?16:40
← m0ltar left16:40
Sieve I am not really sure what you mean by that16:40
→ vtunka joined16:40
← hebz0rl left16:41
→ axl_ joined16:41
→ sinkensabe joined16:41
← harobed_ left16:41
→ VictorCL joined16:41
← armyriad left16:41
→ armyriad joined16:42
→ sgen joined16:43
← nafg left16:43
← axl_ left16:43
Sieve Oh wait I actually got it16:43
I just had to rebase16:44
Apparantly?16:44
→ axl_ joined16:44
→ TheArtist joined16:45
→ kcj joined16:46
TheArtist Hello everyone! I am working in 2 different computers (one in the afternoon and one in the evening, in different locations) and i would like to store in the central repo my working dir16:46
is it possible?16:46
→ smuddles joined16:47
← [1]nick left16:47
kadoban Why? Why not just commit more often so you don't care so much what's in the working dir?16:47
TheArtist because i have work in progress that i believe that is not ready to be put in history16:48
→ [2]nick joined16:48
← nikita left16:48
lov TheArtist: push to a remote branch called "Work in progress" or something16:48
you can also go back and change your history16:48
Tell TheArtist abou t!sausage16:48
kadoban TheArtist: Put it in branch(es) that you can clean up later before you put it in the branches you care about.16:48
lov dshiauhdsa16:48
!sausage16:49
gitinfo [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect16:49
← ciampix left16:49
← tranzfuse left16:49
← vurma left16:50
TheArtist ok i like the idea of the WIP branch thnx!16:50
osse Sieve: to stage a file is to run 'git add' on it16:51
Sieve Oh ok16:51
I just did "git add", which I'm sure wasn't correct16:51
In GitBash, that is16:52
osse running git add more than once is harmless16:52
but you usually give a path. 'git add foo.txt' or 'git add some/dir'16:52
← VictorCL left16:52
Sieve Alright16:52
lov note; you're only staging the file as it was at the time that you staged it.16:53
If you subsequently change the file, you'll see it as both staged and changed!16:53
← mewm left16:53
lov that's because you have new, unstaged changes.16:53
→ blackmesa joined16:53
← TheArtist left16:53
lov (fun fact: you can stage only parts of your file; use git add -i iirc)16:53
Sieve Really it was annoying because it commited every assest and every generated file16:53
lov (git add -a?)16:53
smuddles Hello, i searched the web but its hard to become an answer on this simple question: is it possible to serve the location, or whatever path/string in a variable, that i can reuse on my next git session? Im new to git and got sick of changing directories all of the time manually16:53
lov yeah, you want a .gitignore file too.16:53
Sieve Damn, so is that like staging by line?16:53
smuddles *save location16:54
lov Sieve: yes. It's really neat when you're doing a bunch of work, and then you make some simple change (bugfix, etc) that stands by itself.16:54
So, just stage those three lines, commit, continue working.16:54
→ FreezingCold joined16:54
lov see also: splitting a commit into two commits, etc.16:54
git is the bees knees :>16:54
→ aspiers joined16:55
Sieve I do have a .gitignore, but I can't figure out how to make it ignore certain files, and it doesn't seem to track changes to .png's at all16:55
kadoban smuddles: You can set aliases that can use shell commands, maybe that would help you? Not entirely clear on what you're trying to do. Maybe you're just looking for shell environment?16:55
lov Sieve: .gitignore won't do anything for files that are already added.16:56
Sieve And I have to re-build the damn thing every other day because my projectmates keep deleting it16:56
← mattstratton left16:56
← axl_ left16:57
→ maveneagle joined16:57
← anglisc left16:57
← vijay13 left16:58
← sinkensabe left16:58
smuddles kadoban: thanks for your answer! Every shortcut is welcome to me - i looked into aliases but it seemed to work only for commands. So im able to store "cd /c/whatever" as an alias?16:58
← thomas_b left16:58
→ sinkensabe joined16:58
→ Sample joined16:58
Sieve I wonder if I can commit by line through Eclipse16:59
kadoban smuddles: Yeah, I guess. That's a command though, so store it as a command? You can just as easily make it a shell alias though16:59
Sieve What's the "index" anyhow?16:59
← jargon left16:59
→ zoso joined16:59
← thiago left16:59
→ Not_Whatever joined16:59
← hahuang61 left16:59
← nathancahill left16:59
kadoban Sieve: It's a view of the world as will be commited if you do 'git commit'17:00
→ VictorCL joined17:00
← moritzs left17:00
← moritzschaefer left17:00
Sieve Alright17:00
smuddles just did that - thanks for your help kadoban!17:00
kadoban 'welcome :)17:00
→ jottr_ joined17:01
→ Sample_ joined17:01
xender osse: I you're curious, I didn't manage to sed -i only text files, so going with grep -I by now.17:01
git ls-files -z | GREP_COLORS='ms=41:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36' xargs -0 grep -IPnT --color=auto '( .*\t)|(\s+$)'17:01
→ kotopies joined17:01
→ martinklepsch joined17:01
→ akushner joined17:02
→ Kitty- joined17:02
→ codeFiend joined17:03
← kermit left17:03
← sinkensabe left17:03
xender I think looking for empty lines at end of file would be tricky.17:03
Sieve Ok, I guess my next question would be "How can I use the index?" or something like that17:03
← jottr left17:04
← psoo left17:04
kadoban Sieve: 'git add' adds changes to the index. 'git reset' in some of its forms can change the index, few others.17:04
→ jonanin joined17:04
← dreiss left17:05
→ pheaver joined17:05
Sieve Ah perfect, that makes a lot of sense17:05
→ recycle joined17:05
→ eletuchy joined17:06
← e^0 left17:06
← akushner left17:06
→ axl_ joined17:07
→ vire joined17:08
← axl_ left17:09
← freimatz_ left17:10
← eletuchy left17:10
← Kayra_ left17:10
→ knigitz joined17:11
→ vanillajohn joined17:12
xender That feel when searching "git howto detach HEAD" returns all about attaching the HEAD back...17:13
_ikke_ lol17:13
→ Oran joined17:13
_ikke_ git checkout HEAD^{}17:13
gitinfo set mode: +v17:13
→ DolpheenDream_ joined17:13
xender _ikke_: thx17:13
lol17:13
There's --detach option17:13
So my zsh completion is outdated?17:14
← tango_ left17:14
← jamieshepherd left17:14
← joelmo left17:14
masak is there some limit to how you can name branches? or is it "any valid file name is a valid branch name" ?17:14
Oran hey guys, i configured the git server i hope and i was able to Clone it, as well as clone it from an IDE but now i can push to the server but they wont recive an update when some commitet stuff17:14
→ tango_ joined17:14
_ikke_ xender: aparently, I don't have it either17:14
→ jeffasinger joined17:15
xender _ikke_: What to do about it? I don't even know whether it's builtin completion or something from zsh-completions-git17:15
_ikke_ man git check-ref-format17:15
gitinfo the git-check-ref-format manpage is available at http://jk.gs/git-check-ref-format.html17:15
_ikke_ masak: ^17:15
xender Ok, going to #zsh with that17:15
_ikke_ xender: Do you use plain zsh, or something with it?17:15
→ koell joined17:15
→ Skrypter joined17:16
→ JEEB joined17:16
← vanillajohn left17:16
osse has personnaly made sure, with m0viefreak, that the zsh Git completion is perfect17:17
Oran hi osse17:17
osse well, in the end I think m0viefreak has done more than me. Much more. But whateer.17:17
← FortySix2 left17:19
← Ankhers left17:19
→ akushner joined17:20
← sdwrage left17:20
← Sieve left17:20
← blackmesa left17:21
→ FortySix2 joined17:21
→ Ankhers joined17:21
← koell left17:22
→ oonska joined17:22
← jeffasinger left17:22
→ amcsi_work_ joined17:22
masak _ikke_: thanks!17:23
→ looper joined17:24
← amcsi_work left17:24
→ vanillajohn joined17:25
← vanillajohn left17:26
→ dob1 joined17:26
→ kermit joined17:26
→ vurma joined17:27
→ sdwrage joined17:27
→ tyreld joined17:27
→ maqr joined17:28
masak heh, "the *peel onion* operation"?17:28
← kburdett left17:28
masak oh, because it's not just used to find parent commits.17:29
→ BuSerD joined17:29
← recycle left17:29
dob1 hi, just to confirm, if on gitignore i have *.foo and i have a directory "bar" that (it and its subdirectories) contains only files with extension "foo" and i want to not ignore this directory i can just use !/bar/ not !/bar/** or !/bar/**/* right?17:29
→ kburdett joined17:29
← codeurge left17:29
← Gizburdt left17:29
→ eletuchy joined17:30
← armyriad left17:31
← codeFiend left17:31
→ j416_ joined17:31
→ armyriad joined17:32
← Zariel left17:32
← kotopies left17:32
→ franzip joined17:32
→ codeurge joined17:32
→ mikecmpbll joined17:33
_ikke_ dob1: As git doesn't track directories, it won't work to not ignore that directory17:34
← DolpheenDream_ left17:34
← kcj left17:34
→ thomas_b joined17:35
xender ** syntax also works in git?17:35
→ Zariel joined17:35
_ikke_ yes17:35
xender Oh, it's also in bash17:35
I was thinking it's zsh-specific17:35
_ikke_ git uses fnmatch17:36
← Zariel left17:36
xender Hmm, I've worked too short with bash as interactive shell, so I sometimes underestimate it17:36
Ok, so it's POSIX?17:36
_ikke_ I guess so17:36
→ mishok13 joined17:37
xender Ok. Sorry, I'm sometimes ignorant in standarization of stuff17:37
→ deuti joined17:37
→ ilyam joined17:39
→ erikruthven joined17:39
dob1 _ikke_, it seems to work in my case17:39
→ rgr joined17:39
→ dreiss joined17:40
dob1 _ikke_, if i delete *.foo bar directory is in git status, if i keep *.foo bar is excluded17:40
→ tswett joined17:41
← bezet left17:41
tswett Ahoy.17:42
→ thiago joined17:42
→ l1kw1d joined17:43
← [2]nick left17:44
tswett I've created a new file. I'd like to commit only part of the file. If I run "git add -p" on the file, I get "No changes." and nothing happens.17:45
→ aretecode joined17:45
→ Kayra joined17:46
→ chrissha_ joined17:46
← chrisshattuck left17:47
→ HD|Laptop joined17:47
HD|Laptop hi all17:47
← chrissha_ left17:47
← sdwrage left17:47
→ arand joined17:47
HD|Laptop I have a git repo, and inside a directory there's another git repo (no submodule!)17:47
→ vanillajohn joined17:47
→ [2]nick joined17:48
→ chrisshattuck joined17:48
← pheaver left17:48
HD|Laptop or rather there are multiple sub repositories17:48
however in the toplevel dir, in git status they appear as untracked files17:48
→ Zebroid joined17:48
← g0bl1n left17:48
← chrisshattuck left17:49
xender HD|Laptop: I'm not sure whether git has a sane way of managing repos-in-repo17:49
← toomanysecrets left17:49
→ chrisshattuck joined17:50
xender I don't think you wold want to track the repo-in-repo's .git directory17:50
← Kayra left17:50
← leeN left17:50
← noxd left17:51
← eletuchy left17:52
→ Noldorin joined17:52
← hoschi left17:53
aismail HD|Laptop: you need to whip up your own script that iterates through "subgits"17:53
sort of like a git wrapper.17:53
← nkouevda left17:54
← endiruna left17:54
→ nkouevda joined17:55
tswett If I run "git push origin representative", will that always push my changes to a remote branch called "representative"?17:55
smuddles is it possible to create permanent aliases in git bash on windows?17:55
tswett As opposed to sometimes pushing to the remote master branch?17:55
→ leeN joined17:55
→ koell joined17:55
→ mdpatrick joined17:55
aismail tswett: correct. provided that you have that branch already setup upstream.17:55
tswett Well, the upstream is github, which doesn't currently have that branch set up.17:56
aismail in that case use --set-upstream flag in push17:56
tswett As in "git push --set-upstream origin representative", and that'll create the remote branch?17:57
→ lsiv568 joined17:57
aismail correct.17:57
tswett *nod* Cool. Thanks17:57
→ Gavrisimo joined17:58
← bu5hm4n left17:59
→ pheaver joined18:00
← smuddles left18:00
→ antons joined18:00
→ robbyoconnor joined18:01
← lsiv568 left18:02
← Spamoi left18:03
← Gavrisimo left18:03
← deuti left18:03
← bluesm left18:04
jaspertheghost ok so say i wanted to use rsync to deploy the production branch i would run the following commands …. git checkout production git pull production rsync /home/git/git_repo /var/www/production ….. ?18:04
→ deuti joined18:04
→ snql joined18:04
→ tswett_ joined18:05
thiago jaspertheghost: the git commands look right. The rsync command is up to you.18:05
jaspertheghost: note: that's not a script. You're running it manually, right?18:05
→ MadLamb joined18:05
jaspertheghost well I'm going to make it into a script … i just wanna make sure the commands i was using/logic was correct18:05
→ reaverb joined18:06
thiago stop after "pull"18:06
MadLamb i did a merge from master in my branch, and tried to push to origin, when i try to merge again, it says its already up to date, but the push is being rejected18:06
thiago do not add the rsync command to the same script18:06
aismail jaspertheghost: eventually you might want to nuke the .git dir from /var/www/production, it would be useless for you, no ?18:06
← FortySix2 left18:06
thiago MadLamb: it's complaining about different branches. The push is rejected because you don't have everything from the remote branch. Even if you've merged from the local.18:07
jaspertheghost i was going to use --bare repo with a post-recieve hook that would copy the file to the correct place..18:07
thiago jaspertheghost: git pull is an interactive command18:07
→ FortySix2 joined18:07
→ fatalhalt joined18:07
MadLamb thiago, how should i fix that? git fetch/18:07
thiago jaspertheghost: you must have a human attending it, because it might fail18:07
MadLamb: pull from the upstream18:07
← fatalhalt_ left18:08
← robzilla left18:08
→ Gizburdt joined18:08
→ mattstratton joined18:08
← tswett left18:09
MadLamb thiago, git fetch origin -> git fetch origin -> Already up-to-date.18:09
thiago, git merge master*18:09
HD|Laptop aismail: ok thanks18:09
thiago MadLamb: are you pushing to master?18:09
→ robzilla joined18:09
MadLamb thiago, i'm trying to push both master and a branch18:09
thiago MadLamb: you need to do that for both18:09
MadLamb thiago, that what?18:10
→ toomanysecrets joined18:10
thiago MadLamb: merge the remote branch18:10
MadLamb thiago, i merged the master into the branch, and tried to push, now its rejecting the branch18:10
← Gizburdt left18:10
→ Anders_J joined18:11
thiago MadLamb: merge the branch's upstream into the branch too18:11
MadLamb: or push only one branch18:11
jaspertheghost GIT_WORK_TREE=/var/www/www.website.com git checkout -f if i have that in hooks/post-recieve when i push to that repo … will it copy over the .git files too to /var/www or will i be able to do just rsync after that push to that repo18:11
?18:11
thiago jaspertheghost: you don't need to rsync if you're doing that checkout -f18:12
→ mewm joined18:12
MadLamb thiago, it worked, thanks18:12
jaspertheghost i do if its to a remote location ...18:12
thiago jaspertheghost: ah, right18:12
jaspertheghost: yes, rsync from there to a remote location18:12
→ Ariadeno joined18:13
jaspertheghost and i can just put that in side the post-recieve … or i can make a php script that i can that does it manually that way there is no accidents?18:13
thiago jaspertheghost: you choose18:13
jaspertheghost i don't understand how i can make a post-recieve though that will take into a count diff branch production vs staging and go to a different folder for each...18:13
→ Gizburdt joined18:14
← chrisshattuck left18:14
→ babilen joined18:14
→ teran joined18:15
jaspertheghost thiago do you have any ideas for how to do that?18:15
thiago jaspertheghost: the script is given the branch name18:16
← robbyoconnor left18:17
← ojacobson left18:17
← babilen left18:17
→ CKyle joined18:17
jaspertheghost any docs u can send me on that18:17
idk the variable name or anything18:18
→ lsiv568 joined18:18
→ hellopat joined18:18
→ babilen joined18:18
→ ojacobson joined18:18
thiago jaspertheghost: the docs are the sample script that you got18:18
jaspertheghost: and man githooks18:18
gitinfo jaspertheghost: the githooks manpage is available at http://jk.gs/githooks.html18:18
→ distilledchaos joined18:19
→ aard_ joined18:19
← teran left18:19
distilledchaos Is there any way to use diff-index with --quiet without implying --exit-code?18:19
grawity wouldn't it be a bit...useless then?18:20
jaspertheghost $ref is the variable?18:20
distilledchaos hmmm maybe i don't understand --quiet then18:20
i want to augment my existing bash prompt to have a little * next to the branch name18:20
but if the cwd isn't in a git repo the error makes the * appear18:21
because exit codes18:21
grawity so check if you're in a git repo first18:21
distilledchaos yeah...18:21
grawity e.g. don't even try diff-index if the branch name is empty18:21
→ ValicekB joined18:21
→ eletuchy joined18:21
← vurma left18:21
distilledchaos ha good point18:21
→ godgodgodgo joined18:21
grawity but aside that, you _need_ the exit code for this purpose18:21
thiago distilledchaos: git rev-parse --show-prefix18:22
grawity "That is, it exits 1 if there were differences and 0 means no differences."18:22
→ chiromante joined18:22
← hellopat left18:22
← qwyeth left18:22
→ robbyoconnor joined18:22
← rue left18:22
← King_Hual` left18:23
→ King_Hual joined18:24
→ LucasKA joined18:24
→ axl_ joined18:24
distilledchaos @grawity wouldn't not having --exit-code mean that 0 is no differences and 1 is differences?18:24
grawity no, it wouldn't18:25
distilledchaos @thiago sorry, what does that do?18:25
grawity because it's --exit-code that enables that behavior18:25
distilledchaos ohhh18:25
:/18:25
← eletuchy left18:25
← King_Hual left18:26
→ jwest joined18:26
→ King_Hual joined18:26
→ calamari joined18:26
← martinklepsch left18:26
calamari is there a way to stop git from deleting files, even if it really wants to? I am so tired of recreating my data files because I switch a branch and then git deletes them on me. I would like to overrule and say never delete my stuff18:27
grawity nope, there isn't18:27
→ martinklepsch joined18:28
mmattice calamari: stop tracking the data files?18:28
calamari so I would need to modify the git code.. okay thanks18:28
← robbyoconnor left18:28
calamari I've tried all sorts of band aids and stuff18:28
→ vijay13 joined18:28
← axl_ left18:28
← deuti left18:28
calamari at this point I don't really care why git wants to delete I just want it to stop. so I guess I will just modify git to prevent it from deleting18:29
grawity perhaps not keeping data files in the same repository as code would be a better band aid18:29
calamari perhaps, but that's not under my control18:30
← mewm left18:30
← nb_bez_ left18:31
buu When does git delete a file even if you switch branches?18:32
I mean, it only changes tracked files right?18:32
← tiblock left18:32
ohcibi if a file that is tracked in another branch but not in the current would be affected by the checkout, git warns you18:32
← VictorCL left18:33
← kermit left18:33
ohcibi or better: it doesnt let you checkout unless you get take care of that file (e.g. move it away temporarily)18:33
buu Right18:33
→ SHyx0rmZ joined18:33
buu But if you just have random file X that git doesn't know about, it continues to ignore it right?18:34
ohcibi of course18:34
→ upene joined18:35
buu This suggests several solutions18:36
jaspertheghost so in my post-recieve i wanna see what data is being sent to the script …. how come this return blank on git push origin master (it updated the file) echo "$1 $2 $3 $4" >> /tmp/test.txt18:36
← Tommy[D]_ left18:36
jaspertheghost or is git checkout above it stopping that from happening?18:36
distilledchaos @grawity: it looks like diff-index doesn't always actually look at the working tree? https://gist.github.com/skeggse/254e11f9ca361b139ddd18:37
jaspertheghost the latter being not the answer i just moved the echo up to the first line18:38
→ Lemony joined18:38
→ mizu_no_oto joined18:38
← kenneth left18:38
← Lemony left18:38
→ Lemony joined18:38
jaspertheghost how am i suppose to read what the post-receve echo's out if anything?18:39
→ sluther joined18:40
→ kermit joined18:40
→ qwyeth joined18:41
distilledchaos @grawity it looks like i need to do a git update-index so that it picks up changes?18:41
← Ariadeno left18:41
calamari I think it probably stems from if you ever delete a file in git, you can never have that file again18:41
because if you put it back, git deletes it randomly18:42
Eugene What? No.18:42
← robzilla left18:42
← paulweb515 left18:42
calamari in practice, that is what I see18:42
Eugene jaspertheghost - !pitfalls18:42
gitinfo jaspertheghost: [!hook_pitfalls] Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).18:42
Eugene calamari - then you need to practice more ;-)18:43
← xcesariox left18:43
Eugene jaspertheghost - try: echo ${@} >> /tmp/test.txt18:43
→ DrShoggoth joined18:43
→ alp82 joined18:43
jaspertheghost well i echoed out to the screen i can see it gets sent back to the git client18:43
← aard_ left18:43
← fenerlitk left18:43
jaspertheghost but echo a regular echo $1 and echo "$1" is returning blank data on git push origin master18:43
Eugene And/or make sure that test.txt is writable. ;-)18:44
→ m0ltar joined18:44
calamari Eugene: sometimes you get to the point where you've spent so much time trying to figure out where you are wrong, that you just don't care anymore and think.. you know what I did enough. fortunately since git is gpl, I can do something about it18:44
jaspertheghost from the looks of it nothing is being passed to the script...18:44
Eugene Unless that ref is actually being updated then yeah, it will be blank, because the script ain't runing.18:44
jaspertheghost its running cause echo "script is running"18:45
i can see that text18:45
mmattice why does git-mergetool not operate on rebase merges?18:45
Eugene calamari - cool story, br0. No stop being a discouraging lil prick, or fuck off.18:45
now818:45
← _Vi left18:45
→ shvelo joined18:45
calamari Eugene: fuck you18:45
ChanServ set mode: +o18:45
Eugene kicked calamari (No, fu!)18:45
→ InsanelyADHD joined18:45
distilledchaos Really?18:46
mmattice that last little jab wasn't necessary.18:46
Eugene changed the topic to: Welcome to #git, the place for git help and op sass | Current stable version: 1.9.3 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | This is not a joke, it's a commit.18:46
jaspertheghost errr wtf18:46
→ Kayra joined18:46
← distilledchaos left18:46
→ nathancahill joined18:47
Eugene None of it is necessary, strictly speaking.18:47
← SHyx0rmZ left18:47
→ amcsi joined18:47
← kermit left18:47
→ sdwrage joined18:47
jaspertheghost The post-receive hook doesn't take any arguments. Quoth the manual (emphasis added):18:47
well that explains it18:47
Eugene Well there you go!18:47
← koell left18:47
Eugene Maybe you're thinking pre-receive or update?18:48
Also, see above re: consume all input18:48
Eugene set mode: +v18:48
Eugene set mode: -o18:48
Eugene back to real work :-/18:48
→ pbrobst joined18:48
← CKyle left18:48
jaspertheghost well where would be a good place to put an rsync script18:49
→ hahuang61 joined18:49
jaspertheghost GIT_WORK_TREE has to be in post-recieve right?18:49
→ SHyx0rmZ joined18:49
Eugene !deploy18:49
gitinfo 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/deploy.html18:49
Eugene Read ^. I have made one for you already18:49
→ sinkensabe joined18:49
← martinklepsch left18:50
→ nathancahill_ joined18:50
jaspertheghost i already read all that18:51
→ DolpheenDream_ joined18:51
← Kayra left18:51
jaspertheghost read oldrev newrev refname18:51
now that works!@18:52
I'm not sure whhy or what the read command does18:52
← pheaver left18:52
← sinkensabe left18:52
→ kermit joined18:52
→ CKyle joined18:52
Eugene Consumes a line from stdin18:52
→ phretor joined18:52
← nathancahill left18:52
← godgodgodgo left18:52
→ sinkensabe joined18:52
nathancahill_ → nathancahill18:52
→ robzilla joined18:53
→ LeMike joined18:54
← NimeshNeema left18:54
jaspertheghost how come $1 and $2 didn't for then18:55
Oran hey guys, i want to make a new repo on my working machine as well as on the server. ( i already have 1 repo on them which works fine), whats the way to go ? ini non bare on workmachine, add , commit and than init a bare on the server and finnaly push to server from workmachine?18:55
jaspertheghost bash scripting was never a string point withme18:55
← Neozonz left18:56
→ k-joseph joined18:57
← bunbury left18:57
← sinkensabe left18:57
← SunilJoshi left18:58
Eugene $1 is an "argument"18:58
stdin is a pipe18:58
jaspertheghost yea i just realized that18:58
← ErKa left18:59
→ shinnya joined18:59
← Skrypter left18:59
→ codeurge_ joined18:59
→ Gavrisimo joined18:59
markmarkmark Oran: yes18:59
← matteo left19:00
→ maahacka joined19:00
→ fenerlitk joined19:01
→ chrisshattuck joined19:01
→ pimpin joined19:01
→ Mitchbones joined19:01
→ teran joined19:02
← teran left19:02
→ blinkdesign joined19:02
← devoldmx left19:02
→ pantsman joined19:02
← nnyk_ left19:03
→ devoldmx joined19:03
Oran markmarkmark: thank you19:03
→ zapotek6 joined19:03
← codeurge left19:03
Oran btw it seem to work right now, i just need to add, commit , (pull) , push everytime which is kind of annoing19:04
→ koell joined19:04
← Gavrisimo left19:04
← a-l-e left19:04
→ ErKa joined19:04
→ sq-one joined19:05
→ Fandekasp joined19:05
→ pheaver joined19:05
→ eletuchy joined19:05
→ kesha joined19:05
→ mennea joined19:06
→ alexlindenlevy joined19:06
← c74d left19:07
jaspertheghost ok another stupid question how do i setup a non tracking brnach?19:07
← pimpin left19:07
PerlJam jaspertheghost: just make a new branch.19:08
← Sleepy63 left19:08
← Iniesta8 left19:08
→ axl_ joined19:08
jaspertheghost and when pulling new data into it won't track19:08
and what does git checkout -u do again>19:09
← axl_ left19:09
jaspertheghost ?19:09
markmarkmark jaspertheghost: man git checkout19:09
gitinfo jaspertheghost: the git-checkout manpage is available at http://jk.gs/git-checkout.html19:09
→ basiclaser joined19:09
← eletuchy left19:09
jaspertheghost there is no -u option in the man page19:10
though i know there is a -u option19:10
err19:10
sorry19:10
my pad19:10
i was looking for git push -u19:10
bad*19:10
PerlJam jaspertheghost: when you run "git checkout branch", if your remote has a branch of the same name, git will automatically make a tracking branch. IF you want to have a same-named branch that doesn't track, use19:10
codeurge_ → codeurge19:11
PerlJam "git branch branchname"19:11
jaspertheghost so if i have a non tracking brenach and wanna make it track whatever i can do19:11
git push -u origin/branch_name localbranchname ??19:11
← liuzhoou left19:11
← hyperair left19:13
→ c74d joined19:13
→ paulweb515 joined19:13
→ the_hugme1 joined19:13
→ teran joined19:14
→ axl_ joined19:14
← DolpheenDream_ left19:14
← chrisshattuck left19:14
← the_hugme left19:14
← zapotek6 left19:15
← sdwrage left19:15
jaspertheghost ok so everyone is in agreance here from earlier … better to have 1 repo … dev,staging, and production branches and use rsync to grab those branches for deployment?19:15
← erikruthven left19:16
← axl_ left19:16
→ Vinnie_win joined19:16
→ chrisshattuck joined19:16
→ nnyk_ joined19:16
← lolmaus left19:16
→ axl_ joined19:17
← the_hugme1 left19:18
← c74d left19:19
→ codeurge_ joined19:19
← mike_af_ left19:20
← codeurge left19:21
codeurge_ → codeurge19:21
→ Sleepy63 joined19:22
→ zhuang_ joined19:22
← zhuang_ left19:22
→ c74d joined19:23
→ sdwrage joined19:23
← momomomomo left19:24
← robzilla left19:24
← chrisshattuck left19:25
→ Polymor__ joined19:26
← m0viefreak left19:26
→ m0viefreak joined19:27
jaspertheghost what are the pros and cons to having multi repositiroeis?19:27
c74d → Guest3455319:27
Vinnie_win Local or remote?19:28
jaspertheghost remote19:28
well shit both actually now im curiius19:28
← jackneill left19:28
← Guest34553 left19:28
→ c74d joined19:29
Vinnie_win Usually you use one repository per project19:29
← rjc left19:29
jaspertheghost ok .. thats what i think I'm going to do then… its just i saw this one deployment thing and then were literally using 1 repo for staging 1 for production and 1 for testing19:30
← FreezingCold left19:30
Vinnie_win That sounds like a hassle19:30
plasticle you could just do branches19:30
jaspertheghost it was confused the hell out of it19:30
→ chrisshattuck joined19:30
← lsiv568 left19:31
jaspertheghost i guess if u have a lot of branches though… u can then have a cleaner staging/production environment no?19:31
← blinkdesign left19:31
← dob1 left19:31
→ Neozonz joined19:32
← Neozonz left19:32
→ Neozonz joined19:32
Vinnie_win I'm trying to resolve a merge conflict by just overwriting "ours" with "theirs". But after a checkout --theirs on the directory, the files still have the conflicts! When I checkout --theirs on conflicted files individually, they get updated correctly. How do I do a bulk checkout to "theirs?" See: http://codepad.org/NitCwqeb19:32
→ lsiv568 joined19:33
jaspertheghost -X19:33
← Ardenzi left19:33
Vinnie_win jaspertheghost: Unknown option "X"19:33
→ _Vi joined19:34
→ marthinal joined19:34
→ txomon|home joined19:34
← c74d left19:35
jaspertheghost hmm idk then19:35
when u find out let me know19:35
cause thats something I'm sure ill run into19:35
Vinnie_win Maybe grep -lr '<<<<<<<' . | xargs git checkout --theirs19:35
← vijay13 left19:35
jaspertheghost that might work19:36
→ frobrob joined19:36
→ blinkdesign joined19:36
→ tswett joined19:36
← tswett_ left19:36
→ Neozonz|Disc joined19:36
← Neozonz|Disc left19:36
→ Neozonz|Disc joined19:36
← Neozonz|Disc left19:37
jaspertheghost http://stackoverflow.com/questions/173919/git-merge-s-ours-what-about-theirs19:37
looks promising19:37
→ Guest92822 joined19:37
→ HassanCehef joined19:37
jaspertheghost git merge -s recursive -X theirs B19:38
← blinkdesign left19:38
← RofricTheBearded left19:38
Vinnie_win I'm not merging a branch though, I"m going through conflict resolution19:38
← ValicekB left19:39
← Neozonz left19:39
← fenerlitk left19:39
← Joost` left19:40
→ Spamoi joined19:40
→ Iniesta8 joined19:41
→ Kitty-- joined19:42
← Hardcheese left19:42
m0viefreak Vinnie_win19:42
git checkout --theirs works just fine for directories19:42
← Kitty-- left19:42
→ Nicholas_Rishel joined19:42
→ pen joined19:43
→ Joost` joined19:43
← Joost` left19:43
→ Joost` joined19:43
← nnyk_ left19:43
← kermit left19:44
← Kitty- left19:44
Vinnie_win m0viefreak: But when I do that, the files in question still have conflicts19:44
→ Kitty- joined19:44
m0viefreak not here19:44
jaspertheghost maybe u goat do a *19:44
or a /19:44
?19:44
← chrisshattuck left19:44
← Kitty- left19:45
→ Kitty- joined19:45
jaspertheghost I'm new here so im just guessing19:45
Vinnie_win I tried everything. grep / xargs finally fixed it.19:45
Kitty- Hi all, any advice with the following? http://pastie.org/9176025 I have a feeling it is something really simple.19:45
← tswett left19:45
→ tswett joined19:45
← sluther left19:45
→ FreezingCold joined19:45
→ kenneth joined19:46
m0viefreak Vinnie_win: http://sprunge.us/RXIH19:46
works just fine19:46
_ikke_ Kitty-: does the dev user have a directory called gitrep.git inside it's home dir?19:46
Kitty- checks19:46
→ Kayra joined19:46
Kitty- _ikke_: yes19:46
← davividal left19:46
← mikecmpbll left19:47
← LBV_User left19:47
_ikke_ Kitty-: And does the dev user has access to that directory?19:48
← teran left19:48
Kitty- _ikke_: yes and if it matters, there is a hkay directory inside of gitrep. Inside of hkay I see there is .git19:48
← txomon|home left19:49
→ teran joined19:49
_ikke_ Kitty-: Yes, that does matter19:49
→ nDuff joined19:49
gitinfo set mode: +v19:49
rishabh_ hi19:50
gitinfo rishabh_: 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:50
Kitty- _ikke_: gotcha, then perhaps I'm missing something. Any examples would be much appreciated. I have a feeling it's that the command I'm giving is not referencing the dir correctly19:50
← tyrannosaurus_be left19:50
← LucasKA left19:50
→ Skrypter joined19:50
_ikke_ Kitty-: It looks like you created the gitrep.git directory yourself, and put the repo in it?19:50
← tvw left19:51
← Kayra left19:51
← maveneagle left19:52
Kitty- _ikke_: this is what I have http://pastie.org/917605219:53
← teran left19:53
rishabh_ I was trying to fetch upstream, this error shows up naming each branch in upstream,19:53
cant resolve references refs/remotes/upstream/branchname19:53
_ikke_ Kitty-: I'm missing the directories these outputs are from. Where was the seconnd ls from?19:54
← kesha left19:54
← devoldmx left19:55
→ devoldmx joined19:55
→ ValicekB joined19:55
← Iniesta8 left19:55
→ oodavid joined19:57
→ HSaka joined19:58
← marthinal left19:58
← Kicer86 left19:59
Kitty- _ikke_: let me use pwd... http://pastie.org/917607319:59
→ Gavrisimo joined20:00
→ thumpba_ joined20:00
← FortySix2 left20:01
_ikke_ Kitty-: Ok, it looks like you have two repositories inside there20:01
→ hebz0rl joined20:01
← Joost` left20:01
→ brent joined20:01
_ikke_ Kitty-: Note that the first directory is called gitrep, not gitrep.git20:01
Kitty- k20:02
→ FortySix2 joined20:02
← FortySix2 left20:02
← mattstratton left20:02
→ Entomo joined20:02
→ quizme joined20:02
→ txomon|home joined20:02
rishabh_ kitty: could you please help , I was trying to fetch upstream, this error shows up naming each branch in upstream, cant resolve references refs/remotes/upstream/branchname20:03
→ saorge_ joined20:03
← thumpba_ left20:03
rishabh_ I tried git remote prune upstream , doesnt help20:03
← p8952 left20:03
Kitty- _ikke_: I guess the missing piece is that I don't know how to specify a 'path' with the sub-dirs. hmmm20:03
_ikke_ Kitty-: What is that hkay directory?20:04
quizme when you say "git checkout branch1; git pull --rebase master" in English, is it proper to say "I rebased master onto branch1" or do you say "I rebased branch1 with master." ?20:04
← xsbeats left20:04
_ikke_ quizme: You rebased branch1 onto master20:04
← Gavrisimo left20:04
→ bunbury joined20:04
← garvank left20:05
Kitty- _ikke_: I tried http://pastie.org/9176092 with no such luck20:05
Kitty- glances up20:05
← axl_ left20:05
→ sinkensabe joined20:05
Kitty- _ikke_: the hkay dir is where I'd like the repo to live20:05
→ glebihan_ joined20:05
← pen left20:05
← Polymor__ left20:05
_ikke_ And that gitrep directory itself then? Because that's a so called bare repository20:06
→ garvank joined20:06
Kitty- repo or um files I guess20:06
→ hellopat joined20:06
→ eletuchy joined20:06
Kitty- _ikke_: I"m still getting used to my git nouns. I mean had imagined the getrep is where the repo would be and the hkay would be my project20:06
← Nicholas_Rishel left20:07
Kitty- hkay would be where my project files lives although nothing is there right now since I haven't pushed anything20:07
→ axl_ joined20:07
_ikke_ Kitty-: Those files shouldn't be like that on the server20:08
→ psoo_ joined20:08
→ Joost` joined20:08
← Gizburdt left20:08
→ Gizburdt joined20:08
Kitty- _ikke_: fair enough, when I specify just gitrep in the git push, I get a new error so I'm closer20:08
yaay20:09
\o/20:09
_ikke_ What is the new error?20:09
Kitty- I will fix the dirs once I can push but for now I will look at the new error20:09
← vtunka left20:09
Kitty- _ikke_: It doesn't like the path20:09
/.config/git/config': Invalid argumentles (x86)\ICW\home\dev\20:09
fatal: Could not read from remote repository.20:09
← Joost` left20:09
Kitty- I'll take a look at that, thank you for your help20:09
_ikke_ ok20:10
← Gizburdt left20:10
_ikke_ succew20:10
→ Gizburdt joined20:10
_ikke_ Success*20:10
Kitty- yea :)20:10
go team!20:10
→ agrajag42 joined20:10
← jhulten left20:10
→ kermit joined20:10
← hellopat left20:11
← eletuchy left20:11
← nathancahill left20:11
← danecando left20:11
→ polyzen joined20:11
→ dangayle joined20:11
→ Gavrisimo joined20:12
→ ghostlin_ joined20:13
→ fragamus joined20:13
→ p8952 joined20:14
← p8952 left20:14
→ p8952 joined20:14
← JacobHayes left20:14
→ tyrannosaurus_be joined20:15
→ EminenceHC joined20:16
→ rjc joined20:16
→ alvaro_o joined20:17
→ nathancahill joined20:19
→ c74d joined20:19
→ Silox| joined20:20
← phretor left20:21
→ phretor joined20:21
← Xethron left20:21
→ recycle joined20:23
→ godgodgodgo joined20:23
← bwreilly left20:23
← aspiers left20:24
→ acharlieh joined20:24
→ the8thbit joined20:26
← Gamecubic left20:27
→ jstimm joined20:28
← jstimm left20:28
← HSaka left20:28
← toomanysecrets left20:28
→ jayrobot joined20:28
← kburdett left20:29
→ jstimm joined20:29
→ fenerlitk joined20:29
← bambams_ left20:29
← nathancahill left20:29
→ kburdett joined20:29
→ kcj joined20:30
→ nathancahill joined20:30
jaspertheghost anyone here use a sperate repo for there production code?20:30
Silox| jaspertheghost: Why not use a branch for that?20:31
→ erikruthven joined20:31
jaspertheghost well I'm thinking that ill more than likely have a lot of branches that i may push in and out of staging20:32
and well having production as its own separate repo would keep it clean20:32
mmattice but then you have no easy way to diff production against dev20:33
← fragamus left20:33
jaspertheghost can't do that by having it as a remote repo in git?20:33
→ sohail_ joined20:33
← matheus23 left20:33
← chiromante left20:34
→ jnavila joined20:34
jaspertheghost git diff master remote/master20:34
→ Zariel joined20:34
jaspertheghost git diff master remote2/master20:34
no?20:34
→ dangerousdave joined20:34
← FunkyAss left20:35
→ Ariadeno joined20:35
→ Octalot joined20:35
← jottr_ left20:35
mmattice afaik, they have to be derived from the same repo base to make that permissible, so you're essentially using different branches anyway20:35
→ bwreilly joined20:37
→ philoserf joined20:37
jaspertheghost mmattice?20:37
mmattice you, at some point, pushed that repo to both remote and remote2, right?20:37
← mizu_no_oto left20:38
← Ankhers left20:38
→ Arkaniad joined20:38
jaspertheghost i would assume yes (right now I'm going over hypotheticals to see what is going to work of rme)20:38
→ veebers joined20:39
→ jhulten joined20:39
← sohail_ left20:40
← cjsarette left20:40
← nathancahill left20:40
← ferreum left20:40
→ sohail_ joined20:41
← shvelo left20:41
→ Kayra joined20:42
← daedeloth left20:42
→ blackmesa joined20:42
→ robzilla joined20:42
← shruggar left20:43
← sohail_ left20:43
→ cjsarette joined20:43
← bwreilly left20:43
jaspertheghost and can someone please explain what get fetch does exactly i have forgotten?20:44
→ psoo joined20:44
← Zariel left20:44
← antons left20:44
→ Joost` joined20:44
→ cagedwisdom joined20:45
→ jhulten_ joined20:46
→ kyb3r_ joined20:46
← psoo_ left20:46
← jhulten_ left20:47
→ jhulten_ joined20:47
← Gizburdt left20:47
→ Gizburdt joined20:48
← Ariadeno left20:48
← rgr left20:48
osse jaspertheghost: updates origin/master, origin/foo, otherplace/bleh etc.20:48
← jhulten left20:48
jaspertheghost ok thought so … just won't upload my local branches20:49
or other checkouted brnaches20:49
osse that's push's job20:49
jaspertheghost i learned all this like 6 months ago… and then forgot it all since i didn't use it… andy ow I'm about ready to get a dev env setup and deployment and all20:49
so I'm going over everything to relearn it real quick and get this setup20:49
osse whats your taking on using multi's remotes/repo20:50
for isolating production from staging from dev....20:50
or are u a proponent of just using branches as well20:50
osse makes sense20:50
← rfoust left20:51
osse it doesn't really matter. conceptually there isn't that much difference between remote/branch_1 remote/branch_2 and remote_1/branch remote_2/branch20:51
← Exancillatus left20:51
← philoserf left20:51
→ Gamecubic joined20:52
← Gizburdt left20:52
→ bwreilly joined20:53
osse but stay away from using a repo in "prod"20:53
← dangerousdave left20:54
→ harobed joined20:54
→ Gizburdt joined20:54
← mjsmith2 left20:54
← ValicekB left20:55
→ tpollard joined20:55
← SidFerreira left20:56
→ dowwie joined20:56
dowwie !backup20:56
gitinfo Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups20:56
→ Neozonz joined20:56
→ ciampix joined20:57
← digital-shokunin left20:57
→ whitby joined20:59
← sq-one left21:00
← dangayle left21:00
← shingshang left21:01
→ ValicekB joined21:01
← cjsarette left21:02
← ValicekB left21:02
→ nathancahill joined21:03
→ blinkdesign joined21:05
← HassanCehef left21:06
→ eletuchy joined21:07
← Gizburdt left21:08
→ ValicekB joined21:08
→ Gizburdt joined21:08
→ jay joined21:08
← kburdett left21:08
← axl_ left21:08
→ axl__ joined21:09
gitinfo set mode: +v21:09
→ kburdett joined21:09
jay Hey all, I pushed a folder that I know want to ignore, how do I go about that?21:10
osse jay: create a commit that deletes it and add it to .gitignore21:10
Wader do you want to remove it from the repo? or just ignore any changes to it now?21:10
jay remove it from the repo21:10
← Mitchbones left21:11
← livingstn left21:11
→ cjsarette joined21:11
Wader git rm --cached /dir then add to your .gitignore21:11
the --cached option will keep the files locally but remove them from git21:11
← eletuchy left21:11
jay ok, i've never ignored, does .gitignore go into the main directory?21:11
osse jay: you can put it anywhere you like.21:12
Wader .gitignore can go anywhere and will apply to any folders in the same dir or lower21:12
osse jay: but in many cases you only need one, so putting it at the top makes sense21:12
← SHyx0rmZ left21:12
← Gavrisimo left21:12
jay fatal: not removing '.vagrant/' recursively without -r21:13
the folder is hidden21:13
Wader add the -r flag to the git rm command21:13
osse Git tells you how to fix it in the error itself21:13
→ jottr_ joined21:13
← scampbell left21:13
← psoo left21:14
← oodavid left21:14
→ psoo joined21:14
← mishok13 left21:14
jay thank you, now what do I add to the .gitignore file?21:14
Wader just /.vagrant21:15
jay thanks!!!21:15
← bwreilly left21:15
← lsiv568 left21:16
← psoo left21:17
← bartman`` left21:17
→ the_hugme joined21:18
→ rfoust joined21:19
→ Ethix joined21:19
← PeterBooker left21:20
← ciampix left21:21
← rudisimo left21:21
→ Rastus_Vernon joined21:21
→ _rgn joined21:21
→ FortySix2 joined21:22
← snql left21:22
← nath_schwarz left21:23
← nathancahill left21:23
← axl__ left21:24
→ nath_schwarz joined21:24
→ kishanio joined21:24
← Fandekasp left21:24
→ axl_ joined21:25
← SegFaultAX left21:25
→ mizu_no_oto joined21:25
kishanio im trying to checkout one of the older verison of the project by git checkout but turns out it says i cant since i need to delete untracked files or move them21:25
→ Reskp joined21:25
← jaspertheghost left21:25
kishanio when i do git status i don't see any untracked files21:26
can someone help/guide me to resolve this21:26
because im scared i don't want to lose any files that i might need later21:26
← mennea left21:26
→ ilyam_ joined21:27
← ilyam left21:28
ilyam_ → ilyam21:28
← c74d left21:28
← axl_ left21:29
← Kayra left21:30
→ SegFaultAX joined21:30
← the_hugme left21:30
← Guest92822 left21:31
← Neozonz left21:31
← nDuff left21:31
→ c74d joined21:33
← jnavila left21:34
→ nDuff joined21:35
← kermit left21:35
→ Iniesta8 joined21:35
→ axl_ joined21:36
← m8 left21:36
← frobrob left21:37
← erikruthven left21:37
→ m8 joined21:38
→ cilly joined21:38
← jay left21:38
← axl_ left21:38
→ freeman42 joined21:39
← EminenceHC left21:39
← fr33 left21:39
→ Ivo joined21:40
→ jovy88 joined21:40
← [2]nick left21:40
osse kishanio: your untracked files are probably ignored, and you're trying to checkout files by the same name21:40
→ rektide joined21:41
osse kishanio: so maybe some files where present in the earlier commit but not in the current21:41
→ EminenceHC joined21:41
rektide how do i get all the diffs between two revisions?21:42
osse rektide: git diff revision1 revision221:42
→ Neozonz joined21:42
← amcsi left21:42
rektide ah, mercy, i was just in the wrong directory21:42
→ CraigyDavi joined21:42
rektide 'fatal: ambiguous argument 'cbbc48d31d40e6ce5': unknown revision or path not in the working tree.' <-- i didn't beleive it21:43
→ Gavrisimo joined21:43
kishanio osse: Yes i think so thats an issue. im scared to do a force checkout21:43
rektide & all the exmaples i was running into had a '-- file.c' at the end21:43
osse kishanio: I can't do anything with that. doesn't git checkout give you a list of files that cause the issue?21:44
← kcj left21:44
osse kishanio: you can use git archive to create a tar of a previous commit. then you can extract it somewhere else21:44
← rektide left21:44
→ pasky joined21:44
← Pullphinger left21:44
← carandraug left21:45
kishanio osse: it does give me list of the files.21:46
→ ciampix joined21:46
kishanio i just have to fix a bug in earlier verison21:46
and switch back to master21:46
osse kishanio: then you know which files you need to take a backup of21:46
← CraigyDavi left21:46
osse or you can even create a seperate clone to do the work21:46
or fix the bug in the current version21:46
← JerryT left21:47
kishanio osse: yes i guess sepearate clone is the safest way to do. I cant do it in the current version since the older version is tracked by gerrit or something.21:47
← Gavrisimo left21:48
← Neozonz left21:48
kishanio osse: but thanks for this. really appreciate it. :)21:48
← m0ltar left21:48
← Anders_J left21:48
→ teran joined21:50
← Foldager left21:52
← Gamecubic left21:52
← teran left21:54
→ decompiled joined21:54
→ hellopat joined21:54
← dccc left21:55
← allay left21:57
→ allay joined21:57
→ kermit joined21:57
← Anatidaephobia left21:58
→ vladikoff joined21:58
← Gizburdt left21:58
← hellopat left21:58
→ jay joined21:59
→ Neozonz joined21:59
vladikoff hey, I'm using `git tag -l -n [pattern]`. I have tags: 0.1.0 and 0.1.0-something. How do I only list "0.1.0"? git tag -l -n '*.*.*' lists both. should I use --regex or something?21:59
← allay left22:00
← LeMike left22:00
→ allay joined22:00
← armyriad left22:00
→ Dottimolly joined22:01
← ngladitz left22:01
← vanillajohn left22:02
→ ezekielnoob6 joined22:02
← jovy88 left22:03
→ jovy88 joined22:04
← mizu_no_oto left22:05
→ Gamecubic joined22:05
← upene left22:06
← CKyle left22:06
← Neozonz left22:07
← Iniesta8 left22:07
→ eletuchy joined22:08
← pantsman left22:08
→ ezekielnoob7 joined22:08
→ watermel0n joined22:09
← Silox| left22:09
← MadLamb left22:10
← ezekielnoob6 left22:11
→ momomomomo joined22:11
← eletuchy left22:12
← souther left22:13
← Oran left22:13
→ souther joined22:13
→ danecando joined22:14
← zumba_addict left22:14
→ Balliad joined22:14
→ zumba_addict joined22:15
← ojacobson left22:15
← fatalhalt left22:16
← blinkdesign left22:16
→ DolpheenDream_ joined22:16
→ blinkdesign joined22:17
Vampire0 vladikoff, I don't think it is possible, at least not with "git tag" porcellaine. Maybe with some plumbing. Or you pipe the result of git tag with pattern through grep22:17
→ Mitchbones joined22:17
→ wavis joined22:18
→ Neozonz joined22:18
→ alexlind_ joined22:18
vladikoff Vampire0, oh ok. I'm trying to create a date changelog. Get version tags, get their dates, list all commits that happened between those dates in a style manner22:18
→ Celm_ joined22:19
wavis how do I use git in a script to check if a file is different than HEAD?22:19
← blinkdesign left22:21
← alexlindenlevy left22:21
← nDuff left22:22
← Celm left22:23
→ thumpba_ joined22:23
← phretor left22:23
← Neozonz left22:24
← jarr0dsz left22:24
← jluc left22:24
whitby wavis: I'm not sure if git-diff changes its status code.22:25
Maybe diff the file and check if the output is not empty?22:25
→ nnyk_ joined22:27
→ allay_ joined22:27
← thumpba_ left22:28
← alp82 left22:28
whitby Maybe `git diff --raw` as another option?22:28
← Reskp left22:28
← c74d left22:29
← nfk left22:29
← FortySix2 left22:30
← hebz0rl left22:30
→ armyriad joined22:30
→ Gavrisimo joined22:31
← nnyk_ left22:32
wavis It seems I should be able to hook git status somehow for a single file22:33
this does work though22:33
→ arvind_k joined22:33
wavis [ "`git diff web/index.html |head -1`" = '' ] && echo same || echo different22:33
← bakflash left22:33
← vire left22:34
← allay_ left22:34
← allay left22:34
← DolpheenDream_ left22:34
← leeN left22:34
m0viefreak wavis: git diff-index --quiet HEAD -- <file>22:34
wavis: that's awful22:35
always use plumbing commands in scripts22:35
→ Neozonz joined22:35
m0viefreak and dont parse any output22:35
← Gavrisimo left22:35
wavis m0viefreak: right, that's why i'm asking22:36
m0viefreak diff-index is a plumbing command, so use that22:36
← zoso left22:36
← vladikoff left22:36
m0viefreak --quiet implies --exit-code22:36
so simply checking the return value is enough22:36
← FreezingCold left22:37
m0viefreak if ! git diff-index --quiet HEAD -- myfile.c; then echo "file is modified!"; fi22:37
← drbean left22:37
← alexlind_ left22:37
whitby That's super nifty!22:37
← xenoterracide_ left22:37
→ drbean joined22:37
← jxf left22:37
wavis seems to be exactly what i'm looking for. thanks m0viefreak22:38
← Sonderblade left22:38
→ FreezingCold joined22:38
← LaserChicken left22:39
← dreiss left22:41
→ CKyle joined22:42
← polyzen left22:43
→ vanillajohn joined22:43
quizme _ikke_ thank you.22:46
← blackmesa left22:46
← sdwrage left22:46
← Dottimolly left22:47
← Guest61078 left22:47
→ Guest61078 joined22:47
Guest61078 → Korvin22:47
→ tieTYT2 joined22:47
tieTYT2 i submitted a pull request on master. Now I want this same fix to go to a branch of that project. How do I accomplish that?22:48
→ thumpba_ joined22:48
→ iliketurtles joined22:48
iliketurtles i just upgraded from 1.8.4.3 to 1.9.1, and I'm noticing a changed behavior. in 1.8.4.3 when I would `git checkout -b new_branch`, and `git push -u origin new_branch`, 1.8.4.3 would create a new branch in the origin remote. In 1.9 it just says `Branch git_1.9_test_branch set up to track remote branch master from origin by rebasing.` Why is this?22:48
→ polyzen joined22:49
← jftf left22:49
← wrouesnel1 left22:49
← tswett left22:50
← rishabh_ left22:52
← DrShoggoth left22:53
→ pierre1_ joined22:54
→ OffTheRails joined22:54
→ c74d joined22:55
← treehug88 left22:55
→ FortySix2 joined22:57
← m8 left22:59
→ Reskp joined22:59
iliketurtles i expanded upon my question on stackoverflow with code examples: http://stackoverflow.com/questions/23666510/git-1-9-remote-push-u-changes22:59
← zzing left22:59
→ zzing joined22:59
→ mizu_no_oto joined22:59
→ Ariadeno joined23:01
→ Quevin joined23:02
→ hellopat joined23:03
→ endiruna joined23:03
→ woollyams joined23:03
→ howitdo joined23:04
← howitdo left23:04
→ howitdo joined23:04
← Reskp left23:04
← King_Hual left23:04
→ wrouesnel1 joined23:04
← iliketurtles left23:05
← shinnya left23:06
← wavis left23:06
→ sinusss joined23:06
→ zivester joined23:07
← nkouevda left23:07
← Neozonz left23:07
sinusss hi can I alias git branch so that when the branches displayed i get something like http://mysite.com/<branch_name>23:07
→ nkouevda joined23:08
→ shinnya joined23:08
→ eletuchy joined23:08
PerlJam sinusss: yes23:08
sinusss PerlJam: how?23:09
PerlJam sinusss: you can write your own command that does what you want and alias git branch to that.23:09
← eletuchy left23:10
→ ojacobson joined23:10
→ Freeman42x joined23:10
← nkouevda left23:12
← anry left23:12
← MafooUK left23:12
← c74d left23:12
← FortySix2 left23:12
sinusss PerlJam: how? guide me to some docs?23:12
← Sample_ left23:12
← mizu_no_oto left23:12
← polyzen left23:12
← Sample left23:12
← thumpba_ left23:12
→ bwreilly joined23:13
← Exio4 left23:14
← freeman42 left23:14
→ xenoterracide_ joined23:15
← elbeardmorez left23:15
← Not_Whatever left23:16
← txomon|home left23:16
→ Exio4 joined23:17
← jagob left23:18
→ Neozonz joined23:19
← harobed left23:19
→ franziep joined23:19
← kishanio left23:21
← franzip left23:21
← chrisg_ left23:22
← watermel0n left23:22
mattcen !alias23:22
gitinfo [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.23:22
mattcen awww23:22
sinusss: Check the !git-config page for aliases23:23
s/page/manpage/23:23
→ ascarter joined23:24
→ jaspertheghost joined23:24
← fenerlitk left23:24
← Neozonz left23:24
→ chrisg_ joined23:25
← chrisg_ left23:25
← endiruna left23:26
← Balliad left23:26
→ _W_ joined23:27
→ rotta joined23:28
← sinusss left23:28
← pierre1_ left23:29
← woollyams left23:30
← ciampix left23:31
← codeurge left23:32
→ woollyams joined23:32
← vanillajohn left23:32
→ Gavrisimo joined23:32
← tang^ left23:33
→ vanillajohn joined23:34
→ tswett joined23:34
← tswett left23:34
→ tswett joined23:34
→ eletuchy joined23:34
← qwyeth left23:35
← cjsarette left23:36
← devoldmx left23:36
← rfoust left23:36
← Gavrisimo left23:37
← OffTheRails left23:37
→ c74d joined23:37
→ OffTheRails joined23:37
← whitby left23:38
→ jagob joined23:38
→ rfoust joined23:39
← acharlieh left23:39
← brent left23:41
→ cjsarette joined23:41
← cjsarette left23:41
→ acharlieh joined23:41
→ Lyqyd joined23:43
→ cjsarette joined23:44
→ jedichu joined23:45
→ jftf joined23:45
← jedichu left23:46
← jftf left23:50
→ hgl joined23:52
← agrajag42 left23:53
→ mark_t joined23:53
→ acl_ joined23:53
→ sdwrage joined23:53
mark_t Can git-1.7.1 safely work directly on repositories created with 1.9.0?23:53
imMute first thought is yes.23:54
mark_t imMute, looks like you're right. Everything works normally so far.23:55
← Fall left23:55
← hgl left23:55
← acharlieh left23:55
→ hgl joined23:56
← Quevin left23:56
← oonska left23:56
← vanillajohn left23:57
→ kaffeetrinkerMD joined23:57
→ otter768 joined23:58
← kaffeetrinkerMD left23:58
→ acharlieh joined23:59
→ scarabx joined23:59

Logs Search ←Prev date Next date→ Channels Documentation