IRCloggy #git 2013-04-28

Logs Search ←Prev date Next date→ Channels Documentation

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

2013-04-28

← jyp left00:00
← relipse left00:00
→ chuckharmston joined00:00
← p3lim left00:01
→ relipse joined00:04
→ AdrienBrault joined00:05
cbreak git pull won't create untracked files.00:05
manual conflict resolution can result in it00:05
→ netto joined00:05
→ rabellamy joined00:06
→ etcetera joined00:06
← afuentes left00:06
← piToM left00:06
→ piToM joined00:07
← DonRichie left00:07
← rednaks left00:07
→ DonRichie joined00:08
← dustmason left00:10
← caspingus left00:11
← knite left00:11
← Esa_ left00:11
← Dougie187 left00:12
→ OliverJAsh joined00:13
→ caspingus joined00:13
OliverJAsh i have a git submodule and for some reason master is suddenly behind HEAD http://cl.ly/image/230D3K2a2j1I/content00:13
is this something to do with submodule behaivour?00:13
← netto left00:13
cbreak yes00:14
you probably did a git submodule update00:14
that fetched new stuff and moved HEAD00:15
OliverJAsh cbreak: hmm actually i made that commit00:15
cbreak where a submodule is intended to point at my a parent is independent of branches00:15
normally, submodules are not even on a branch00:16
so, if you made it, why do you wonder why you have it?00:16
OliverJAsh i made the commit but i'm used to git moving the master branch tip forward when i make a commit00:16
it seems like it's the first time it's happened in this submodule.00:16
← oracal left00:17
→ jdunck joined00:18
→ vsayer_ joined00:18
cbreak git only changes the current branch00:18
in a submodule, you usually do not have a current branch00:18
you are in a detached HEAD state00:18
!detached00:18
gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach00:18
cbreak in submodules that's normal. So if you want to commit, switch to a branch before committing00:19
also, if you commit in a submodule, you have to register that new commit in the parent repository00:19
cd into it, then git status, git add submodulenamehere, git commit00:19
→ freestyler7 joined00:20
← vsayer left00:20
← hwrd|work left00:21
← sirdancealot left00:23
→ netto joined00:24
← Thra11 left00:25
→ pppaul joined00:25
← warthog9 left00:27
→ pandeiro joined00:28
→ Kje10L joined00:28
← m8 left00:28
→ curvedmark joined00:30
← Kje10L left00:33
← rideh left00:33
→ enr joined00:34
→ ldiamond joined00:37
→ hwrd|work joined00:38
→ Noldorin joined00:38
← netto left00:39
← gusnan left00:39
→ warthog9 joined00:39
→ rideh joined00:41
← R1KRDO left00:41
← enr left00:42
← jdunck left00:42
← eletuchy left00:43
→ eletuchy joined00:43
→ Gentlecat joined00:43
→ AustinMatherne joined00:46
→ knite joined00:46
← Artpicre left00:48
← weerdlogic left00:51
→ shruggar joined00:52
← adamben left00:53
← LekeFly left00:53
← etcetera left00:53
offby1 sitaram: I'm at a conference; gonna sit in on a gitolite talk tomorrow just for fun. (http://linuxfestnorthwest.org/content/git-server-gitolite)00:55
→ jyp joined00:55
→ rickruby joined01:02
← michaelmartinez left01:04
→ jdunck joined01:04
→ oojacoboo joined01:04
→ TomyLobo joined01:06
→ Gooder` joined01:06
← steffo left01:06
TomyLobo hi01:06
← AdrienBrault left01:06
→ reaoulen joined01:07
← oojacoboo left01:07
→ sirdancealot joined01:08
→ thong joined01:09
← Gooder left01:09
← caspingus left01:10
→ netto joined01:12
← hwrd|work left01:14
→ erkules_ joined01:15
← rickruby left01:16
← sirdancealot left01:17
→ caspingus joined01:17
← erkules left01:18
← reaoulen left01:18
→ sebrock joined01:19
← elixir left01:19
→ hwrd|work joined01:19
← carldanley left01:20
→ reaoulen joined01:20
→ InvidFlower joined01:20
→ rickruby joined01:20
← hwrd|work left01:20
→ sirdancealot joined01:21
→ R1KRDO joined01:22
→ FabTG joined01:22
← netto left01:22
← piToM left01:23
← rickruby left01:23
→ piToM joined01:23
← shruggar left01:23
→ infynyxx joined01:24
← Entomo left01:24
← FabTG_ left01:25
← m_ke left01:25
→ m_ke joined01:25
← leeN left01:25
← R1KRDO left01:26
← sebrock left01:27
← piToM left01:27
← amcsi left01:28
← aberrant left01:28
← reaoulen left01:28
→ Kje10L joined01:29
→ Gooder`` joined01:33
→ Vampire0 joined01:33
← goshawk left01:34
← Vampire0_ left01:34
← holo left01:35
→ jalama joined01:35
← Sigma left01:35
→ chanel88 joined01:36
← Gooder` left01:36
← DonRichie left01:36
← Kje10L left01:36
sitaram offby1: cool; let me know how it goes!01:37
→ enr joined01:39
← chanel88 left01:40
→ mklappst_ joined01:41
→ netto joined01:41
← stoned left01:41
← bmac left01:42
← enr left01:43
← chuckharmston left01:44
← cenuij left01:46
← chamunks left01:49
→ bytephilia joined01:49
← jdunck left01:49
→ luc_ joined01:51
← ldiamond left01:53
← relipse left01:54
→ jaequery joined01:54
→ R1KRDO joined01:54
← crankycoder left01:55
← R1KRDO left01:55
← jaequery left01:55
→ Astraea joined01:55
Astraea Git newbie here.01:56
Anyone mind helping me with a problem?01:56
bob2 !ask01:56
gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.01:56
Astraea I want to update my home computer with files from github, based on code I committed at work.01:57
How I've been doing this is to delete the old .git directory, and then clone it all over again :/01:57
bob2 that's pretty ridiculous01:57
why didn't you just do 'git push' and 'git pull'01:57
← ScottG left01:57
← rakl left01:58
Astraea Because when I look for help online, I find answers like this one: http://stackoverflow.com/questions/6373277/git-sync-local-repo-with-remote-one01:58
← pppaul left01:58
bob2 which git tutorial did you read?01:58
Astraea Couldn't tell you. I learned enough to be able to commit from my computer, which was all that was needed of me.01:59
Later, when I wanted to work at home, I cloned.01:59
bob2 sure01:59
then you do 'git pull'01:59
Astraea I'll go google that now.01:59
bob2 you'll need to read a git tutorial02:00
→ ScottG joined02:00
bob2 especially since I'm guessing git is your first version control system02:00
← dkpi left02:00
Astraea I've read several, I just don't remember which ones.02:00
Also, when you're not at a point where you need a feature, reading it doesn't lead to any understanding.02:01
You need to know why before how, is I guess what I'm saying.02:01
bob2 not sure how you'd use git without at least push, but ok02:01
Astraea GitGui.02:01
I click Scan -> Stage -> Commit -> Push.02:02
← luc_ left02:02
→ luc_ joined02:02
→ zky joined02:04
Astraea Crud. Have to run. Thanks for pointing me in the right direction!02:05
← Astraea left02:05
← Goplat left02:05
→ Tech163 joined02:06
← acharlieh left02:07
→ jaequery joined02:07
→ holo joined02:08
→ snitzr joined02:09
→ kcj joined02:12
→ dkpi joined02:12
← zky left02:12
← Nickwiz left02:13
← netto left02:15
← monaDeveloper left02:17
← TomyLobo left02:18
→ hwguy joined02:20
← snitzr left02:20
→ youneedme joined02:21
← tpayne left02:22
→ zky joined02:23
→ tpayne joined02:23
← jaequery left02:24
→ xiukun joined02:24
→ newbie joined02:25
← newbie left02:25
← hwguy left02:25
→ saj_root joined02:25
→ johnnyfuchs joined02:26
→ relipse joined02:27
← OliverJAsh left02:30
← _mnathani_ left02:31
→ zeshoem joined02:31
→ jaequery joined02:32
→ k4rtik joined02:32
→ netto joined02:32
saj_root → saj_root_02:33
→ Kje10L joined02:34
→ arvind_khadri joined02:34
→ piToM joined02:34
← eletuchy left02:35
← zky left02:35
← thong left02:35
→ echo-area joined02:35
→ eletuchy joined02:35
→ thong joined02:35
brrr → prator02:36
← ozette left02:36
← jalama left02:36
→ carlos-huang joined02:37
← sirdancealot left02:37
relipse i added .DS_Store to my .gitignore file but it is still detecting app/.DS_Store in the changes not staged to commit02:38
← saj_root_ left02:38
→ saj_root joined02:38
← mklappst_ left02:38
← Kje10L left02:39
← orafu left02:39
→ thongthong joined02:39
→ orafu joined02:39
← saj_root left02:40
kpreid relipse: that's because it got added previously02:40
← eletuchy left02:40
→ saj_root joined02:40
kpreid you need to explicitly delete it from the repository; git rm --cached, I think02:40
relipse oh ok, it said -f to force removal02:40
← thong left02:40
← saj_root left02:40
kpreid that's just it being cautious about deleting changes you care about02:41
→ saj_root joined02:41
← saj_root left02:41
→ saj_root joined02:42
→ therealGent joined02:43
relipse Please help me, i'm trying to pull but it says .DS_Store deleted in HEADC and modified in ef5... https://pastee.org/7gy9t02:43
was I not suppsoed to do git rm -f?02:44
→ aberrant joined02:44
→ timsnadden_ joined02:44
← saj_root left02:44
→ saj_root joined02:45
→ stoned joined02:45
kpreid you should commit the deletion first02:46
← saj_root left02:46
kpreid er, wait, you did02:46
ok, so that's just a merge conflict02:46
→ saj_root joined02:46
kpreid all you need to do is delete it again to tell git you really don't want that any more, and commit that02:46
← dkpi left02:46
saj_root can we gource a remote git repo without having a clone on my pc02:48
→ jeana joined02:48
← jeana left02:49
← jyp left02:50
→ jyp_ joined02:50
← thongthong left02:50
→ thong joined02:51
→ irqq joined02:51
offby1 depends. What does "gource" mean?02:53
← thong left02:53
← St_Marx left02:55
← netto left02:56
← prator left02:59
← doener left03:00
→ Pent joined03:00
← bytephilia left03:01
← caspingus left03:02
← timsnadden_ left03:02
→ flippo joined03:02
→ hwrd|work joined03:02
saj_root https://code.google.com/p/gource/03:04
← carlos-huang left03:05
offby1 saj_root: I strongly suspect you need to clone first03:05
→ eletuchy joined03:06
→ rowend joined03:08
→ mklappst_ joined03:09
← quazimodo left03:11
→ z8z joined03:11
← m_ke left03:11
saj_root offby1: i was talking about the .git that is initialized in the folder when you do a git init, i think gource uses that info03:12
offby1 yes, I was talking about that, too.03:12
like I said: Try It And See.03:12
saj_root k...03:12
→ sirdancealot joined03:13
→ netto joined03:13
← mmlac left03:14
→ avinashrbhat joined03:14
← avinashrbhat left03:14
← CodeShark left03:16
← freestyler7 left03:16
→ rakl joined03:16
← private left03:17
← AaronMT left03:17
← mklappst_ left03:17
← cod3r left03:18
← rabellamy left03:18
→ chamunks joined03:19
skorgon_ → skorgon03:19
← InvidFlower left03:20
← holo left03:21
← rowend left03:22
→ Chryyz joined03:22
→ huoxito joined03:26
← nathanr left03:28
← mloureiro left03:28
→ nishant joined03:29
← tallest_red left03:31
← chamunks left03:31
→ caspingus joined03:32
→ piToM_ joined03:33
→ Kje10L joined03:34
← piToM left03:34
→ dsdeiz joined03:34
→ m_ke joined03:35
← TheNotary left03:35
← the_cybersphinx left03:37
← Wulf left03:37
← therealGent left03:38
→ rowend joined03:38
← johnnyfuchs left03:38
← Kje10L left03:38
← warthog9 left03:40
← Tech163 left03:40
← caspingus left03:41
← netto left03:44
← _Harm_B_ left03:45
→ Saby joined03:46
→ _Harm_B_ joined03:46
← seanius left03:48
← kukks left03:48
→ Turicas joined03:49
→ seanius joined03:49
← rowend left03:49
→ inversion joined03:50
→ peddamat joined03:51
→ herdingcat joined03:51
→ xavier23 joined03:53
← xavier23 left03:54
→ xavier23 joined03:55
xavier23 Hi…… anyone know how to export git archive to a single file (eg. archive.git ) ? So i can download to another comp?03:56
← seanius left03:56
offby1 xavier23: "git-archive" does exactly that03:56
xavier23 offby1: thanks - i'll try it03:56
offby1 xavier23: it exports a _single tree_, though; not the whole repo with all its history.03:56
xavier23 offby1: what if i need the whole repo & history?03:57
offby1 then you want to run "git clone" on the other computer, or else just use "tar" or "gzip" to bundle up the .git directory03:57
using "tar" or "gzip" is fairly unusual, though. 95% of the time, "git clone" is the right thing.03:58
xavier23 Like this: git clone --bare ~/Dev/ruby/jekyll jekyll.git ?03:59
offby1: Also … is ~/Dev/ruby/jekyll the path to the development directory ?04:00
→ thong joined04:02
xavier23 * it turns out… its the path to the repo - for anyone interested04:02
offby1 yeah, I have no idea what ~/Dev/ruby/jekyll might be04:04
[-jon-] xavier23: you really want git bundle04:04
offby1 your "git clone" example doesn't copy a repo from one machine to another; instead, it copies a repo from one _directory_ to another, on the same machine.04:04
← nishant left04:05
[-jon-] git-bundle is what you want04:05
offby1 [-jon-]: only if there's no way to run "git clone", I'd say04:05
kpreid [-jon-]: eh? git bundle is for when you already have a pair of repos, isn't it? not for cloning04:05
offby1 that too.04:05
[-jon-] kpreid: you can clone a bundle04:05
kpreid Oh, I see.04:05
[-jon-] we use it to keep a repo that is offline in sync with our main repo04:05
kpreid [-jon-]: is that particularly better than copying the repository?04:06
offby1 weird04:06
kpreid for a clone, I mean04:06
← thong left04:06
offby1 [-jon-]: do you copy bundles onto that machine by hand, via a USB stick or something?04:06
xavier23 "we use it to keep a repo that is offline in sync with our main repo" ---> this is what I'm doing04:06
[-jon-] offby1: we have a portable hard drive casette04:06
offby1 xavier23: why offline? Super-ultra-security?04:07
[-jon-] xavier23: you probably want git-bundle if you intend on keeping it up to date04:07
bundle will let you package changes in a certain period, and apply them on the other side, without having to copy everything04:07
← m_ke left04:07
→ seanius joined04:07
← m0ltar left04:07
[-jon-] offby1: its likely a classified system, would be my guess04:07
offby1 [-jon-]: why go to all that effort? What's the benefit of having a git repo on a machine that has no network access?04:07
→ threesome joined04:07
xavier23 offby1: yes04:07
← Turicas left04:08
[-jon-] the whole world doesn't work on the internet04:08
offby1 but by definition the stuff you're copying to it, via "git bundle", is coming from the Internet, yes?04:08
xavier23 offby1: also. … I'm not in charge of the sys admin - i cannot make it available online04:08
[-jon-] no, you may have two development environments, one online and one offline04:08
offby1 hm, whatever.04:08
[-jon-] ours is a one way bridge. offline stuff is never coming out04:08
offby1 I wonder if there's a HOWTO or guide or something for this -- it sounds like it's reasonably common04:09
[-jon-] yeah, just read git-bundle...04:09
→ mthorn joined04:09
[-jon-] its literally designed for sneakernet04:09
offby1 second hit for the query "git offline": http://programmaticallyspeaking.com/offline-repository-sync-using-git-bundle.html04:09
[-jon-] the only annoying thing about git-bundle is that it doesnt copy remote branches04:10
→ Katafalkas joined04:10
gitinfo set mode: +v04:11
mthorn (hopefully) quick question: I've got a submodule in my repo and I'd like to change it to a specific branch rather than master. What's the best way to do that? The submodule is for twitter bootstrap, I'd like to switch over to the 3.0.0-wip branch.04:11
← xiukun left04:11
← flippo left04:13
→ jdunck joined04:14
← yacks left04:15
skorgon mthorn: isn't it: going to the submodue and checkout the other branch. go back to the superproject and commit the change of the submodule? (not sure though, i don't do a lot with submodules)04:15
mthorn skorgon, I can try that. I'm pretty new to git (coming from svn).04:16
→ Steelsouls joined04:16
← Steelsouls left04:16
← piToM_ left04:21
→ piToM joined04:21
→ yacks joined04:23
→ Tommy[D]_ joined04:23
← Tommy[D] left04:27
→ angelsl joined04:27
→ black_13 joined04:28
← yshh left04:28
→ rickruby joined04:29
← trusktr left04:29
black_13 how would merge a similar project from git hub into another project?04:29
→ deltab joined04:30
← yacks left04:30
← Sosumi left04:30
EugeneKay mthorn - what skorgon said sounds right04:31
← inversion left04:31
← Noldorin left04:32
← rickruby left04:33
→ rickruby joined04:34
→ Droolio joined04:34
→ Kje10L joined04:35
← rickruby left04:36
← mthorn left04:36
→ mmlac joined04:37
→ rickruby joined04:37
→ netto joined04:37
→ Xethron joined04:38
→ coasterz joined04:38
← Kje10L left04:39
← juanmabc left04:39
← m0viefreak left04:40
→ tjadc joined04:42
← spyro left04:43
← antijava left04:43
→ trusktr joined04:46
← rickruby left04:46
→ Sosumi joined04:46
→ WrathWolf joined04:46
→ rickruby joined04:48
→ spyro joined04:48
← madewokherd left04:48
→ Goplat joined04:49
← z8z left04:50
← rickruby left04:51
← netto left04:52
→ Dougie187 joined04:53
→ johnnyfuchs joined04:55
← Chryyz left04:59
→ yacks joined04:59
→ TheNotary joined05:02
← TheNotary left05:02
← falood left05:03
→ falood joined05:04
→ hoschi joined05:04
← black_13 left05:05
← SBoudrias left05:05
← Dougie187 left05:06
→ tjbiddle joined05:07
← knite left05:07
← eletuchy left05:08
→ xiukun joined05:08
→ eletuchy joined05:08
→ anyway joined05:08
← anyway left05:09
← Davey left05:10
→ carlos-huang joined05:14
→ nafg joined05:15
→ Mohsen_Hassani joined05:15
→ paolooo joined05:16
→ thatJasonSmith joined05:17
Mohsen_Hassani Hello guys. I'm new to git. By choosing a free git plan, I'm gonna let people see my projects files. Right? I mean the source codes...!? Is there any locks or something?05:17
→ CodeShark joined05:17
← hwrd|work left05:18
Mohsen_Hassani You know because of my country boycott, I can't do online payment to git, so my only choice is free plan. I'm worried my websites security methods would be available to people easily so that they can break my websites or something...!05:20
EugeneKay `git` is not a commercial product. Perhaps you're talking about Github?05:20
← heytrav left05:20
Mohsen_Hassani EugeneKay, oh yes, sorry!05:20
EugeneKay They do not offer private repositories for free; Bitbucket does.05:21
← jdunck left05:21
EugeneKay You can also store your repos on your own server. !gitolite is a great tool for managing them.05:21
gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/05:21
← CodeShark left05:21
→ pppaul joined05:21
Mohsen_Hassani wow...thanks! :)05:22
Do you prefer bitbucket or gitolite on my VPS?05:23
I mean since I'm new to linux and git, isn't it a hard work to install and configure it?05:23
← Masu left05:24
→ heytrav joined05:26
← Xethron left05:27
→ Xethron joined05:27
← saj_root left05:27
← threesome left05:29
← irqq left05:30
← thatJasonSmith left05:31
→ angelazou joined05:35
← infynyxx left05:35
→ Kje10L joined05:35
→ thatJasonSmith joined05:35
→ mklappst_ joined05:37
angelazou is there a sample script that allows me to create a post-receive hook on ubuntu?05:37
← Kje10L left05:40
← thatJasonSmith left05:41
← pandeiro left05:42
→ rickruby joined05:43
← rickruby left05:43
← tjbiddle left05:45
→ private joined05:45
→ doug_carmichael joined05:46
→ rickruby joined05:48
← johnnyfuchs left05:51
← mklappst_ left05:55
→ tjbiddle joined05:57
← curvedmark left05:58
← pppaul left06:00
→ vpopov joined06:02
→ dvide joined06:04
→ timsnadden joined06:05
← dsdeiz left06:05
← RigidWig left06:06
← jyp_ left06:07
→ jyp joined06:07
← tjbiddle left06:09
→ inversion joined06:09
→ irqq joined06:11
→ JeremyWei joined06:13
← angelazou left06:15
→ circa- joined06:17
→ curvedmark joined06:18
→ dsdeiz joined06:18
← eletuchy left06:21
→ eletuchy joined06:21
→ guiambros joined06:22
← bgerber left06:22
→ bgerber joined06:23
← Goplat left06:25
← rickruby left06:25
→ vedant joined06:25
← eletuchy left06:26
← rakl left06:27
← curvedmark left06:34
← mihamina left06:34
→ Kje10L joined06:35
← vedant left06:36
→ snql joined06:37
← echo-area left06:37
→ ThePawnBreak joined06:37
← tharkun left06:38
← Kje10L left06:40
→ echo-area joined06:40
→ tharkun joined06:43
→ Tilda2 joined06:43
← vpopov left06:45
→ juanmabc joined06:46
→ metts joined06:48
← rasto left06:48
→ St_Marx joined06:48
← dsdeiz left06:51
→ eletuchy joined06:52
← thiago left06:52
← simesy left06:53
→ nilg joined06:53
→ vedant joined06:55
→ rickruby joined06:57
→ Wulf joined07:00
← relipse left07:00
→ rasto joined07:01
→ caspingus joined07:02
← timsnadden left07:03
→ arietis joined07:05
← rickruby left07:05
→ Sigma joined07:05
→ r2jitu joined07:06
← nilg left07:06
→ simesy joined07:06
→ zky joined07:06
← caspingus left07:07
→ doener joined07:07
→ nilg joined07:08
← nilg left07:08
→ nilg joined07:09
→ nilg` joined07:10
← aberrant left07:13
→ drizzd joined07:13
→ pantsman joined07:16
← pantsman left07:16
→ pantsman joined07:16
← nilg` left07:16
← nilg left07:16
→ nilg joined07:17
→ MestreLion joined07:17
→ __alpaca joined07:18
johnw if I have branches on two remote repositories, can I determine their common ancestor without downloading either one entirely?07:19
← Tilda2 left07:19
← heytrav left07:20
← drizzd left07:21
→ heytrav joined07:21
MestreLion johnw: "without downloading" == without fetching the remotes?07:22
→ Niels___ joined07:23
→ curvedmark joined07:23
johnw correct07:24
→ rednaks joined07:26
← simesy left07:26
erkules_ → erkules07:27
→ rakl joined07:27
← JeremyWei left07:28
→ lavaman joined07:28
→ MetalMatze joined07:29
← mmlac left07:30
← Saby left07:33
→ Kje10L joined07:36
← private left07:37
← xiukun left07:38
→ yshh joined07:39
→ mklappst_ joined07:40
← Kje10L left07:40
→ Anders_J joined07:42
→ Balliad joined07:44
← r2jitu left07:44
Nevik johnw: no, since ancestry is saved by-commit07:45
i.e. every commit only refers to its direct parent(s)07:45
so you need all intermediate commits to determine any (possible) common ancestor(s)07:45
→ truexfan81 joined07:45
← arietis left07:45
→ naught101 joined07:46
truexfan81 would be funny if git had a laid command...just sayin07:46
bye now07:46
← truexfan81 left07:46
→ mklapps__ joined07:47
← rakl left07:47
← mklappst_ left07:47
→ sebrock joined07:48
← carlos-huang left07:49
Nevik lmao07:50
← nioncode left07:50
Nevik EugeneKay: what truexfan just said should go in the topic :P07:50
← juanmabc left07:50
← naught101 left07:50
← mklapps__ left07:52
→ mklappst_ joined07:52
→ h0bbit joined07:53
← kmels_ left07:54
← zky left07:54
→ rakl joined07:54
→ kmels_ joined07:55
← huoxito left08:01
→ zky joined08:01
→ caspingus joined08:02
← jaequery left08:02
← mklappst_ left08:03
→ ggergely joined08:03
← lavaman left08:04
→ marhaban joined08:04
← peddamat left08:04
→ Saby joined08:05
→ Artpicre joined08:06
→ Chillance joined08:08
← __alpaca left08:11
← hyperair left08:11
← paolooo left08:11
→ naught101 joined08:12
← piToM left08:12
→ xiukun joined08:12
→ piToM joined08:14
→ hinst joined08:17
→ timbl_ joined08:18
← caspingus left08:19
← timbl left08:19
timbl_ → timbl08:19
→ caspingus joined08:19
→ eijk_ joined08:20
→ elixir joined08:21
← rakl left08:22
→ hwrd|work joined08:22
← kcj left08:23
→ ozette joined08:23
← naught101 left08:23
→ naught101 joined08:23
→ rakl joined08:24
→ naught102 joined08:25
← naught101 left08:25
→ kcj joined08:26
← baneM left08:26
← piToM left08:27
← trusktr left08:28
← observ3r left08:29
← rakl left08:29
← naught102 left08:31
→ rakl joined08:32
→ avinashrbhat joined08:32
← avinashrbhat left08:32
← elixir left08:36
→ Kje10L joined08:36
← tharkun left08:37
→ simesy joined08:37
→ tharkun joined08:37
← tharkun left08:37
→ tharkun joined08:37
← Xethron left08:40
← pastime left08:40
← Kje10L left08:41
→ observ3r joined08:42
← simesy left08:42
→ threesome joined08:43
← rakl left08:46
→ Kje10L joined08:47
← observ3r left08:48
→ forlin joined08:48
→ Cromulent joined08:50
← causasui left08:50
→ causasui joined08:51
→ hynek joined08:52
hynek hi is there some symbolic name for “start of branch”? I’m using a git-mirror of a svn repo and can’t rebase, so “git diff trunk” is useless. I’d like to do a “git diff trunk-when-this-branch-was-born” – is there an easy way or do i have to memorize the commit id? tia!08:53
← inversion left08:54
← eletuchy left08:55
→ eletuchy joined08:55
← Parhs8 left08:57
→ Parhs joined08:57
← Parhs left08:57
→ Parhs joined08:57
← kadoban left08:57
gitinfo set mode: +v08:58
Parhs test08:58
nevyn hynek: why can't you rebase?08:59
johnw Nevik: ok, thanks09:00
→ prator joined09:02
→ rickruby joined09:02
hynek nevyn: hm, maybe i can…let me spell it out and you tell me: it’s a mirror of a svn repo which uses branches for tickets. so such a branch lives as long as a ticket does and then gets merged. i need to fetch changes that get applied to that branch so i can’t divert it. should i start an own branch which rebases against both? *head spinning*09:03
← timbl left09:03
← AgentWillyWonka left09:03
← ThePawnBreak left09:03
→ ThePawnBreak joined09:04
→ hyperair joined09:04
→ timbl joined09:04
← nafg left09:05
→ nafg joined09:06
→ yann|work joined09:06
← nafg left09:07
← rednaks left09:10
→ guardian joined09:10
guardian hello09:10
→ rednaks joined09:10
← rickruby left09:10
guardian what's the best way to enumerate local branches in a script?09:11
→ mishok13 joined09:11
→ mmlac joined09:11
→ piToM joined09:12
nevyn hynek: so it's a svn branch... not a local git branch..09:12
hynek nevyn: it’s this: https://github.com/twisted/twisted – and there are 469 branches :) i work on one of them.09:14
← Artpicre left09:15
oxfouzer ok... so if im using git for my web development...09:16
lets say in /home/foo/public_html09:16
← Balliad left09:17
oxfouzer now there is a .git file which is accessible by my user... and im using fcgi so the webserver runs as the domain's user... meaning it can access .git09:17
So why is there not a git.php file or something of the sort... that would allow me to manipulate that git repo?09:17
something like 'adminer.php' as a replacement for phpmyadmin?09:17
nevyn !api09:18
gitinfo [!capistrano] capistrano is an application deployment tool in ruby, which has support for git, see http://github.com/capistrano/capistrano for more information09:18
← mmlac left09:18
guardian I created a .gitattributes file that says *.sh eol=lf — now git shows some of my .sh scripts as modified and warns warning: CRLF will be replaced by LF. I tried to remove the file and check it out again but the warning is still here and git keeps saying the file is modified. I have autocrlf set to false in my global gitconfig. any idea please?09:19
→ carlos-huang joined09:20
→ ThomasLocke joined09:20
← _Harm_B_ left09:20
← Mohsen_Hassani left09:21
→ __alpaca joined09:21
← kcj left09:21
← __alpaca left09:21
→ __alpaca joined09:22
→ _Harm_B_ joined09:22
→ marhaban1 joined09:22
→ sq-one joined09:22
→ elixir joined09:23
← Vinnie_win left09:23
→ Vinnie_win joined09:25
← marhaban left09:27
→ dsdeiz joined09:27
← Gooder`` left09:29
→ simesy joined09:31
→ Shusshu joined09:33
← catsup left09:33
← Shusshu left09:33
→ catsup joined09:33
← k4rtik left09:35
→ inversion joined09:35
→ phobi joined09:35
→ TomyLobo joined09:36
← zky left09:36
→ exoon joined09:37
← ThomasLocke left09:37
← framling left09:38
→ framling joined09:38
→ piToM_ joined09:41
→ paolooo joined09:41
← prator left09:41
→ nioncode joined09:41
→ marhaban joined09:42
← marhaban1 left09:42
→ kcj joined09:42
← piToM left09:43
→ juanmabc joined09:43
← tpayne left09:43
← ozette left09:44
→ francisfish joined09:46
← marhaban left09:47
→ marhaban1 joined09:47
→ zky joined09:49
← pantsman left09:49
→ jackh joined09:49
→ pantsman joined09:50
← pantsman left09:50
→ pantsman joined09:50
← vedant left09:50
← kcj left09:51
← inversion left09:52
→ inversion joined09:53
← Cromulent left09:53
← WinstonSmith left09:53
← snql left09:54
→ WinstonSmith joined09:56
← nkambo left09:56
Nevik guardian: did you check if the file doesnt have CRLF? because if it does, everything you reported is correct behaviour09:57
guardian it has CRLF behavior09:59
committed it, solved the problem09:59
← hinst left09:59
guardian committed it with LF09:59
← zky left09:59
→ zky joined09:59
→ hinst joined10:01
→ leeN joined10:02
← Kje10L left10:02
→ the_cybersphinx joined10:02
← tharkun left10:03
Nevik as i said, everything was fine :P10:03
i dont know what else you expected10:03
→ m8 joined10:05
← carlos-huang left10:05
guardian I had the impression the file was already in LF10:06
→ carlos-huang joined10:06
guardian that confused me10:06
Nevik when in doubt, believe git ;)10:07
← jhoepken left10:08
→ tharkun joined10:09
→ chimay joined10:09
← caspingus left10:10
← chimay left10:10
← xiukun left10:10
→ chimay joined10:11
Kwpolska why does Windows have to do everything differently and against POSIX? backslashes in paths, CRLF, no real commandline tools, a weird way to manage filesystems…10:12
bob2 because it has nothing to do with posix10:12
aside from having a shitty compatability layer so it could get POSIX CERTIFIED written on the box10:12
→ gain joined10:12
← Chaser left10:12
← inversion left10:13
← ferdev left10:13
→ prator joined10:15
→ inversion joined10:15
→ ferdev joined10:16
→ Chaser joined10:16
→ Katafalkas_ joined10:19
← Katafalkas left10:20
Katafalkas_ → Katafalkas10:20
← paolooo left10:21
→ marcdel_ joined10:22
→ caspingus joined10:23
← marcdel left10:23
→ lavaman joined10:23
← chimay left10:25
→ snql joined10:25
→ ErKa joined10:25
← caspingus left10:29
← jyp left10:30
→ xoebus joined10:31
gitinfo set mode: +v10:33
→ jceb joined10:33
gitinfo set mode: +v10:33
→ rudak joined10:34
→ naught102 joined10:35
← falood left10:39
← lavaman left10:39
← TheJH left10:40
← luc_ left10:40
← elixir left10:41
→ TheJH joined10:42
→ chimay joined10:42
→ naught103 joined10:43
← naught102 left10:44
← inversion left10:46
← naught103 left10:47
→ naught103 joined10:47
← dsdeiz left10:48
← juanmabc left10:48
→ ozette joined10:48
← gain left10:49
← francisfish left10:50
→ naught101 joined10:52
← Amadiro left10:52
← naught103 left10:53
→ prudnikov joined10:53
← echo-area left10:53
← marhaban1 left10:57
← flavius left10:57
→ dc5ala joined10:58
→ Amadiro joined10:59
→ zhost joined11:00
→ longbeach joined11:00
← naught101 left11:00
→ husimon___ joined11:01
→ falood joined11:01
← huismon left11:02
→ Kje10L joined11:02
→ vedant joined11:03
grawity Kwpolska: When MS-DOS chose to use backslashes and CRLF, Unix wasn't nearly popular compared to other OSes as it is now.11:04
→ naught101 joined11:04
← prator left11:04
grawity Kwpolska: As for filesystems, MS-DOS v1 didn't have "directories", so drive letters kind of made sense11:05
Kwpolska grawity: but Windows NT is a completely different OS. Why did they chose to keep bad standards?11:05
(same goes for localtime clock.)11:05
cmn backwards compatability11:05
MS is screwed if you can't run your old programs11:05
grawity Kwpolska: Compatibility, otherwise Many Users as well as Big Corps™ which rely on Windows 3.11 or even MS-DOS programs just wouldn't buy the new OS.11:05
There are a few posts in The Old New Thing about how MS even patched software -- and patched Windows to work around broken software -- so that it would keep running on the new Windows release.11:06
→ huismon joined11:06
grawity Even those that used undocumented features >_<11:07
← Kje10L left11:07
cmn or that are just plain buggy11:07
→ marhaban joined11:07
cmn there are some shims for programs that are known to have use-after-free bugs and whatnot11:07
grawity http://blogs.msdn.com/b/oldnewthing/archive/2006/11/06/999999.aspx http://blogs.msdn.com/b/oldnewthing/archive/2003/12/24/45779.aspx http://blogs.msdn.com/b/oldnewthing/archive/2003/08/28/54719.aspx http://blogs.msdn.com/b/oldnewthing/archive/2005/01/18/355177.aspx11:07
← husimon___ left11:07
← carlos-huang left11:07
grawity eh, just11:08
!g site:blogs.msdn.com/b/oldnewthing backwards compatibility11:08
gitinfo [!lg] git config --global alias.lg "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"11:08
grawity blah.11:08
wrong bot11:08
Oh well, stick that in Google or whatever11:09
← chimay left11:09
grawity Kwpolska: NT did have a POSIX subsystem, which even ran at the same level as Win32 (not on top of Win32), but it wasn't very popular11:09
it was mostly for that certification :P11:10
cmn the bottom line is that the MS family of OSs have remained more-or-less consistent and backwards-compatible, much like the unix family of OSs11:11
→ saj_root joined11:11
← ph^ left11:11
cbreak METRO!11:12
→ inversion joined11:12
→ dkpi joined11:12
cmn the UI thingymaging formerly known as metro is a departure at the UI level, but you can still run your old apps11:13
grawity ...with minor exceptions.11:13
← naught101 left11:15
cbreak such as all of windows rt11:15
← falood left11:15
cbreak which is the self proclaimed future of windows11:15
cmn which is build on top of old the old subsystems11:15
→ naught101 joined11:15
cmn and the backwards compatibility doesn't need to play a role, as you wouldn't be able to run your old x86 apps on an arm11:16
cbreak when apple switched to PPC, you were able to run old 68k programs. When they switched to intel, you were able to run old PPC programs11:16
now that microsoft switches, they can easily use tech like Virtual PC (which they bought) to do the same11:17
but I guess apple's backwards compatibility is much better than MS' :)11:18
tango_ hm wasn't there a git svn helper?11:18
grawity If I remember correctly, WinNT could run x86 programs on Alpha too11:18
tango_ I mean remote-helper, not git svn itself11:18
cbreak less stupid "let's not fix this bug because crappy programs depend on it" and more "let's add a temporary compatibility layer to ease transition and scrap it in a few versions"11:18
grawity tango_: I think there was a GSOC project for it, not sure if it went anywhere11:19
← naught101 left11:20
← dkpi left11:21
← stoned left11:21
cmn Apple provided a transition for the newer versions in the same line of products; which is no different from what MS is doing11:22
naming stupidity appart11:22
→ mmlac joined11:23
cmn the vcs-svn helper is a bit of an abandoned project for practiclar purposes11:24
→ caspingus joined11:25
tango_ cmn: practical purposes?11:25
→ marhaban1 joined11:25
cmn it's there, and people sometimes try to add to it, but it hasn't seen activity upstream in quite some time11:26
→ swiety joined11:28
← w0ng left11:28
← marhaban left11:29
→ AdrienBrault joined11:29
→ psoo joined11:31
← tharkun left11:37
→ gusnan joined11:37
← Shadeness left11:38
→ OliverJAsh joined11:38
← hyperair left11:38
→ _iron joined11:40
→ lavaman joined11:40
→ nixoninajar joined11:40
nixoninajar Hey!11:41
gitinfo nixoninajar: 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.11:41
← nixoninajar left11:42
→ tharkun joined11:42
→ JSharpe_ joined11:43
← vedant left11:43
→ vedant joined11:43
→ freestyler7 joined11:43
← JSharpe left11:44
← simesy left11:46
→ khushildep joined11:52
← ferdev left11:53
→ Thra11 joined11:55
← Sonderblade left11:56
→ ferdev joined11:59
← rking left12:00
→ w0ng joined12:03
→ Kje10L joined12:03
← doug_carmichael left12:05
← psoo left12:05
← mmlac left12:06
→ mikef joined12:07
→ Xethron joined12:07
← Kje10L left12:07
← TheJH left12:08
→ TheJH joined12:09
→ chisler joined12:10
← ferdev left12:11
→ Artpicre joined12:14
← pantsman left12:14
→ quazimodo joined12:14
→ ferdev joined12:15
→ simesy joined12:17
← garply left12:18
← felher left12:19
→ mmlac joined12:19
← Artpicre left12:19
→ ldiamond joined12:20
← ldiamond left12:20
→ ldiamond joined12:20
← simesy left12:20
→ simesy joined12:21
← aep left12:22
→ joules joined12:22
→ aep joined12:22
→ guide joined12:23
→ netto joined12:23
← siprbaum left12:24
→ siprbaum joined12:24
→ Ksugzulut joined12:24
← joules left12:24
→ joules joined12:24
joules hello, I broke git accidently with git commit -a -m "parse.py - move initial block declaration "block = dict()" into scope minimum scope limit - ("with" statement)"12:24
now all git commands fail.12:25
→ garply joined12:25
joules [127] julian@venus> git ~/develop/aequix12:25
git:174: command not found: into scope minimum scope limit - (with statement)12:25
:/12:25
cbreak git doesn't break because of committing12:25
← lavaman left12:25
bob2 no you didn't12:25
joules hmm something broke.12:25
→ plumpkin joined12:25
bremner `which git`12:26
bob2 you managed to alias git to some crazy broken command12:26
start a new shell12:26
joules how the hell did i do that?12:26
cbreak joules: look at "12:26
joules: look how far they go12:26
bob2 look at your broken quotes12:27
cbreak joules: and never again use -m ")12:27
bob2 also you want {} not dict()12:27
cbreak just write non-shitty commit messages12:27
joules ok12:27
yeh i was in a rush12:27
cbreak in a normal editor you can write the standard title emptyline body12:27
osse bremner: tip: with bash `which git` won't tell you if 'git' is an alias or a function :/12:27
_ikke_ and type git then?12:27
bremner <- happy zsh user12:27
osse _ikke_: type will12:28
joules i'm using zsh bremner12:28
:)12:28
→ jgh joined12:29
→ oracal joined12:29
→ ncd|leeN joined12:31
← netto left12:32
osse I managed to file a bug report with ag once. Turns out I had defined a shell function without realizing it ^_^12:32
joules I did it :)12:34
← Tommy[D]_ left12:34
joules it was great.12:34
← leeN left12:35
→ dsdeiz joined12:37
← mikef left12:37
→ Artpicre joined12:38
← jgh left12:38
← swiety left12:38
← Artpicre left12:39
← mmlac left12:40
→ Artpicre joined12:41
← kogent left12:42
joules embarrassing12:43
http://pgsql.privatepaste.com/6b033d8c0c12:43
← Artpicre left12:43
osse :D12:43
joules so easy to do without trying.12:44
→ Artpicre joined12:44
→ dkpi joined12:45
joules bloody zsh12:46
http://pgsql.privatepaste.com/cc0e52b21e12:46
← zky left12:46
bremner ls12:46
oops12:46
→ DonRichie joined12:48
← caspingus left12:48
→ DarkCthulhu joined12:48
← Artpicre left12:50
→ falood joined12:50
joules thanks12:51
← joules left12:51
→ fris joined12:51
← herdingcat left12:52
← gusnan left12:53
→ aartist joined12:53
→ xavier23_ joined12:54
→ hyperair joined12:55
← curvedmark left12:55
← exoon left12:55
← xavier23 left12:56
xavier23_ → xavier2312:56
← rudak left12:56
→ Artpicre joined12:57
→ mikef joined13:00
→ netto joined13:00
← Artpicre left13:00
→ marhaban joined13:01
→ Artpicre joined13:02
→ Kje10L joined13:03
← Chillance left13:04
← garply left13:04
← aep left13:05
← s0x_ left13:05
← Ksugzulut left13:05
← Artpicre left13:07
← dkpi left13:07
→ aep joined13:08
← Kje10L left13:08
→ garply joined13:09
← aartist left13:10
→ Chillance joined13:10
→ s0x joined13:12
→ Artpicre joined13:12
→ pandeiro joined13:13
← marhaban left13:14
← marcdel_ left13:15
← pandeiro left13:16
← Artpicre left13:19
← WrathWolf left13:19
→ jackh_ joined13:19
→ Artpicre joined13:20
→ _goTAN joined13:20
← mikef left13:21
← __alpaca left13:22
← quazimodo left13:22
← Artpicre left13:22
← jackh left13:22
→ pandeiro joined13:23
→ Artpicre joined13:23
→ caspingus joined13:24
← rurufufuss left13:24
← Xethron left13:25
→ jstemmer joined13:26
← Artpicre left13:26
← Watabou left13:26
← Thra11 left13:26
→ Artpicre joined13:27
← plumpkin left13:28
→ quazimodo joined13:29
→ eletuchy_ joined13:30
← eletuchy left13:30
← caspingus left13:30
← netto left13:32
→ netto joined13:33
← netto left13:34
→ mikef joined13:34
→ swiety joined13:35
→ tkrugg joined13:36
→ bmac joined13:36
← canton7 left13:37
→ canton7 joined13:37
→ Skinner1 joined13:38
← Skinner left13:38
← rednaks left13:39
→ rednaks joined13:40
→ Watabou joined13:41
← quazimodo left13:41
→ kirang89_ joined13:41
← Artpicre left13:41
← swiety left13:41
→ jaequery joined13:41
→ uidzer0 joined13:44
← _Harm_B_ left13:44
→ _Harm_B_ joined13:45
→ rudak joined13:45
→ Artpicre joined13:46
→ nathanr joined13:46
← nathanr left13:50
→ m0ltar joined13:54
→ Davey joined13:55
→ _Vi joined13:56
→ johnnyfuchs joined13:56
→ kristofers joined13:57
→ rking joined13:59
→ zeppo joined14:00
→ chimay joined14:02
← saj_root left14:03
→ Kje10L joined14:04
← setmeaway left14:04
→ xbmc_fan joined14:04
→ m_ke joined14:05
gitinfo set mode: +v14:06
→ kukks joined14:06
← kukks left14:06
→ kukks joined14:06
xbmc_fan hi! I would like my branches master HEAD to look exactly like the HEAD of the Upstream Master. How can I do that?14:07
→ v0n joined14:08
cbreak xbmc_fan: HEAD is unrelated to master14:08
← Kje10L left14:08
cbreak xbmc_fan: if you want to change master, just check it out and then git reset --hard to where ever you want14:08
← mklappstuhl left14:11
xbmc_fan I dont think I understand that.14:11
grawity you must first understand the difference between HEAD and a branch head14:11
cbreak you must tell me which part you don't comprehend14:12
← jceb left14:12
← ErKa left14:12
xbmc_fan I just pulled from upstream and it merged some files. I don't wanted it to merge but to become the exactly the same as if I cloned it.14:12
→ setmeaway joined14:13
xbmc_fan so my branch has now my changes I commited some time ago and now I want to have the same state as the upstream again (and get rid of my changes)14:13
← marhaban1 left14:14
→ marhaban joined14:14
← yshh left14:14
→ felher joined14:15
grawity you're looking for `git reset --hard <target-commit>`14:15
xbmc_fan ok, I will try that thanks14:15
→ yshh joined14:16
← eijk_ left14:16
→ Noldorin joined14:17
→ crater2150 joined14:17
xbmc_fan thanks. it seems that did the job14:18
← tharkun left14:18
→ lhunath joined14:19
← m_ke left14:19
← Yakko left14:20
lhunath I just did a git fetch --tags and it updated a bunch of tags. Eg: - [tag update] 1.3.0 -> 1.3.0 -- is there a way to undo this?14:20
cmn look in the reflog14:21
← Watabou left14:21
cmn and then set the tag to whatever you think it should be14:21
← simesy left14:22
→ __alpaca joined14:23
→ tharkun joined14:23
← tharkun left14:23
→ tharkun joined14:23
→ jgh joined14:24
→ nathanr joined14:24
← chimay left14:25
→ mklappstuhl joined14:25
→ Tech163 joined14:26
→ Chikore joined14:26
← Chikore left14:26
cbreak tags have a reflog?14:27
hmm... :)14:27
cmn all refs have a reflog, hence the name14:27
variable → constant14:30
→ Jackneill joined14:30
← Jackneill left14:30
→ Jackneill joined14:30
← eletuchy_ left14:31
osse does that bald scary looking one that used to be in the world championship also have a reflog?14:31
← bmac left14:31
→ eletuchy joined14:31
→ Shadeness joined14:33
→ rickruby joined14:33
→ swiety joined14:33
xbmc_fan I have a two branches A and B. A has a commit containing 3 changed files and I would like to have 2 of those changed files merged to branch B. How can I do that?14:33
fris other than git init --bare on the server, or doing it via a ssh command, any other way to create a repo on the server via command?14:33
cmn anything you create that does that14:34
→ __iron joined14:34
cmn e.g. gitolite can create new repos when you first push to them14:34
→ quazimodo joined14:34
← thyseus left14:34
→ thyseus joined14:35
← eletuchy left14:36
← zhost left14:37
→ juanmabc joined14:38
→ thong joined14:40
← frogonwheels left14:40
→ chimay joined14:40
← xavier23 left14:42
← oracal left14:44
← Davey left14:45
← quazimodo left14:46
→ Chikore joined14:46
→ Dougie187 joined14:46
← __iron left14:47
fris ahh cool14:47
← vedant left14:48
← ldiamond left14:48
← swiety left14:50
→ mihamina joined14:51
← v0n left14:52
← Droolio left14:53
cbreak cmn: the reflog is optional, and at least in the past it even had to be explicitly enabled for bare repositories14:54
cmn right, but you have to disable it explicitly for non-bare14:55
→ Akhilan joined14:55
xbmc_fan wow as it turns out it is rather complicated...14:55
→ infynyxx joined14:56
cmn yes, going against the tool generally is14:56
← Dougie187 left14:57
→ xavier23 joined14:57
cbreak xbmc_fan: getting part of a commit is worthless14:57
it might not even compile14:58
a commit is an atomic set of changes after all14:58
xbmc_fan: just get the whole thing14:58
→ vedant joined14:58
→ nicklasbo joined14:59
xbmc_fan cbreak: a commit *should* be an atomic set of cahnges. in this case it sadly isn't and I try to create concise commit15:00
→ Kje10L joined15:00
← ak5 left15:00
← nicklasbo left15:00
cbreak well, then you'll have to fix the mess by history rewriting or similar15:00
you can use git checkout -p thatothercommit for example15:01
that'll get all changes on a per-hunk basis between your current HEAD and that commit15:01
→ nicklasbo joined15:01
xbmc_fan oh that might help, thanks15:02
charon xbmc_fan: the quickest way to split out stuff from one commit is probably 'git show --format=email commit_sha1 -- files... | git am'15:02
← nicklasbo left15:02
← Chikore left15:02
charon (basically working from the insight that 'git show --format=email C | git am' == 'git cherry-pick C')15:02
→ Jackneill_ joined15:03
← mikef left15:03
cbreak how's that quicker than what I proposed ?:)15:03
← Jackneill left15:03
charon well, let's just say that they each work for a different special case15:04
→ Chikore joined15:04
charon mine assumes things are split at file boundaries, yours assumes that the base trees are (at least approximately) the same15:04
and either way, 'git cherry-pick -n C; git reset; git add -p' might be easier to remember because it's built from things he should know already15:05
→ InvidFlower joined15:05
← jaequery left15:05
→ nicklasbo joined15:05
← cagedwisdom_ left15:05
→ osvike joined15:05
→ plumpkin joined15:06
← rickruby left15:06
← osvike left15:06
→ JohnBat26 joined15:07
→ m_ke joined15:08
← ozette left15:08
→ zky joined15:08
← Chikore left15:08
← kirang89_ left15:09
← Tech163 left15:09
← Artpicre left15:10
← JohnBat26 left15:10
← nicklasbo left15:10
→ JohnBat26 joined15:10
← marhaban left15:12
→ marhaban joined15:12
→ pur3forlyphe joined15:13
→ kirang89_ joined15:14
← Akhilan left15:14
→ barq joined15:15
barq When collaborating on a project is it common to keep the libraries that the project depends on in the repository as well?15:15
← guiambros left15:16
← jackh_ left15:16
→ guiambros joined15:16
← guardian left15:17
→ mikef joined15:17
→ quazimodo joined15:17
sonOfRa that depends. since you were in #eclipse earlier, I would assume java15:18
So you're probably best of with maven15:18
← Jackneill_ left15:18
a_l_e → zzzzz_a_l_e15:19
→ Jackneill joined15:19
→ diegoviola joined15:20
zzzzz_a_l_e → a_l_e15:20
barq How does maven handle dependencies?15:21
cbreak barq: libraries are usually system installed15:22
and you'd use a build system like CMake to find them15:23
← zky left15:23
cbreak more specific libraries can be chained into the repository via submodules15:23
barq What about third party libs?15:23
cbreak even third party libs15:23
the number of the party is not that relevant15:23
what matters is if you want to build it yourself or not15:24
← xavier23 left15:25
← quazimodo left15:25
← dsdeiz left15:25
→ xavier23 joined15:26
barq Well, I need to build to see if I've broken anything, don't I?15:27
I'm not even sure what the alternative to self-build would be.15:27
→ jaseemabid joined15:27
cmn downloading it15:27
you don't need to rebuild a dependency when you change your program's code15:28
EugeneKay It's the other way around you need to rebuild15:28
← guiambros left15:28
cmn but then it's not some third-party library, it's what you're working on15:29
← piToM_ left15:29
cbreak barq: no.15:29
barq: how often did you recompile libc++? qt? boost?15:30
the only reason I recompile libraries is because I install them from source, or because I want to develop on the libraries, or because they are part of a project15:31
→ thatJasonSmith joined15:31
→ rickruby joined15:31
→ simesy joined15:33
→ rabellamy joined15:33
← kirang89_ left15:34
← todd_dsm left15:34
→ kirang89_ joined15:35
→ Sonderblade joined15:36
← Sonderblade left15:36
→ rath joined15:36
→ aberrant joined15:36
→ Sonderblade joined15:37
← simesy left15:37
kaictl is there a size limit on git remote names?15:39
cbreak I doubt it.15:39
kaictl huh. okay.l15:40
cbreak Maybe someone fucked up some implementation with a char[] or what ever...15:40
but I've not seen any documentation on that15:40
→ jaequery joined15:40
← kirang89_ left15:40
barq OK, so I don't need to compile the lib.15:41
← m_ke left15:41
barq But how do I make sure everyone else is using the same version?15:41
Kwpolska barq: you sure this is a git question?15:41
cbreak barq: they don't have to use the same version15:41
→ kirang89_ joined15:41
cbreak barq: they just have to use a compatible version.15:41
CMake can check that.15:42
→ eletuchy joined15:42
cmn and in any case, you do that by using your build system or dependency management tool, which can often be the same15:42
cbreak and if they don't have one new enough, or one that's too new, then they'll get errors.15:42
← kenperkins left15:43
→ m_ke joined15:43
← falood left15:43
← infynyxx left15:46
→ piToM joined15:46
→ quazimodo joined15:46
← eletuchy left15:46
→ todd_dsm joined15:47
← Sigma left15:48
→ infynyxx joined15:49
→ n3m joined15:49
← jaequery left15:50
→ kenperkins joined15:52
→ carlos-huang joined15:52
← diegoviola left15:52
← hynek left15:53
→ drizzd joined15:55
← m_ke left15:56
→ Goplat joined15:57
← rath left15:58
→ antijava joined15:58
xbmc_fan are you guys using any visualization for branches / merges and a gui to carry out some complicated tasks or are you only using the commandline?15:58
← quazimodo left15:59
→ rath joined16:00
xbmc_fan I am seriously trying to understand git learn the neccessary commands but as a svn user (and often using tortoise) everything seems to be complicated.16:00
← MestreLion left16:00
→ m_ke joined16:01
cmn git is distributed, so it has more to think about; !lol and gitk are quite nice for visualising16:01
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all16:01
xbmc_fan It took me an hour to understand and try out those things charon and cbreak suggest. But maybe it's just me..16:01
cmn those are things to make some steps easier once you know what you're doing16:02
if you don't know how staging, merging works, it'll be that much harder16:02
xbmc_fan thanks both of you16:02
charon xbmc_fan: it helps a lot if you understand !cs, too16:02
gitinfo xbmc_fan: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup16:02
xbmc_fan charon I guess I understand how git works but the commands are not intuitive.16:05
← Gentlecat left16:05
_ikke_ You know the expression about intuitive interfaces?16:06
charon i suppose the commands are very intuitive... if you're linus16:06
cmn options have grown where the code is, rather than where the functionality fits; but you shouldn't expect anything from svn to port over16:06
xbmc_fan _ikke_: nope.16:06
_ikke_ That there is only one intuitive interface, and all the rest is learned?16:09
MatthewWilkes xbmc_fan: Git has a famously bad user interface, it's why I was backing bzr for ages, but functionality and ecosystem around it has emphatically won. It'll take some good config files (such as https://github.com/plone/plone.dotfiles/blob/master/.gitconfig for the project I use) and some time to learn its quirks, but as of now git is the best option.16:09
xbmc_fan I often think it is us geeks who like complicated things. And if things were easy we wouldn't be necessary. Git totally feels that way.16:09
_ikke_ xbmc_fan: http://www.greenend.org.uk/rjk/misc/nipple.html16:10
cmn there are complex parts because people need to do complex operations16:10
some command just didn't survive the move of git to VCS very well16:11
xbmc_fan lol _ikke_16:11
evilgrawity → _grawity16:13
xbmc_fan MatthewWilkes seems like the config is using short name alias for commands I don't even know there long form by heart ;)16:13
charon MatthewWilkes: you might like http://stevelosh.com/blog/2013/04/git-koans/16:14
→ swiety joined16:14
→ v0n joined16:17
← hyperair left16:17
← mikef left16:19
← rickruby left16:19
→ Chikore joined16:21
→ Chikore_ joined16:21
cmn xbmc_fan: you don't need to know them all; you discover the commands and possibilities as you use and learn to use the tool, like anything else16:22
→ CodeShark joined16:22
← InvidFlower left16:22
cmn I keep finding Subversion users who don't know the 'switch' command, or who delete files and run 'svn up' instead of reverting them16:23
← jimmyff left16:25
← chriswk left16:26
← jab416171 left16:26
← jjardon left16:26
→ kadoban joined16:27
← Chikore left16:28
← n3m left16:28
← fris left16:29
← rednaks left16:30
← zeppo left16:30
→ rednaks joined16:30
→ oakdog8 joined16:32
→ Chikore joined16:32
← forlin left16:33
→ nicklasbo joined16:33
← antijava left16:33
← oakdog8 left16:34
← Katafalkas left16:35
→ elixir joined16:36
← OliverJAsh left16:37
← nicklasbo left16:38
→ OliverJAsh joined16:38
→ fsvehla joined16:39
→ Dougie187 joined16:40
← vedant left16:41
→ ErKa joined16:41
← nigelb left16:45
→ nigelb joined16:45
→ hyperair joined16:48
← ErKa left16:48
← Chikore_ left16:51
→ thiago joined16:51
→ DmitryBochkarev joined16:51
→ LekeFly joined16:53
← hyperair left16:54
→ tvw joined16:54
← doener left16:57
← infynyxx left16:58
← aberrant left16:59
→ InvidFlower joined17:02
← nfroidure left17:03
→ ErKa joined17:03
→ Tommy[D] joined17:03
→ Katafalkas joined17:03
← Chikore left17:03
→ zakora joined17:03
→ michas joined17:04
← rath left17:05
→ francisfish joined17:05
→ eletuchy joined17:05
→ aberrant joined17:05
← ErKa left17:08
← pandeiro left17:08
← jaseemabid left17:08
← Goplat left17:08
→ m0viefreak joined17:08
← Adlai left17:08
→ vedant joined17:09
← xbmc_fan left17:10
← kenperkins left17:11
← Guest14165 left17:13
→ chrismar035 joined17:13
→ n3m joined17:14
← chrismar035 left17:14
← ThePawnBreak left17:14
→ cenuij joined17:14
← cenuij left17:14
→ cenuij joined17:14
← Katafalkas left17:14
→ wald0 joined17:15
→ anyway joined17:15
← anyway left17:16
→ mechanicalduck joined17:16
← m_ke left17:16
→ nfroidure joined17:16
→ SBoudrias joined17:16
→ gain joined17:19
→ kogent joined17:21
→ BSaboia joined17:21
→ Guest14165 joined17:22
→ nicklasbo joined17:22
→ RalfR joined17:23
→ bmac joined17:24
← w0ng left17:24
← yshh left17:24
→ jaseemabid joined17:25
→ vpopov joined17:25
→ tinti joined17:25
→ w0ng joined17:26
→ infynyxx joined17:27
→ yshh joined17:27
→ thomas_b joined17:28
← francisfish left17:28
← yshh left17:30
→ yshh joined17:30
← Jackneill left17:30
→ francisfish joined17:31
→ kenperkins joined17:31
→ black_13 joined17:32
→ caspingus joined17:32
→ hyperair joined17:33
black_13 what am i doing wrong here http://codepad.org/Jqn6dZZ717:33
→ pppaul joined17:33
← pppaul left17:33
→ pppaul joined17:33
grawity 1) not reading the message that git prints17:34
jast I'm curious... what's 2)? :)17:34
← RalfR left17:35
← carlos-huang left17:36
← caspingus left17:36
black_13 yeah me too on that 217:37
→ ldiamond joined17:37
← ldiamond left17:37
→ ldiamond joined17:37
← francisfish left17:37
black_13 lotta quiet17:39
→ TheNotary joined17:39
← tkrugg left17:40
→ zeppo joined17:41
← MrNibbles left17:41
← timbl left17:43
→ antijava joined17:43
← __alpaca left17:43
→ herdingcat joined17:44
Dougie187 I think there's only 1)17:45
← swiety left17:46
juanmabc mmm, i'm in trouble, i did a wrong commit, push witout first pulling, how do i revert say 2/3 pushes back repo?17:46
.oO(this finally happened...)17:47
Dougie187 !fixup juanmabc17:47
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!17:47
juanmabc thanks, looking17:48
→ __alpaca joined17:48
→ diegoviola joined17:48
→ jatt joined17:48
← jatt left17:48
→ MrNibbles joined17:49
→ tjbiddle joined17:50
← todd_dsm left17:51
← antijava left17:51
← rednaks left17:52
→ pfFredd joined17:52
← sq-one left17:52
→ Sigma joined17:53
← Noldorin left17:53
← n3m left17:53
→ timbl joined17:55
← __alpaca left17:59
← chimay left18:00
← angelsl left18:05
→ Noldorin joined18:05
→ rednaks joined18:05
← Orbitrix left18:06
→ m_ke joined18:06
← m0ltar left18:06
← MrNibbles left18:07
← jaseemabid left18:08
← bmac left18:08
→ teejmya joined18:08
← m_ke left18:08
← Joefish left18:08
→ Orbitrix joined18:09
← bgerber left18:09
→ tenmilestereo joined18:09
→ Joefish joined18:09
→ m_ke joined18:11
← kmels_ left18:11
← kristofers left18:12
→ t-mart joined18:12
→ huoxito joined18:13
← teejmya left18:14
→ bgerber joined18:14
→ Eremiell joined18:15
← piToM left18:16
← Etheco left18:16
→ piToM joined18:17
← InvidFlower left18:17
→ Etheco joined18:18
← tinti left18:19
→ breakingthings joined18:20
→ francisfish joined18:20
← DonRichie left18:20
→ jjardon joined18:22
→ chriswk joined18:22
Sigma hmm, are there any known issues with git on zfs ? I seem to have some weird sync issues: git-merge would pretend that there are local changes, when git-status and git-diff see nothing. And after "some time" it would realize there are indeed none (trace: https://gist.github.com/sigma/5477827). I just switched to ZFS, so it looks like a good suspect, but it might be something else entirely I suppose18:22
→ jimmyff joined18:22
→ pantsman joined18:22
← pantsman left18:22
→ pantsman joined18:22
← bgerber left18:22
← segher left18:23
→ digitalfiz joined18:23
→ jab416171 joined18:23
← piToM left18:24
→ cebor joined18:24
→ jaseemabid joined18:24
→ segher joined18:25
→ farfanoide joined18:27
→ akifer_ joined18:27
← segher left18:27
← Noldorin left18:29
→ ph^ joined18:29
→ segher joined18:29
← akifer left18:30
← segher left18:31
→ TheWave joined18:32
← TheWave left18:33
→ segher joined18:33
← francisfish left18:34
→ system64 joined18:35
→ bgerber joined18:36
← cebor left18:36
← nicknisi left18:37
→ DonRichie joined18:39
→ jceb joined18:39
→ marcdel joined18:41
← wald0 left18:41
← jcromartie left18:41
← elixir left18:43
→ DoniRS joined18:43
← tenmilestereo left18:44
← black_13 left18:44
← DarkCthulhu left18:47
← evie_hammond left18:48
→ TheWave joined18:48
→ Entomo joined18:48
→ rakl joined18:48
TheWave Hey guys I need some help. I created a git repo on github. Then i inited a project id been working on on my computer. I pushed that fine. Then I made a bunch of changes which I want to commit and push. But when i do it is says master rejected master rejected. Apparently this is because i didnt branch? But i dont want to lose all of my changes that ive made. Any ideas?18:50
→ evie_hammond joined18:52
Dougie187 TheWave: why don't you pastebin the error?18:54
← moondoggy left18:54
← tombee left18:55
→ tombee joined18:55
offby1 TheWave: you probably need to merge or rebase.18:58
→ cebor joined18:58
→ natechan joined18:58
→ howlymowly_ joined18:58
→ __alpaca joined19:00
← thong left19:00
← metts left19:03
← zakora left19:03
→ mklappst_ joined19:04
← __alpaca left19:05
← rakl left19:05
→ R1KRDO joined19:06
← infynyxx left19:07
← barq left19:08
→ __alpaca joined19:10
← v0n left19:10
→ infynyxx joined19:11
← hoschi left19:12
← redrocket left19:13
← herdingcat left19:13
→ breck7 joined19:14
→ dangerousdave joined19:14
→ robottinosino joined19:15
← rabellamy left19:15
← __alpaca left19:15
→ timsnadden joined19:17
← jaseemabid left19:18
← pfFredd left19:18
→ alexisabril joined19:21
← _Harm_B_ left19:24
← infynyxx left19:25
→ _Harm_B_ joined19:25
charon Sigma: if it happens again, record straces of both, and send them to the !list19:26
gitinfo Sigma: [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply.19:26
← TheWave left19:26
charon Sigma: but in general git should be happy with any filesystem that behaves like posix19:26
← TheNotary left19:27
→ trusktr joined19:28
← robottinosino left19:30
→ bvi joined19:30
← vpopov left19:31
← bvi left19:32
← heytrav left19:32
→ mikef joined19:32
→ heytrav joined19:33
→ rtjure joined19:34
→ jaseemabid joined19:34
→ observ3r joined19:34
→ srinup joined19:35
← Niels___ left19:35
→ kristofers joined19:36
Sigma charon: yeah I just mailed the list. it's fairly reproducible actually19:36
← tashi_ left19:37
← NimeshNeema left19:37
charon well, what you reported on the list seems to be about diff-files, which is expected19:37
get straces of git-status and git-merge, those are far more interesting19:38
oh and perhaps verify that all of your git thingies are the same, new version19:38
thiago what's the issue, out of curiosity?19:38
→ warthog9 joined19:38
← heytrav left19:38
← longbeach left19:39
→ infynyxx joined19:40
→ heytrav joined19:41
← srinup left19:42
← trusktr left19:42
charon thiago: he had the link https://gist.github.com/sigma/5477827 above, there seems to be some refresh issue there19:44
i.e. barring interference from other processes, the git merge complains / git status is clean sequence shouldn't be possible19:44
← inversion left19:44
Sigma charon: out of curiosity, why is the git-diff-files behavior expected ?19:46
thiago I expect it to be a CRLF issue19:46
Sigma seems pretty undeterministic to me :/19:46
→ piToM joined19:47
← johnnyfuchs left19:47
→ slakmagik joined19:48
← cebor left19:49
← alexisabril left19:49
r0bby_ → robbyoconnor19:50
→ relipse joined19:50
→ lresende joined19:51
← midnightmagic left19:51
Sigma thiago: I rather doubt it, it seems really bound to ZFS (same repository copied over to a HFS+ volume behaves correctly)19:52
← piToM left19:52
charon Sigma: historically (i think? that was before i came to git) you had to do a lot more manual index refreshing, since it's a bit of an expensive operation. but these days, the user-facing tools like git-diff and git-status run a refresh first, so it's not needed that often.19:52
Sigma: the expectation is that users of git-diff-* etc. know about this, and run git update-index --refresh first in their script19:53
← dc5ala left19:54
← xavier23 left19:55
→ jdunck joined19:56
Sigma I still don't get it. are we saying that git-diff-files *might* trigger an index update, but that we shouldn't count on it ? I'd expect it to be more like: git-diff-files doesn't update the index, as in *never* :)19:57
← warthog9 left19:59
→ mmitchell joined19:59
charon it doesn't19:59
did i say it does? it doesn't.19:59
→ xavier23 joined20:00
Sigma then, who updated the index before my second git-diff-files ? that's the thing I'm reporting: I run git-diff-files twice in a row, and have a change reported only the first time20:00
charon hard to say20:01
make triply sure that you have no bash prompts or similar active20:01
← tjadc left20:01
charon then gather traces20:01
→ mezner joined20:01
← lhunath left20:02
→ Re-L joined20:02
← skorgon left20:02
← jceb left20:03
← sebrock left20:03
Sigma ah the prompt, forgot about this one. unfortunately, doesn't change a thing :/ ok I need to learn dtrace I guess20:03
charon is this a local fs btw, or over the network?20:04
Sigma local20:04
← rtjure left20:04
→ thong joined20:05
→ yellow joined20:05
charon you can also try running 'stat $file' in a loop (or every second or so) and seeing if it suddenly changes. that would also fool git pretty badly.20:05
where 'it' can be most stat fields, in fact.20:06
→ skorgon joined20:06
mpfusion Is it possible to have git fetch by default fetch from all remotes like git fetch --all ? Is there a config option for that maybe?20:07
← lresende left20:08
← infynyxx left20:09
← eletuchy left20:10
← BSaboia left20:10
→ eletuchy joined20:10
charon mpfusion: no, but if you hate typing, git config --global alias.fa 'fetch --all' or some such20:10
→ __alpaca joined20:10
→ shruggar joined20:11
→ Watabou joined20:12
← huoxito left20:13
→ pandeiro joined20:13
← hwrd|work left20:13
mpfusion charon: That's the obvious workaround, yes. Thanks20:14
→ tashi_ joined20:14
← eletuchy left20:15
← Saby left20:15
← __alpaca left20:15
← mmitchell left20:17
← tashi_ left20:20
Sigma ha, setting core.trustctime to false helps20:20
→ swiety joined20:20
charon Sigma: so zfs on osx has issues with ctime? funny. i thought that setting was only needed for old broken beagle indexer crawlers...20:21
Sigma yeah, kinda scary20:22
→ trungqtran joined20:23
Sigma and I don't have any indexer as far as I know (spotlight is disabled)20:23
← thong left20:23
→ codezombie joined20:25
Sigma wow, I'm taking quite a performance hit. guess I have a good reason to optimize magit now...20:26
→ rickruby joined20:27
charon Sigma: over what?20:27
← juanmabc left20:28
← jaseemabid left20:28
Sigma that ctime flag I suppose20:28
→ juanmabc joined20:28
← Re-L left20:28
charon umm, i'd hope not. that should reduce the number of refreshes needed, but never increase it20:28
← zeppo left20:29
← LekeFly left20:29
← DoniRS left20:29
→ Arokh joined20:29
Sigma I'll investigate. but some magit operations just have gone from "kinda sluggish" to "dead slow"20:29
← HeN left20:30
← GameGamer43 left20:30
SamB it would be cool if they went to "nice and snappy" at some point20:30
Sigma indeed it would ;)20:31
← ggergely left20:31
→ dustmason joined20:31
← nicklasbo left20:31
← dr_lepper left20:31
← xerxas left20:31
← jab416171 left20:31
← PaulePanter left20:31
← bond` left20:32
→ bond` joined20:32
← jimmyff left20:32
→ koki joined20:33
← zorzar left20:33
→ PaulePanter joined20:33
→ Learath2 joined20:33
→ dr_lepper joined20:33
← pdelvo left20:34
← gitinfo left20:34
← tfnico___ left20:34
→ zorzar joined20:34
← offby1 left20:34
← system64 left20:35
→ weltall joined20:35
← stfn left20:35
← avar left20:35
→ mmlac joined20:35
← mmlac left20:36
← mezner left20:36
→ ohcibi joined20:36
→ roflin joined20:36
→ axrfnu joined20:36
← SBoudrias left20:36
← vedant left20:36
→ yx joined20:37
← zizzfizzix left20:37
→ petteyg joined20:37
→ Bucciarati joined20:37
→ Nickeeh joined20:37
→ hwrd|work joined20:37
→ ggergely joined20:37
→ AlexanderS joined20:37
→ dario joined20:37
→ stfn joined20:41
→ gitinfo joined20:41
ChanServ set mode: +o20:41
→ kmels_ joined20:41
→ chaoflow joined20:41
→ BtbN joined20:41
← yellow left20:41
← Anders_J left20:41
← shennyg left20:41
→ holo joined20:41
holo hi20:41
← dario left20:41
← BeerSerc_ left20:41
→ BeerSerc joined20:41
→ dario joined20:41
→ eletuchy joined20:41
→ pdelvo joined20:41
← beawesomeinstead left20:41
→ GameGamer43 joined20:41
→ MrNibbles joined20:41
→ avar joined20:41
← avar left20:41
→ avar joined20:41
→ ilogger2 joined20:42
→ mmlac joined20:42
→ _Harm_B_ joined20:49
→ eijk_ joined20:51
holo what is the reason that, after sucessfully cloning a repo with "git repo <repo>", there is a .git/bin directory with lots of unix tools that wasn't previously there. screenshot of some of those tools: http://postimg.org/image/wfnrdew1t/20:55
→ gusnan joined20:55
→ Carpenter777 joined20:55
→ BSaboia joined20:55
→ tashi_ joined20:56
Akufen I rewrote history, and now my production server has a commit that my dev server has not, can I just reset --hard to remove that commit and get them ¨in sync¨ again?20:56
charon holo: can you check what's in the dirs listed in 'template directory' in man git-init? most likely one of them has that bin directory by mistake20:56
gitinfo holo: the git-init manpage is available at http://jk.gs/git-init.html20:56
holo and is there any reasonable reason for a repo in remote to have the size of 170MB and after cloning it, locally, its size is now 5.46GB?20:57
charon holo: i suspect that the last option (default template dir) is actually prefix-dependent though, so if you installed your git in some place other than /usr/, check that $PREFIX/share/git-core/templates, too20:57
holo I'll check that20:57
→ rakl joined20:57
charon we'll discuss size once you no longer have lots of templates ;)20:58
→ Goplat joined20:58
→ trungqtran joined20:58
charon git can occasionally compress your repo amazingly well, but it's something of a bordercase "issue" (or advantage, depending on how you see it)20:58
Akufen to clarify, if my production server has A B C, then my dev server has A B C D, I just need to get rid of D20:59
← rakl left20:59
charon Akufen: see !rewriting20:59
gitinfo Akufen: Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to jump through hoops (and you have to tell them to), so it's infinitely better to just move on without rewriting. That said, you can use `git push -f` to force your new history through (may get rejected, though). See http://git-scm.com/docs/git-rebase.html#_recovering_from_upstrea20:59
→ rakl joined21:00
Akufen charon, I´m the only one using this repo, and have forced a push, but now I can´t pull the rewritten history on my production server21:00
→ pandeiro` joined21:00
charon oh. yes, then do the reset21:00
Akufen ok. thanks21:01
→ AgentWillyWonka joined21:02
johnw what plumbing command does give use to determine the current value of HEAD on the remote server before doing a push?21:02
→ observ3r_ joined21:03
johnw ah, git-peek-remote, thx21:03
git-ls-remote, according to the man page21:03
→ sebrock joined21:04
← mmlac left21:04
→ jaequery joined21:08
→ infynyxx joined21:08
→ Esa_ joined21:10
→ vedant joined21:10
← pandeiro` left21:10
→ __alpaca joined21:10
→ redrocket joined21:11
johnw can I ask git to tell me the default remote for whichever branch is currently checked out?21:12
← sebrock left21:12
← Carpenter777 left21:13
→ cagedwisdom_ joined21:14
→ eletuchy joined21:15
← __alpaca left21:15
→ anli_ joined21:18
→ shruggar joined21:18
→ rudak joined21:20
→ b1rkh0ff joined21:21
← rudak left21:21
→ m_ke joined21:21
→ timsnadden joined21:21
→ offby1 joined21:24
→ elixir joined21:24
→ system64 joined21:24
← jaequery left21:25
→ hwrd|work joined21:25
← timsnadden left21:25
← anli_ left21:25
→ Xethron joined21:26
→ timsnadden_ joined21:28
→ jaequery joined21:28
→ GPHemsley joined21:30
GPHemsley Is there a way to tell git that a particular text file is not UTF-8?21:30
→ ISF joined21:30
→ inversion joined21:31
bremner GPHemsley: afaik, git doesn't care about character encoding, except perhaps 8bits.21:32
→ dreiss joined21:32
→ Kje10L joined21:32
GPHemsley bremner: Oh, hmm21:33
→ mmlac joined21:33
← mmlac left21:33
→ thong joined21:34
← vedant left21:36
→ relipse joined21:37
→ rabellamy joined21:37
← Kje10L left21:37
bremner I guess the encoding for commit messages is stored, but not for files21:38
→ rurufufuss joined21:38
→ caspingus joined21:38
→ NimeshNeema joined21:39
← thong left21:39
→ jatt joined21:42
GPHemsley Right, OK. Guess I have to handle it at a different level. Thanks.21:43
← GPHemsley left21:43
← eletuchy left21:44
→ alexisabril joined21:48
← infynyxx left21:48
← alexisabril left21:48
→ alexisabril joined21:49
→ Gentlecat joined21:49
→ Balliad joined21:50
→ developernotes joined21:50
→ SBoudrias joined21:50
→ m0ltar joined21:50
→ PeterBooker joined21:51
→ infynyxx joined21:52
→ pur3forlyphe joined21:54
→ rickruby joined21:54
→ avinashrbhat joined21:54
← avinashrbhat left21:54
← dreiss left21:55
→ Noldorin joined21:55
→ xerxas joined21:56
→ rideh joined21:56
← inversion left21:57
← pur3forlyphe left21:58
→ holo joined21:58
holo hi21:58
→ ianmcorvidae joined21:59
← rickruby left21:59
→ mklappst_ joined22:00
→ tvw joined22:01
← elixir left22:02
→ huoxito joined22:02
→ Kje10L joined22:03
→ tagava joined22:03
← ianmcorvidae left22:05
← m_ke left22:06
→ ianmcorvidae joined22:06
← ianmcorvidae left22:06
→ ianmcorvidae joined22:06
← b1rkh0ff left22:06
← developernotes left22:06
← rabellamy left22:08
→ TheNotary joined22:08
→ sebrock joined22:09
→ m_ke joined22:09
← Kje10L left22:10
→ eletuchy joined22:10
→ __alpaca joined22:10
← ianmcorvidae left22:12
← sebrock left22:13
→ ianmcorvidae joined22:13
→ vedant joined22:13
← __alpaca left22:16
← jaequery left22:19
← ianmcorvidae left22:19
← eijk_ left22:20
→ ianmcorvidae joined22:20
← ianmcorvidae left22:20
→ ianmcorvidae joined22:20
← eletuchy left22:21
→ Niels___ joined22:21
→ ergZay joined22:21
→ siprbaum joined22:21
→ garply joined22:21
→ guide joined22:21
→ aep joined22:22
← Xethron left22:22
→ felher joined22:22
← observ3r_ left22:22
holo charon, I have two different versions of git installed. both template directories have size =< 1MB. as for symlinks, i searched for "bin" with find . -name "*bin*" (and "ls -lhr| grep \>" for finding every kind of symlink) but couldn't find anything . I think your suspicion still makes sense, but maybe it's not the template-dir that contains a symlink inside22:22
→ s0x joined22:22
→ crater2150 joined22:23
→ miso1337 joined22:23
→ Xethron joined22:25
→ irqq_ joined22:26
← ianmcorvidae left22:26
→ ianmcorvidae joined22:28
← ianmcorvidae left22:28
→ ianmcorvidae joined22:28
→ HeN joined22:29
→ Rolybrau joined22:29
← mklappst_ left22:29
← caspingus left22:30
← hwrd|work left22:31
→ tfnico___ joined22:31
→ jimmyff joined22:31
→ twisted` joined22:31
→ kmels_ joined22:31
→ jab416171 joined22:32
← ianmcorvidae left22:33
→ ianmcorvidae joined22:34
← ianmcorvidae left22:34
→ ianmcorvidae joined22:34
← alexisabril left22:36
→ shennyg joined22:39
→ marhaban joined22:39
→ shadow-warrior joined22:40
→ beawesomeinstead joined22:40
← m_ke left22:40
→ ianmcorvidae|alt joined22:41
← ianmcorvidae|alt left22:41
→ ianmcorvidae|alt joined22:41
← ianmcorvidae left22:41
← gusnan left22:43
← vedant left22:45
→ eletuchy joined22:47
← ianmcorvidae|alt left22:47
→ ianmcorvidae joined22:48
← ianmcorvidae left22:48
→ ianmcorvidae joined22:48
→ m_ke joined22:48
→ _iron joined22:48
→ caspingus joined22:51
← marhaban left22:52
← Rolybrau left22:52
← kmels_ left22:52
→ JEEB joined22:55
→ ianmcorvidae|alt joined22:55
← ianmcorvidae|alt left22:55
→ ianmcorvidae|alt joined22:55
→ hwrd|work joined22:56
→ pppaul joined22:58
← ianmcorvidae left22:59
← system64 left22:59
← Balliad left23:00
→ tjadc joined23:01
← ianmcorvidae|alt left23:01
→ RalfR joined23:01
→ ianmcorvidae joined23:02
← ianmcorvidae left23:02
→ ianmcorvidae joined23:02
← miso1337 left23:02
← irqq_ left23:02
→ paolooo joined23:03
→ simesy joined23:04
→ paolooo_ joined23:04
← paolooo left23:05
← m_ke left23:06
← AgentWillyWonka left23:06
→ Jojomofoman joined23:07
→ Kje10L joined23:07
→ jyp joined23:08
← shruggar left23:08
→ ianmcorvidae|alt joined23:09
← _iron left23:09
→ sebrock joined23:09
→ mmitchell joined23:10
→ __alpaca joined23:11
→ m_ke joined23:12
← Kje10L left23:12
← m_ke left23:12
← ianmcorvidae left23:13
← ianmcorvidae|alt left23:14
→ wrouesnel joined23:14
← eletuchy left23:14
← sebrock left23:14
→ caspingu_ joined23:15
← __alpaca left23:15
→ ianmcorvidae joined23:16
← RalfR left23:16
← caspingus left23:16
→ frogonwheels joined23:17
→ dreiss joined23:19
→ jaequery joined23:19
→ stephCoue joined23:19
→ Sigma joined23:22
→ ianmcorvidae|alt joined23:23
← ianmcorvidae|alt left23:23
→ ianmcorvidae|alt joined23:23
← jaequery left23:23
→ AgentWillyWonka joined23:24
← mmitchell left23:24
→ evie_hammond joined23:24
→ lresende joined23:25
← lresende left23:25
← infynyxx left23:25
← ianmcorvidae left23:26
← caspingu_ left23:27
← ianmcorvidae|alt left23:29
→ ianmcorvidae joined23:30
← ianmcorvidae left23:30
→ ianmcorvidae joined23:30
→ lavaman joined23:30
→ kxa joined23:30
→ LuxuryMode joined23:31
→ boombatower joined23:34
→ jan joined23:35
jan → Guest7005923:35
→ ianmcorvidae|alt joined23:37
→ R1KRDO joined23:37
→ madewokherd joined23:38
→ ddv joined23:40
→ kakos joined23:40
→ bytephilia joined23:41
← ianmcorvidae left23:41
→ eletuchy joined23:41
← rakl left23:41
→ caspingus joined23:42
← caspingus left23:42
→ caspingus joined23:42
← Guest70059 left23:43
← caspingus left23:43
→ kaictl joined23:43
→ j416 joined23:44
→ ianmcorvidae joined23:44
← ianmcorvidae left23:44
→ ianmcorvidae joined23:44
→ caspingus joined23:45
← boombatower left23:48
→ paddymahoney joined23:48
← ianmcorvidae|alt left23:48
→ boombatower joined23:48
← tagava left23:50
← ianmcorvidae left23:50
→ ianmcorvidae joined23:51
← ianmcorvidae left23:51
→ ianmcorvidae joined23:51
← eletuchy left23:52
← bytephilia left23:52
← shadow-warrior left23:52
→ InvidFlower joined23:53
← hwrd|work left23:53
→ hwrd|work joined23:55
← R1KRDO left23:57
← ianmcorvidae left23:57
→ ianmcorvidae joined23:58
← ianmcorvidae left23:58
→ ianmcorvidae joined23:58
→ alexisabril joined23:59

Logs Search ←Prev date Next date→ Channels Documentation