IRCloggy #git 2013-04-09

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-09

→ beneggett joined00:00
→ EvanDotPro joined00:00
← EvanDotPro left00:00
→ EvanDotPro joined00:00
← khushildep left00:00
→ etcetera joined00:00
→ khushildep joined00:00
→ x82_nicole joined00:00
→ siriuz joined00:01
→ PixelCrumbs joined00:02
→ hlysig joined00:03
→ simesy joined00:03
← chamunks left00:04
→ yshh joined00:06
← siriuz left00:07
→ pppaul joined00:07
← pppaul left00:07
← yshh left00:08
→ pppaul joined00:08
→ yshh joined00:08
→ mitz_ joined00:08
→ rakl joined00:08
→ setmeaway joined00:08
← rurufufuss left00:09
← spaceships left00:09
← pppaul left00:10
→ spaceships joined00:10
→ siriuz joined00:11
← mitz_ left00:15
→ rvsjoen joined00:16
← rvsjoen left00:16
→ rvsjoen joined00:16
← siriuz left00:17
← hlysig left00:17
→ cbot_ joined00:19
→ BSaboia joined00:19
← _iron left00:19
← nadirvardar left00:20
→ hlysig joined00:21
→ siriuz joined00:21
→ BiggFREE joined00:23
← BiggFREE left00:23
← ibash left00:23
→ BiggFREE joined00:23
← BiggFREE left00:23
→ BiggFREE joined00:24
← AaronMT left00:25
→ R1KRDO joined00:25
→ bytephilia joined00:26
→ AdrienBrault joined00:26
← siriuz left00:27
→ AaronMT joined00:28
→ Squarism joined00:28
← yshh left00:28
→ huoxito joined00:29
→ btree_ joined00:29
→ siriuz joined00:29
Squarism from master i created a branch (say A), that i havent committed to, instead i created a new branch B. Now ive committed to B and want to push it. In my git client (intellij idea) it looks as if wants to push the whole damn index/complete set of commits ever?!00:30
...i created B from A.00:30
← dreiss left00:31
hiptobecubic SamB, Sam(uel)B(ronson) ?00:31
Squarism oh.. was a client issue00:32
.../or user issue00:32
→ ehsan joined00:33
juvenal → juvenal_away00:34
Eugene PEBKAC00:34
← beneggett left00:34
← siriuz left00:35
← cbot_ left00:35
→ pppaul joined00:35
→ Eridius joined00:37
← garbagecollectio left00:37
← btanaka left00:37
→ beneggett joined00:38
← goshawk left00:38
→ w09x joined00:40
→ mikehaas763 joined00:41
← johnfg_ left00:41
→ siriuz joined00:41
→ tinti joined00:43
juvenal_away → juvenal00:45
← sgu left00:46
← siriuz left00:47
← BSaboia left00:48
← Davey left00:48
→ cbot_ joined00:50
→ garbagecollectio joined00:50
→ trusktr joined00:51
→ siriuz joined00:52
← huoxito left00:52
← danishkhan left00:52
← jdunck left00:52
← hyperair left00:53
→ Andromed_ joined00:53
← cellardoor left00:53
← hwrd|work left00:55
← Andromeda left00:55
← barneybook left00:55
→ murr4y joined00:56
→ tjbiddle_ joined00:57
← siriuz left00:57
← hlysig left00:57
← Squarism left00:58
→ Dougie187 joined00:59
Dougie187 Is there a (relatively easy) way of putting a new file in every commit in the history?00:59
← tjbiddle left01:00
→ yshh joined01:00
← maletor left01:01
← tjbiddle_ left01:01
→ siriuz joined01:01
milki Dougie187: filter-branch and magic01:02
→ weiyang joined01:02
offby1 magic is hard!01:02
Not as hard as comedy, but ...01:02
Dougie187 ololol01:03
filter-branch huh.01:03
→ huoxito joined01:03
→ engkur joined01:04
← aberrant left01:04
→ oriba joined01:04
← siriuz left01:05
← bytephilia left01:05
Dougie187 milki: that's so cool. Thanks01:07
← micahf left01:07
← delinquentme left01:07
milki ya01:08
just be careful with it01:08
itll automatically backup your branch to refs/original01:08
but you might want to make a backup yourself01:08
Dougie187 Well, I'm just testing for now.01:08
I'm pulling an svn repo, and I want to add .gitignores.01:08
because it contains empty dirs and stuff01:08
← trungqtran left01:09
Dougie187 so, I can mess up the git svn repo, and then just check it out again01:09
← btree_ left01:09
→ megha joined01:10
→ v0n joined01:10
← setmeaway left01:10
→ yshh_ joined01:10
← baba left01:11
→ siriuz joined01:11
← yshh left01:11
→ Vampire0_ joined01:12
→ antback joined01:13
← jaequery left01:13
Dougie187 What do you do with the backup that filter-branch creates?01:13
← pppaul left01:14
← Phoenixz left01:15
thin Hi01:15
I have a working copy on my mac. A central repository on bitbucket. And another working copy on my windows PC01:16
→ Davey joined01:16
thin 3 hours ago I made a change on my mack and pushed it up to bitbucket (using a gui)01:16
how do I now get those changes onto my files on the PC?01:16
→ avinashrbhat joined01:17
Dougie187 git fetch && git merge01:17
or something similar.01:17
← siriuz left01:17
→ dreiss joined01:17
thin How can I see what's different between my PC files and the bitbucket files?01:18
← marcdel left01:18
Dougie187 I think something like `git diff origin master`01:19
but that could be wrong.01:19
maybe after you do a git fetch, you do a 'git diff HEAD'01:20
milki thin: after fetch, git diff origin/master01:20
→ pppaul joined01:20
← pppaul left01:20
thin so does fetch not automatically overwrite my local files with the newer files on the web?01:20
milki origin is the remote name01:20
master is the branch from the remote01:20
that is related to your current branch01:21
thin: exactly01:21
← markalanevans left01:21
Dougie187 fetch does not. pull does.01:21
milki it stores the branch pointers in <remotename>/<branchname>01:21
→ pppaul joined01:21
← pppaul left01:21
milki thin: see git branch -r01:21
→ pppaul joined01:22
← haydenmuhl left01:22
thin so if want to see what I changed i must first "fetch", then compare or "diff" remotoes/origin/mater against my local/master ?01:22
→ siriuz joined01:22
milki yes, but your branchnames are probably wrong01:22
you dont need the remotes/01:23
→ pdurbin joined01:23
milki hm, but it might work with that o.OP01:24
dunno about local/01:24
← mikehaas763 left01:26
thin what's the difference between origin/HEAD and origin/master01:26
← siriuz left01:27
← R1KRDO left01:27
milki dont worry about origin/HEAD01:27
← dreiss left01:27
milki its not something you should be using01:27
← gusnan left01:28
→ robottinosino joined01:29
→ fedora_noob joined01:29
← fedora_noob left01:29
→ tmcmahon joined01:30
→ geforceter joined01:31
→ hwrd|work joined01:31
→ hyperair joined01:31
→ dhruvasagar joined01:31
gitinfo set mode: +v01:31
→ anonymuse joined01:31
geforceter hello01:31
gitinfo geforceter: 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:31
← holodoc left01:31
→ stliu joined01:32
→ siriuz joined01:32
→ benjings joined01:33
→ Cassiel joined01:33
geforceter hello people. i need some help with git in fedora. i have repository in bitbucket. i am trying to pull code from it and am getting a "fatal: Unable to find remote helper for 'sh'". any help would be appreciated. thanks01:34
→ infynyxx joined01:34
→ mstormo joined01:35
mstormo → Guest4103401:35
→ Watabou joined01:36
→ stack_ joined01:36
← siriuz left01:37
→ NiteRain joined01:37
← etcetera left01:37
→ kpreid joined01:37
← rakl left01:37
→ Goplat joined01:38
← bulletmark left01:38
→ mezner joined01:38
← stack left01:38
juvenal → juvenal_away01:39
→ erkules_ joined01:39
← ErKa left01:39
← m0ltar left01:40
← hkj left01:40
→ siriuz joined01:40
Guest41034 → mstormo101:40
mstormo1 → mstormo_01:40
← anonymuse left01:40
→ dreiss joined01:41
→ wrouesnel joined01:41
→ normanrichards joined01:42
← engkur left01:43
← erkules_ left01:44
← thiago left01:45
→ mikehaas763 joined01:46
← siriuz left01:46
→ marcdel joined01:46
← benjings left01:46
→ erkules_ joined01:46
← normanrichards left01:47
→ jaequery joined01:47
← trusktr left01:47
← markenranosa left01:48
→ astroo- joined01:48
→ gerep joined01:50
→ barneybook joined01:50
← natechan left01:50
← spaceships left01:50
→ mois3x joined01:51
→ trungqtran joined01:51
→ Milossh joined01:51
→ btree joined01:51
→ siriuz joined01:52
← cbot_ left01:52
← dregad left01:52
← w09x left01:52
← AaronMT left01:53
← marcdel left01:53
← wrouesnel left01:53
← gerep left01:53
← huoxito left01:54
→ nadirvardar joined01:54
← infynyxx left01:54
← nadirvardar left01:56
→ jjardon joined01:56
→ mitz_ joined01:56
→ engkur joined01:56
→ marcdel joined01:56
← siriuz left01:57
← plumpkin- left01:57
→ stack joined01:57
juvenal_away → juvenal01:58
← stack_ left01:59
← jaequery left01:59
→ infynyxx joined02:01
→ stack_ joined02:02
→ siriuz joined02:02
← stack left02:02
→ spaceships joined02:03
→ gerep joined02:04
→ docwhat joined02:04
← Guest17719 left02:04
← gerep left02:04
→ trusktr joined02:05
→ bmac joined02:06
← stack_ left02:06
→ stack joined02:07
← siriuz left02:07
← barneybook left02:07
→ barneybook joined02:08
← AdrienBrault left02:08
→ xiukun joined02:09
← mezner left02:10
← barneybook left02:10
→ barneybook joined02:10
← engkur left02:10
→ luc_ joined02:11
← stack left02:12
→ stack joined02:12
→ siriuz joined02:12
→ ryez_ joined02:13
← micky62g left02:14
→ micky62g joined02:15
← barneybook left02:16
→ mezner joined02:16
→ rakl joined02:16
← siriuz left02:17
→ yuwang joined02:17
← Octalot left02:18
→ siriuz joined02:18
← hwrd|work left02:19
→ rpg joined02:20
→ barneybook joined02:20
← surfdue left02:20
→ jaequery joined02:21
→ hwrd|work joined02:21
← barneybook left02:22
→ surfdue joined02:22
← pppaul left02:22
→ barneybook joined02:23
→ anonymuse joined02:24
→ danishkhan joined02:25
← frenchlaf left02:26
← siriuz left02:26
→ barneybook|2 joined02:27
← dijonyummy left02:27
← griotspeak left02:28
← barneybook left02:28
→ thiago joined02:29
→ siriuz joined02:29
← barneybook|2 left02:30
→ barneybook|2 joined02:30
← geforceter left02:30
← mois3x left02:31
← skorgon left02:31
← danishkhan left02:31
→ mois3x joined02:31
→ ISF joined02:31
← barneybook|2 left02:32
→ barneybook|2 joined02:32
→ griotspeak joined02:33
→ skorgon joined02:33
← siriuz left02:36
← mois3x left02:37
→ rchavik joined02:37
→ btanaka joined02:38
→ siriuz joined02:39
← barneybook|2 left02:39
→ dijonyummy joined02:40
← skorgon left02:41
← mercwithamouth left02:42
→ bsaberid joined02:42
→ etcetera joined02:43
→ mercwithamouth joined02:43
← etcetera left02:45
← oriba left02:45
→ etcetera joined02:46
← Cassiel left02:46
← siriuz left02:47
→ normanrichards joined02:47
← etcetera left02:47
→ soooga joined02:48
→ skorgon joined02:48
← soooga left02:49
→ orafu joined02:49
← PixelCrumbs left02:50
→ siriuz joined02:50
→ barneybook joined02:50
← simesy left02:51
← barneybook left02:51
→ preflex_ joined02:52
→ jackh joined02:52
preflex_ → preflex02:53
→ barneybook joined02:53
← barneybook left02:54
← bsaberid left02:55
→ jjore joined02:56
← skorgon left02:56
→ bsaberid joined02:56
→ soooga joined02:56
→ barneybook joined02:57
← siriuz left02:57
← dhruvasagar left02:57
→ Schmoozerd joined02:58
← gwty left02:58
→ echo-area joined02:58
← barneybook left02:58
→ siriuz joined02:59
← soooga left03:01
→ barneybook joined03:01
← barneybook left03:03
→ barneybook joined03:04
← barneybook left03:05
← siriuz left03:05
← tmcmahon left03:05
→ offby1 joined03:09
→ engkur joined03:09
← offby1 left03:09
→ offby1 joined03:09
← mezner left03:10
→ marienz_ joined03:12
→ revyd joined03:13
← keller left03:13
→ siriuz joined03:14
→ k_sze[work] joined03:16
← nathanr left03:16
← griotspeak left03:20
→ jdunck joined03:21
→ simesy joined03:22
→ tjbiddle joined03:22
← siriuz left03:23
← btree left03:24
→ siriuz joined03:24
→ etcetera joined03:24
→ aksnot joined03:24
→ skorgon joined03:24
→ pppaul joined03:25
← aksnot left03:25
→ beautifulmind joined03:26
← simesy left03:27
k_sze[work] I just read the introductory section of the git-deploy documentation and I'm still not sure what exactly it does.03:27
Eugene Me neither. That's why we usually point to !deploy and then disavow all involvement.03:28
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/the-list-and-irc/deploy.html03:28
← bsaberid left03:29
→ mithro joined03:29
→ barneybook joined03:30
← barneybook left03:31
← mithro left03:31
→ barneybook joined03:32
← siriuz left03:32
← skorgon left03:33
← barneybook left03:33
→ siriuz joined03:34
→ garbagecollect-1 joined03:34
eletuchy gsw03:35
← garbagecollectio left03:35
→ Saby joined03:35
← Saby left03:35
→ Saby joined03:35
→ taylorlapeyre joined03:35
← bmac left03:36
→ barneybook joined03:37
← barneybook left03:37
→ Lefont joined03:37
→ barneybook joined03:38
← hwrd|work left03:38
← barneybook left03:38
← jjore left03:39
→ barneybook joined03:39
← barneybook left03:39
→ barneybook joined03:40
← siriuz left03:41
← chrisgeorge left03:43
→ siriuz joined03:44
← beneggett left03:46
→ beneggett joined03:48
← rpg left03:51
→ skorgon joined03:51
← siriuz left03:51
→ squisher joined03:52
→ irqq joined03:53
→ barneybook|2 joined03:54
→ siriuz joined03:54
← robbyoconnor left03:54
← barneybook|2 left03:54
→ barneybook|2 joined03:55
← barneybook left03:55
→ Error404NotFound joined03:57
→ markalanevans joined03:57
← eletuchy left03:58
← Error404NotFound left03:58
→ simesy joined04:00
← pppaul left04:00
→ AJA joined04:00
→ kerrick joined04:01
← kukks left04:01
← siriuz left04:01
← garbagecollect-1 left04:02
→ subhojit777 joined04:03
← Dougie187 left04:04
→ d3O joined04:04
← skorgon left04:04
→ Sigma joined04:04
→ siriuz joined04:04
← m0viefreak left04:07
→ bsaberid joined04:08
→ pppaul joined04:08
→ pradi joined04:11
← siriuz left04:12
← micky62g left04:13
← jaequery left04:13
← Lefont left04:14
wagle can you revert a revert?04:14
wagle should just try it04:15
→ aksnot joined04:15
→ siriuz joined04:15
squisher wagle, yes and yes04:15
Eugene wagle - yes. Or you could cherry-pick what the revert reverted.04:15
wagle Eugene: yeah cherry pick was my hidden followup question04:16
Eugene `git revert` is really `git cherry-pick` in reverse ;-)04:16
wagle hmm..04:17
thanks04:17
→ cbot_ joined04:18
← astroo- left04:20
← aksnot left04:20
← trungqtran left04:21
← dorkmafi1 left04:21
← siriuz left04:21
→ siriuz joined04:24
juvenal → juvenal_away04:25
← bsaberid left04:27
→ nardev joined04:27
← irqq left04:27
← nardev left04:28
→ nardev joined04:29
→ hoschi joined04:31
→ jjore joined04:31
← siriuz left04:32
→ hwrd|work joined04:32
← hwrd|work left04:32
← taylorlapeyre left04:33
→ siriuz joined04:34
← cbot_ left04:34
→ Error404NotFound joined04:39
juvenal_away → juvenal04:41
← siriuz left04:41
← nardev left04:44
→ dc5ala joined04:44
→ nardev joined04:44
→ Tommy[D] joined04:44
← dc5ala left04:44
→ R1KRDO joined04:44
← Tommy[D]_ left04:47
→ siriuz joined04:48
→ cbot_ joined04:49
← anonymuse left04:49
→ ryk_ joined04:50
→ groundup joined04:51
← BiggFREE left04:51
gitinfo set mode: +v04:52
→ dvide joined04:52
→ Villadelfia joined04:53
gitinfo set mode: +v04:54
ryk_ hello, I have setup gitolite with my server's root user, now I can not access the shell. And using telnet returns protocol mismatch. Anyone know how can I deal with it...?04:54
→ private joined04:55
private → Guest6922304:55
squisher ryk_, you set your root users shell to gitolite?04:55
ryk_ yes/04:55
juvenal → juvenal_away04:56
← siriuz left04:56
squisher ryk_, ok, that's not what you want to do.04:57
do you still have a root shell open on that machine?04:57
grawity you're supposed to use ssh, not telnet04:57
→ SeySayux joined04:58
grawity especially because "Protocol mismatch" is a sshd message...04:58
ryk_ squisher, yes, I first set it up with root and failed, then I read the document and I setup successful with another user git. but after I logout i can not login with root shell04:58
squisher grawity, changing the root shell to a restricted shell is probably still not what you want to do ;-)04:59
→ helgikrs joined04:59
squisher ryk_: if you do have a root shell open, change it back: chsh04:59
→ siriuz joined04:59
→ arvind_khadri joined04:59
ryk_ but no more shell open now...05:00
← avinashrbhat left05:00
ryk_ grawity, I tried telnet but failed with that message.05:00
squisher ryk_, do you have an regular user with a regular shell?05:01
grawity ryk_: that's why I said "ssh not telnet" >_<05:02
ryk_ squisher, seems not..05:02
grawity, T_T05:03
squisher ryk_, boot from a rescue cd05:04
then edit the root shell back to something sensible like /bin/bash05:04
→ barneybook joined05:04
→ skorgon joined05:04
← barneybook|2 left05:05
→ ergZay joined05:05
→ pretty_function joined05:05
← barneybook left05:05
→ jceb joined05:05
→ barneybook joined05:06
← Sigma left05:06
← siriuz left05:06
thiago there aren't many people who remember using telnet to log in to remote systems...05:06
Eugene I do.05:06
I still use it05:06
thiago I do too, but we're minority05:06
how about rsh?05:07
← barneybook left05:07
squisher Eugene, what do you use it for, if I can ask?05:07
← cbot_ left05:07
thiago telnets to his router05:07
Eugene Gladly not05:07
→ barneybook joined05:07
← mikehaas763 left05:08
ryk_ thiago, Can I telent to the server with sshd?05:08
Vampire0_ → Vampire005:08
Eugene I have a few antiques plugged up in the basement05:08
← bgerber left05:08
← barneybook left05:08
← pppaul left05:08
→ goshawk joined05:08
→ barneybook joined05:08
ryk_ squisher, It's a VPS so I may need contact the provider05:08
→ bgerber joined05:09
← barneybook left05:09
→ barneybook joined05:09
→ siriuz joined05:09
→ fooey joined05:10
← barneybook left05:10
→ barneybook joined05:11
→ ozette joined05:11
← Milossh left05:11
← barneybook left05:11
→ shruggar joined05:11
→ barneybook joined05:12
squisher ryk_, often vps providers allow you to boot a rescue cd, too, check the admin interface05:12
← thin left05:12
→ vedant_ joined05:13
← skorgon left05:13
ryk_ squisher, thanks, I will check it.05:14
→ robbyoconnor joined05:14
→ jaseemabid joined05:14
← ozette left05:15
→ _iron joined05:15
→ libin_v joined05:15
← barneybook left05:16
← siriuz left05:16
← robbyoconnor left05:16
← kerrick left05:17
→ robbyoconnor joined05:17
→ kerrick joined05:17
libin_v Need svn help, I have a svn repo which does not have trunk, but has tags . How do I create a trunk from git05:17
ChanServ set mode: -v05:19
shruggar libin_v: can you explain your situation any more than that?05:19
→ leeN joined05:20
→ siriuz joined05:20
← goshawk left05:20
ryk_ → rykka05:21
→ b1rkh0ff joined05:21
→ dsdeiz joined05:21
← vedant_ left05:22
libin_v shruggar: The svn repo follows the std layout, but for this particular project, we just have 2 tags (v1 & v2), no branches no trunk. Some one manually commited the source instead of using the dump. I dont have write access to the svn yet. But I would like to create a trunk from one of the tags (v2)05:22
→ vedant_ joined05:22
← vedant_ left05:23
→ vedant_ joined05:24
→ pantsman joined05:26
← pantsman left05:26
→ pantsman joined05:26
← siriuz left05:28
← madewokherd left05:28
→ siriuz joined05:29
← Schmoozerd left05:30
→ skorgon joined05:30
→ Milossh joined05:31
← xiukun left05:32
→ ph^ joined05:33
← Sky[x] left05:34
← jaseemabid left05:35
→ jaseemabid joined05:35
← jaseemabid left05:36
Eugene `git svn clone` it, then you can start a git branch off the resultant tag05:36
← siriuz left05:36
→ xiukun joined05:36
→ Fullma joined05:38
→ miso1337 joined05:38
← ph^ left05:38
← skorgon left05:38
← Saby left05:39
← jceb left05:39
→ siriuz joined05:39
→ h0bbit joined05:40
← vedant_ left05:41
→ avinashrbhat joined05:41
→ hwrd|work joined05:41
→ rgngl joined05:42
← etcetera left05:42
← beautifulmind left05:42
← pradi left05:42
→ Dr4k3 joined05:43
← hwrd|work left05:43
→ Wulf joined05:44
← ryez_ left05:44
← Dr4k3 left05:45
→ ryez_ joined05:45
→ hwrd|work joined05:46
← btanaka left05:46
← Galaris_ left05:46
← siriuz left05:47
→ soee joined05:48
→ beautifulmind joined05:48
← v0n left05:49
← rykka left05:49
→ fRAiLtY- joined05:49
→ siriuz joined05:49
→ rykka joined05:50
← pur3forlyphe left05:51
→ pur3forlyphe joined05:51
→ jaseemabid joined05:53
→ wrouesnel joined05:53
→ Katafalkas joined05:54
← spaceships left05:54
→ chamunks joined05:55
← jjore left05:55
→ skorgon joined05:56
→ longbeach joined05:56
← siriuz left05:56
→ modInfo3 joined05:57
→ lun_ joined05:58
← robbyoconnor left06:00
→ siriuz joined06:00
→ Wulf4 joined06:01
← wrouesnel left06:01
→ rob_w joined06:02
→ rickruby joined06:02
→ mikehaas763 joined06:03
→ asdf1 joined06:03
← skorgon left06:04
← pitzips left06:04
← asdf1 left06:04
→ papegaaij joined06:05
← Wulf left06:05
→ lb1a joined06:06
← lb1a left06:06
→ lb1a joined06:06
← fooey left06:06
← siriuz left06:07
← R1KRDO left06:07
→ fooey joined06:07
→ PanPan joined06:07
→ siriuz joined06:08
→ dean[h] joined06:09
→ ThomasLocke joined06:09
← beautifulmind left06:09
← mercwithamouth left06:09
← shruggar left06:10
dean[h] Morning. I committed some code this morning, and then made some further changes which are not yet committed. They are unstaged. I want to basically combine the changes from the last commit, and what I currently have in my working copy into one commit. How can I do this? I read something like this might work on stackoverflow: git reset --soft HEAD^ but I'm not sure...06:10
_ikke_ dean[h]: git add <files>; git commit --amend06:11
dean[h] So the first command adds the files to staging, but the second command unstages files from the previous commit? There won't be a conflict here? Even if they adjust the same files?06:12
In fact, they are even adjusting the same lines06:12
→ vedant_ joined06:12
→ anderse joined06:13
_ikke_ dean[h]: The second command creates a new commit with the same message as the previous commit, but with the current contens of the index06:14
← vedant_ left06:14
dean[h] hm, okay, here goes...06:14
lb1a _ikke_: damn, i just had typed in a long explanation. but yours is better and shorter :D06:14
→ cbreak-work joined06:15
→ vedant_ joined06:15
→ nilg` joined06:16
_ikke_ lb1a: "I would have written you a shorter message, but I didn't have time"06:16
lb1a ^^06:16
dean[h] You say the second command creates a new commit, so does it erase the previous?06:16
_ikke_ dean[h]: yes06:16
dean[h] It worked btw, just trying to understand what happened ;-)06:16
lb1a dean[h]: yes and no ;)06:17
_ikke_ dean[h]: (the commit itself is not deleted btw, it's just not referenced anymore)06:17
← siriuz left06:17
dean[h] This command is going to help save my git workflow in the future. The amount of times I commit tiny changes towards one single big problem06:17
lb1a dean[h]: the previous want be visible in your history. but it's still in your git repo. you can search the sha e.g. git reflog and use it again. but in short. yes it's gone for now06:17
dean[h] Is there a cleaner way of doing this? Perhaps a rebase?06:18
→ beautifulmind joined06:18
dean[h] Which would adjust the history, given I don't push that often to an origin06:18
lb1a dean[h]: it's not the perfect git workflow. if you use many small commits and want to refactor them later, it's possible using rebase or reset06:18
→ jceb joined06:18
← khushildep left06:18
lb1a dean[h]: i think !sausage has the long explanation06:18
gitinfo dean[h]: [!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 !perfect06:18
lb1a a yes :)06:19
hyperair !perfect06:19
gitinfo [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.06:19
dean[h] haha sausage making :D06:19
→ siriuz joined06:19
dean[h] I think it's high time I learnt this rebase stuff. I often push dirty commits06:19
git log06:20
whoops wrong box06:20
← vedant_ left06:20
→ skorgon joined06:20
lb1a dean[h]: it's easier than you might thought. but use a !backup ^^06:21
gitinfo dean[h]: Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups06:21
← Guest69223 left06:22
← libin_v left06:23
← squisher left06:24
→ goshawk joined06:25
← siriuz left06:25
← rickruby left06:26
→ libin_v joined06:26
← mishok13 left06:27
← anderse left06:28
→ rath joined06:28
→ nicolash joined06:28
← skorgon left06:28
→ ketas joined06:28
← libin_v left06:29
→ mossplix joined06:30
← mossplix left06:30
→ lavong joined06:30
→ tim joined06:31
→ ph^ joined06:32
← nicolash left06:32
← ph^ left06:32
→ siriuz joined06:34
← goshawk left06:35
→ psoo joined06:36
→ ph^ joined06:36
← jaseemabid left06:37
→ alexander__b joined06:37
→ jaseemabid joined06:38
← alexander__b left06:38
→ alexander__b joined06:38
→ mossplix joined06:39
juvenal_away → juvenal06:39
→ netiul joined06:41
← siriuz left06:41
→ fsvehla joined06:41
→ siriuz joined06:43
→ jjido joined06:44
→ prudnikov joined06:44
→ shruggar joined06:44
→ maxandersen joined06:45
← maxandersen left06:45
→ maxandersen joined06:46
← maxandersen left06:46
→ maxandersen joined06:46
← prudnikov left06:46
← ph^ left06:46
→ ph^ joined06:48
← fooey left06:48
→ rurufufuss joined06:50
→ mishok13 joined06:51
→ mihamina joined06:52
← siriuz left06:52
← LekeFly left06:52
→ Raging_Hog joined06:54
→ siriuz joined06:55
→ _Qman joined06:56
← x82_nicole left06:57
→ JosefAssad joined06:57
← bartman` left06:57
→ bartman` joined06:58
← Error404NotFound left06:58
→ Err404NotFound joined06:59
← mikehaas763 left06:59
→ jnavila joined06:59
← p3lim left07:00
← normanrichards left07:00
→ p3lim joined07:00
← beautifulmind left07:00
← Err404NotFound left07:01
→ jnavila_ joined07:01
← Davey left07:01
→ Sky[x] joined07:01
← siriuz left07:01
→ flijten joined07:01
→ Err404NotFound joined07:01
→ jnavila__ joined07:01
→ rosslagerwall joined07:02
← rosslagerwall left07:03
→ dhruvasagar joined07:03
← jnavila left07:04
→ siriuz joined07:04
→ exidl joined07:04
← s0x_ left07:04
← jjido left07:04
→ jjido joined07:05
→ suy joined07:05
← jnavila_ left07:06
→ skorgon joined07:07
→ nabdev joined07:08
→ whowantstolivefo joined07:09
← gkatsev left07:10
← nabdev left07:10
← dreiss left07:10
→ dreiss joined07:11
→ gkatsev joined07:11
← dreiss left07:12
← leeN left07:12
← siriuz left07:12
← mihamina left07:13
→ pradi joined07:13
→ Davey joined07:14
→ robbyoconnor joined07:14
→ Heath__ joined07:14
← Davey left07:14
→ siriuz joined07:15
→ irqq joined07:16
← shruggar left07:16
→ timj joined07:16
← AJA left07:16
→ marthinal joined07:17
← skorgon left07:17
← mossplix left07:18
→ mastro joined07:19
→ Dr4k3 joined07:20
← mastro left07:20
→ prudnikov joined07:20
→ mastro joined07:21
← siriuz left07:22
→ skorgon joined07:22
→ mulinux joined07:22
← kerrick left07:23
→ FatDarrel joined07:23
→ Yougi joined07:24
→ siriuz joined07:24
→ JohnBat26 joined07:24
→ nigelb joined07:25
← JohnBat26 left07:25
→ kerrick joined07:25
→ JohnBat26 joined07:25
→ Sonderblade joined07:26
← mulinux left07:26
→ mulinux joined07:26
← Sonderblade left07:27
→ jargon joined07:27
← jargon left07:27
→ jargon joined07:27
→ Sonderblade joined07:27
→ mossplix joined07:27
← thiago left07:28
→ LekeFly joined07:28
→ VarunDotCuDotCc joined07:30
→ nabdev joined07:30
← skorgon left07:30
← nabdev left07:30
→ nabdev joined07:30
VarunDotCuDotCc Hi, why in Git, we have to append every statement with "Git"07:31
jjido are you serious?07:31
← siriuz left07:31
← kerrick left07:31
VarunDotCuDotCc Yes, I'm learning Git.07:31
← Sonderblade left07:31
→ juril joined07:31
VarunDotCuDotCc I hate every time appending "Git"07:32
→ Sonderblade joined07:32
→ kerrick joined07:32
→ LeMike joined07:32
jjido you are not "in Git"07:32
you are on the command line07:32
→ dreiss joined07:32
VarunDotCuDotCc Git Bash07:32
← hyperair left07:33
→ h2ero joined07:33
VarunDotCuDotCc Any good reason for it.07:33
→ qwertz_ joined07:33
→ siriuz joined07:33
_ikke_ VarunDotCuDotCc: You have to tell the command line which program you want to invkoe07:34
invoke07:34
VarunDotCuDotCc: Because it can do more than only git07:34
→ hyperair joined07:35
hiptobecubic heh07:35
VarunDotCuDotCc Oh! Now I understand you mean like "VIM README"07:35
→ trema13 joined07:35
_ikke_ VarunDotCuDotCc: for example07:35
← kerrick left07:35
VarunDotCuDotCc Thanks for clearing mt doubt.07:35
→ alorence joined07:35
VarunDotCuDotCc my07:35
→ kerrick joined07:36
← PaulCapestany left07:37
→ skorgon joined07:38
← simesy left07:39
Nevik >doubt07:41
← VarunDotCuDotCc left07:41
Nevik more like http://i3.kym-cdn.com/photos/images/newsfeed/000/234/739/fa5.jpg07:41
← exidl left07:42
← infynyxx left07:42
← siriuz left07:42
← pantsman left07:42
→ luneff joined07:42
← jjido left07:43
luneff hello, guys. i need to have a git diff of subdirectory inside my repo so that the resulting patch lines start with subdirectory, not with the full prefix. how do i do that?07:43
→ siriuz joined07:44
→ maasan joined07:44
← maasan left07:44
← skorgon left07:45
_ikke_ git diff --relative07:45
← beneggett left07:46
← mulinux left07:47
← h2ero left07:47
→ h2ero joined07:48
→ maxmanders joined07:48
← prudnikov left07:48
luneff thank you very much, _ikke_07:49
→ beneggett joined07:50
→ samuel02 joined07:50
luneff i was already on the way to sedding stuff out :-)07:51
→ narfnarf joined07:51
← siriuz left07:52
→ skorgon joined07:52
← mitz_ left07:52
← mossplix left07:52
← bgerber left07:54
→ siriuz joined07:55
→ thelodger joined07:55
← Dr4k3 left07:55
→ taylanub joined07:57
→ bgerber joined07:57
taylanub Is Git expected to work fine on an NTFS/NFS ?07:57
→ pii3 joined07:58
_ikke_ taylanub: Yes, but don't expect good performance07:58
← Goplat left07:59
→ mitz_ joined08:00
← tjbiddle left08:00
→ mossplix joined08:00
← skorgon left08:00
taylanub OK, thanks. I had weird issues and wasn't sure if it's Git or the tools I work with. Must've been Apple crappiness.08:00
← siriuz left08:02
← Vile left08:02
→ bruno_ joined08:03
→ dsirijus joined08:04
→ Mrdarknezz joined08:05
← Mrdarknezz left08:05
← bruno_ left08:05
→ siriuz joined08:05
→ Anders_J joined08:05
→ daniel_- joined08:06
→ skorgon joined08:07
→ shruggar joined08:07
→ rudak joined08:08
→ garply joined08:08
← dreiss left08:08
→ aep joined08:08
→ alkino joined08:08
→ guide joined08:09
→ Dr4k3 joined08:09
megha i am running arch linux as my main machine and debian in a virtual machine, can i configure my git account on both the machine ? just by copying the config files ?08:11
_ikke_ megha: git account?08:11
You mean your name and e-mail address?08:12
← siriuz left08:12
→ s0x joined08:12
megha _ikke_: yes08:13
→ siprbaum joined08:13
pii3 hi08:13
gitinfo pii3: 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.08:13
_ikke_ You can just copy the config file08:13
pii3 i have problem and i need a solution08:13
megha _ikke_: ok :)08:14
_ikke_ Just tell your problem, and perhaps we have a solution08:14
pii3 i have an excel file and want to share it with friend for editting together in a secure way08:14
_ikke_ How secure?08:14
pii3 i dont want that everyone download the file and edit and then upload it08:14
→ crater2150 joined08:14
pii3 some how online editting or ... with versioning and ...08:14
→ siriuz joined08:15
_ikke_ pii3: versioning excel files in git isn't straight-forward08:15
← skorgon left08:15
pii3 any other solution08:15
?08:15
→ achadwick joined08:15
_ikke_ Excel has versioning built-in, and I believe also collaboration08:15
← kerrick left08:16
← samuel02 left08:16
← rykka left08:16
→ zoresvit joined08:16
pii3 what about online editing without need to download and upload everytime?08:16
_ikke_ pii3: google docs?08:17
pii3 yeah with git we have to push and pull everytime :( i forgot that08:17
→ hkj joined08:17
← hkj left08:17
_ikke_ And you need to merge, which causes merge conflicts08:18
→ hkj joined08:18
← hkj left08:18
→ spuz joined08:18
→ hkj joined08:19
← hkj left08:19
pii3 hmm yeah right, thank you _ikke_08:19
→ Hounddog joined08:19
→ hkj joined08:19
← hkj left08:19
→ hkj joined08:20
osse If I want to split a commit in two, can I rebase -i, select to edit the commit in question, and then commit twice before rebase --continue?08:20
← Raging_Hog left08:21
_ikke_ osse: first git reset HEAD^, but then, yeah, you can just commit twice08:21
(edit first applies the commit, then drops you to the cli)08:22
← siriuz left08:22
erkules_ → erkules08:22
→ KevinSjoberg joined08:22
← pur3forlyphe left08:23
→ skorgon joined08:23
← jdunck left08:24
← pradi left08:24
→ siriuz joined08:24
← hyperair left08:26
→ hyperair joined08:27
→ Birdimol joined08:28
gitinfo set mode: +v08:29
Birdimol hi all08:29
gitinfo Birdimol: 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.08:29
← hkj left08:30
Birdimol I got a question about git !08:30
Any luck somebody wants to help ?08:30
_ikke_ !just_ask08:31
gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)08:31
← skorgon left08:31
← siriuz left08:32
→ lun__ joined08:32
→ felher joined08:32
osse _ikke_: What if the commit I want to split is not the latest one?08:32
← lun_ left08:33
→ mikecmpbll joined08:33
→ siriuz joined08:34
Birdimol So, i would like to have an executable batch script wich will allow me, by just executing it, to do a "git pull" in the right directory. Because, until now, I have to connect in ssh to the right computer, start a git bash, move to the right directory and do a "git pull". Surprise, we are on a windows environment.08:34
→ Sigma joined08:34
← diegoviola left08:34
_ikke_ osse: You should select edit for the commit you want to split with rebase -i08:35
← pii3 left08:35
→ YoungFrog joined08:35
→ nnathan joined08:36
→ maarhart joined08:37
→ VarunDotCuDotCc joined08:38
osse _ikke_: then run 'git reset HEAD^' ? I thought you meant to use git reset HEAD^ isntead of rebase -i at first08:38
_ikke_ osse: Yeah, that's what I meant, after you get dropped in the shell, do that08:38
← VarunDotCuDotCc left08:38
→ eletuchy joined08:39
← ruckerz left08:40
→ ruckerz joined08:40
← siriuz left08:41
ddv .voice08:41
gitinfo set mode: +v08:41
maarhart this is dropbox's fault but anyway, how can I bring everything back to normal?| http://pastie.org/private/2tbfiz04xfp20oukprng08:41
osse _ikke_: hooray \o/ I was confused at first, because I tried that, but used commit --amend on the first of the new commits like I usually do. That did not play well with git reset HEAD^ :)08:42
So I ended up effectively squashing parts of the current commit into the previous one.08:42
→ zenx joined08:43
_ikke_ maarhart: go to .git/refs/heads, and rename the file08:43
→ ak5 joined08:43
osse But it's much better to do git reset HEAD^ instead of git checkout HEAD^ -- file. With the latter all diffs were the other way around and it was all very confusing.08:43
Thanks.08:44
→ Vile joined08:44
→ siriuz joined08:45
→ cellardoor joined08:45
→ ozette joined08:45
← hwrd|work left08:46
← marcdel left08:46
spuz Birdimol: why not leave your terminal and ssh session open?08:46
← mossplix left08:46
maarhart _ikke_: thanks, i was actually attempting to do that but was in the wrong folder08:47
→ Iszak joined08:47
→ vedant joined08:48
Birdimol spuz: because we have a lot of different git projet on differents (5) serveur, I don't want to have all day 5 opened ssh terminal. A shorcut to a .bat file for each project that updates the files on the serveur by git pull will be great.08:49
→ marcdel joined08:49
→ marhaban joined08:49
_ikke_ Birdimol: You know about git hooks?08:50
Birdimol Yes, we tried. But Windows is driving us crazy about rights...08:51
← siriuz left08:51
→ BiggFREE joined08:52
→ martinarielhartm joined08:52
_ikke_ Birdimol: You ssh to a windows machine?08:53
martinarielhartm and now what is wrong? http://pastie.org/private/89d9vbdmgn6ucjy9hgp45q08:53
← lun__ left08:53
Birdimol _ikke_: yes using cygwin.08:53
← nnathan left08:54
→ prudnikov joined08:54
→ siriuz joined08:54
← marhaban left08:54
→ thierryp joined08:55
← marcdel left08:55
SamB can't imagine this ending well08:55
← trusktr left08:56
→ khushildep joined08:57
martinarielhartm help anybody?08:57
spuz martinarielhartm: the error message tells you what is wrong08:57
and it tells you what to do to fix it08:58
_ikke_ Birdimol: And what is the actual problem you are having?08:58
martinarielhartm spuz: I will not pull because the new version is not the remote one...08:58
spuz martinarielhartm: sorry?08:59
_ikke_ martinarielhartm: The message says: The remote has changes which you don't have locally yet. Get them first before trying to push08:59
→ danishkhan joined09:00
martinarielhartm spuz: but I am afraid I will loose local content09:00
→ howlymowly joined09:01
← howlymowly left09:01
_ikke_ martinarielhartm: You won't09:01
← siriuz left09:02
_ikke_ martinarielhartm: (if you don't do any stupid things that is)09:02
← avinashrbhat left09:02
→ lausi joined09:02
Birdimol bye and thx.09:02
→ samuel02 joined09:03
← Birdimol left09:03
→ trusktr joined09:03
← daniel_- left09:03
→ siriuz joined09:04
→ avinashrbhat joined09:04
→ charon joined09:05
martinarielhartm _ikke_: ok thanks!09:05
← jaseemabid left09:05
→ GarethAdams joined09:05
→ howlymowly joined09:06
← danishkhan left09:07
← jceb left09:07
← Milossh left09:08
→ johnnyfuchs joined09:09
→ Raging_Hog joined09:09
← LekeFly left09:10
← megha left09:10
→ security joined09:10
→ rednaks joined09:11
security → megha09:11
← siriuz left09:11
← Gentlecat left09:12
→ LekeFly joined09:13
→ blami_orcl joined09:13
→ daniel_- joined09:14
← d3O left09:14
→ siriuz joined09:15
← jnavila__ left09:15
→ jnavila joined09:16
→ sente joined09:16
← mf_ left09:18
→ Squarism joined09:19
← charon left09:19
→ charon joined09:19
→ jaseemabid joined09:20
← boombatower left09:21
→ dsdeiz_ joined09:22
→ skorgon joined09:22
← dsdeiz left09:22
← siriuz left09:22
→ siriuz joined09:24
marienz_ → marirenz09:26
← ISF left09:26
marirenz → marienz_09:26
marienz_ → marienz09:27
→ Katafalk_ joined09:27
← vedant left09:28
← longbeach left09:28
→ shruggar1 joined09:29
← shruggar left09:29
← skorgon left09:30
← Katafalkas left09:31
← Katafalk_ left09:32
→ jkremser joined09:32
→ eijk_ joined09:32
← siriuz left09:32
→ Katafalkas joined09:33
→ Acony joined09:33
← nilg` left09:33
Acony I'm kind new to git and we are creating migration plan so I need some suggestions from people who are more experienced in this area then me09:33
→ siriuz joined09:34
megha which is the best place to learn git ?09:34
the documentation at the site is one nice place other than that ?09:35
Acony we have 2 projects (2 svn branches) and mobile versions for them also 2 different branches more... Since projects are very similar only difference is that one branch is 18+ and other one is softcore, so from application perspective with some tuning maybe it can be one branch with 2 different projects09:35
can anybody share with me the toughs what will be the best solution for our migration ?09:36
jast megha: !book09:37
gitinfo megha: 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:37
→ marhaban joined09:37
← howlymowly left09:38
megha jast: i have this book Pro Git. so only following it would be the best thing ?09:38
_ikke_ It's a good basis09:38
jast well, it'll probably do the job09:38
→ quuxman joined09:38
→ sdeboey joined09:38
megha good :)09:38
jast if you prefer consulting several sources, check out the other things the bot mentioned (you can just enter these !foo thingies here to get more info)09:39
→ sonda joined09:39
quuxman I'd like to see a list of commits that affect a given line in a given file, like blame on github, but see arbitrary numbers of revisions09:39
jast !gcs, for instance, explains the way git thinks about commits and history and such09:39
gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs/09:39
→ nioncode joined09:39
→ druid_ joined09:40
← druid_ left09:40
→ Druide_ joined09:40
megha that's cool09:40
Druide_ mornin09:40
→ skorgon joined09:40
→ howlymowly joined09:41
← siriuz left09:42
← tinti left09:43
quuxman I imagine there's a basically one line shell loop that uses `git blame` to accomplish what I want...09:43
→ siriuz joined09:44
← thierryp left09:45
← Sky[x] left09:46
← zenx left09:46
→ thierryp joined09:47
← Andromed_ left09:48
← skorgon left09:49
→ jceb joined09:49
→ skystar joined09:50
← Iszak left09:50
quuxman actually, I think what I really want in this case is a flag for `git log -- foo` that shows human readable diffs09:53
→ Iszak joined09:53
quuxman is there such an argument, or do I use a different command?09:53
jast what kind of human-readable?09:53
→ j0ran joined09:53
jast -p gives you standard diffs09:54
← jackh left09:54
jast you can add --word-diff if you like09:54
quuxman jast: thanks. -p is exactly what I was looking for09:55
jast actually, --word-diff=color, I suppose09:55
much easier to read09:55
--color-words does the same thing09:56
→ skorgon joined09:57
quuxman jast: hmm, that's kind of cool, but I find '+' and '-' more clear09:58
presumably red is '-' and '+' is green, but for some reason it's not subconsciously obvious to me09:58
→ zenx joined09:58
← robottinosino left09:59
→ robottinosino joined09:59
← Squarism left10:01
← robottinosino left10:02
← siriuz left10:02
← stliu left10:03
→ robottinosino joined10:03
→ tvw joined10:03
→ tevio joined10:03
→ danishkhan joined10:04
→ siriuz joined10:05
← skorgon left10:05
← sdeboey left10:06
→ axilaris joined10:06
← surfdue left10:06
axilaris hi... does anyone knows how to copy from one git repository to another git repository10:06
esc what git config options can I make for github.com10:07
axilaris i have a repo in heroku and now i want to move it to github/bitbucket10:07
is it possible to copy everything from the start of the history ?10:07
→ surfdue joined10:08
← danishkhan left10:08
← subhojit777 left10:09
→ vedant joined10:10
→ ISF joined10:10
← rchavik left10:11
axilaris no one done this ?10:12
← siriuz left10:12
→ martinklepsch joined10:12
Nevik esc: what do you mean10:12
→ nilg joined10:12
esc i have seen people put github specific configuration in their ~/.gitconfig10:13
→ rchavik joined10:13
Nevik axilaris: just add another remote (`git remote add bitbucked YOURBITBUCKEDURL HERE`) then push there (`git push bitbucke LIST ALL YOUR BRANCHES HERE`)10:13
→ sdeboey joined10:13
Nevik esc: like what10:13
esc like tokens or somethin, can't remember, hence I am asking10:13
Nevik esc: from a git point of view, github is no different from any other git remote10:14
esc also, hub kinda sucks10:14
→ siriuz joined10:14
Nevik those config options are probably related to hub10:14
esc Nevik: no, srlsy, you have got to be kidding :)10:14
axilaris thanks nevik... just reading something like that10:14
Nevik axilaris: no problem (also sry about my typos there >.>)10:14
esc: no, srsly, think about it :P10:14
esc you, mean, ZOMG, github repositories... are just... ZOMG no different than any other remote??!/!!11!??10:15
Nevik well, you're the one asking stupid questions :D10:15
esc stupid questions warrent stupid answers :D10:16
Nevik which you got10:16
→ LekeFly- joined10:17
← howlymowly left10:17
esc Nevik: https://github.com/blog/180-local-github-config <-- I suppose i should have googled first...10:17
Nevik yes :P10:17
→ howlymowly joined10:18
Nevik esc: but as it says, not git options :P10:18
← sdeboey left10:18
→ sdeboey joined10:18
← vedant left10:18
← LekeFly left10:19
← siriuz left10:20
→ beautifulmind joined10:21
← Sonderblade left10:21
→ dsdeiz joined10:22
← mikecmpbll left10:22
← Dr4k3 left10:22
→ mikecmpbll joined10:23
← dsdeiz_ left10:23
→ siriuz joined10:24
← trema13 left10:24
→ Dr4k3 joined10:24
← BiggFREE left10:25
→ metze joined10:26
← JosefAssad left10:26
→ dsdeiz_ joined10:27
→ Sky[x] joined10:27
← jnavila left10:28
← thierryp left10:29
← dsdeiz left10:29
→ leptonix joined10:29
← beautifulmind left10:30
← weiyang left10:30
← Vile left10:31
→ Vile1 joined10:31
← siriuz left10:32
→ jazz264 joined10:34
→ nielsbusch joined10:34
→ kukks joined10:34
← kukks left10:34
→ kukks joined10:34
← jazz264 left10:34
→ siriuz joined10:35
→ solrize_ joined10:35
solrize_ general advice request: i have a source tree that i'm trying to keep sync'd between several machines, except the tree has a config file that's different on each machine (e.g. includes stuff like the hostname). what's the right way to handle that using git?10:36
→ Sonderblade joined10:37
→ skorgon joined10:37
← hyperair left10:38
dr_lepper solrize_: !configfiles10:38
gitinfo solrize_: 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:38
→ d3vic3 joined10:39
vlt solrize_: _I_ would create a branch for each machine.10:39
→ loxs joined10:40
solrize_ hmm thanks10:40
loxs after I invoke git rebase -i, emacs says it's unable to edit the file, as its in read-only mode. I just checked, the todo-file in question seems to be perfectly writable by my user10:40
any ideas on what's wrong?10:40
→ thierryp joined10:41
solrize_ i'm looking at that gist... i was hoping to track these configs since they change sometimes10:41
i guess i could put them in a separate repo or something10:41
← siriuz left10:42
← echo-area left10:42
solrize_ i will talk to our ops guys tomorrow10:42
thanks10:42
← solrize_ left10:42
→ nkambo joined10:44
Druide_ would it work to copy a remote repository into a new directory and add / change the origin locally to test githooks?10:44
→ siriuz joined10:45
← FatDarrel left10:45
← engkur left10:45
← JohnBat26 left10:46
→ kmels__ joined10:46
→ dsdeiz joined10:47
→ Schmoozerd joined10:47
← jas4711 left10:47
← skorgon left10:48
← dsdeiz_ left10:48
← pdurbin left10:48
← dsirijus left10:50
← Iszak left10:50
← dsdeiz left10:51
jast loxs: sounds like an emacs issue, maybe?10:51
→ Ksg89 joined10:51
→ beautifulmind joined10:51
jast I wouldn't know, because I use a text editor instead :o)10:51
→ VarunDotCuDotCc joined10:52
→ dsdeiz joined10:52
← luc_ left10:52
loxs jast, yeah, as it came out... I have some "rebase-mode" enabled and I'm supposed to edit that buffer by using commands only10:52
jast Druide_: sure10:52
loxs sorry, false alarm10:52
← siriuz left10:52
jast a rebase mode... because why make things simple ;)10:52
← VarunDotCuDotCc left10:53
← thierryp left10:54
← sdeboey left10:54
→ siriuz joined10:55
← d3vic3 left10:55
loxs jast, exactly. took me 30 minutes to figure out what's wrong :(10:56
→ keller joined10:56
← xiukun left10:57
← beneggett left10:57
→ skorgon joined10:57
← skystar left10:58
← beautifulmind left10:58
→ elixir joined10:58
→ Iszak joined10:59
← h2ero left11:00
← jaseemabid left11:01
← siriuz left11:01
← marhaban left11:04
→ siriuz joined11:05
→ gwty joined11:05
→ Octalot joined11:05
← jargon left11:06
← skorgon left11:06
← maxmanders left11:07
→ maxmanders joined11:07
→ danishkhan joined11:09
← TheJH left11:10
← Raging_Hog left11:10
← trusktr left11:10
→ mitz joined11:11
→ TheJH joined11:12
→ Laurenceb_ joined11:12
← siriuz left11:12
→ marhaban joined11:13
← mitz_ left11:13
→ siriuz joined11:14
← marhaban left11:15
axilaris hi...im trying to move a repo using: git remote rename origin bitbucket --- but there this error: Could not rename config section 'remote.origin' to 'remote.bitbucket'11:15
wats the problem ?11:15
← ehsan left11:15
← mitz left11:16
→ skorgon joined11:16
→ holodoc joined11:16
← rakl left11:17
spuz is there a way in git to interactively checkout files?11:17
similar to interactively staging using add -i ?11:17
← danishkhan left11:18
← LeMike left11:18
→ thierryp joined11:18
← dsdeiz left11:19
→ dsdeiz joined11:19
→ EthanCooler1 joined11:20
spuz or is there a tool that will allow me to checkout individual files without typing their whole path or using the mouse?11:21
→ thyseus joined11:21
← siriuz left11:21
→ vedant joined11:22
← howlymowly left11:23
← skorgon left11:24
→ Droolio joined11:24
→ siriuz joined11:25
← _iron left11:25
→ howlymowly joined11:26
bremner use a shell with decent git completion?11:26
spuz bremner: that would be great11:27
can you recommend one?11:27
→ jnavila joined11:27
bremner I use zsh; many people are happy with bash11:27
spuz i use bash11:27
it can't distinguish between changed an unchanged files when I use git checkout -- <file> though11:28
→ chimay joined11:29
bremner hmm. Yes, that would be a problem in zsh too afaik11:29
spuz ideally I would say git checkout 1 where 1 is the number of the file11:29
← mstormo_ left11:30
← howlymowly left11:31
→ DoniRS joined11:31
→ timini joined11:32
← thierryp left11:32
← siriuz left11:32
bremner spuz: you want to pick a file from a list of modified ones and revert the changes?11:33
← eletuchy left11:33
timini Hi when i type git pull, a load of branches are pulled, some are market with *[new branch] like this http://pastie.org/738411111:33
spuz bremner: yes11:33
timini How can i get the new branches to pull as well?11:33
← DoniRS left11:33
bremner spuz: magit (emacs front end to git) can do that; I don't know about other front-ends.11:33
lb1a timini: they are11:33
→ DoniRS joined11:33
→ eletuchy joined11:33
→ engkur joined11:33
→ nkr joined11:34
spuz bremner: looks like scm_breeze might do what I want11:34
timini lb1a: but when i type git branch they arn't listed11:34
→ quazimodo joined11:34
→ siriuz joined11:35
← yshh_ left11:35
tgummerer timini: use `git branch -a`11:35
lb1a timini: because you have no local branch created yet11:35
→ skorgon joined11:35
lb1a use either git branch <branch> <remote/branch> to create it or git checkout <branch>11:36
timini Ah, ok11:36
lb1a the content is already pulled11:36
you just got no branch pointing to it11:36
(or fetched instead of pulled)11:36
!pull11:36
gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/11:36
← sgambino left11:37
← rudak left11:37
→ hafeez3000 joined11:38
axilaris what is this remote: error: Could not read aeabed38b1443bbfd7f22f96780f410c1c9b71ff11:39
can someone tell me how to find out what is this object that cant be read ?11:39
→ thierryp joined11:39
axilaris or any information on that object11:39
← k_sze[work] left11:39
← Err404NotFound left11:40
→ Error404NotFound joined11:40
lb1a axilaris: plumbing into the internals? http://rypress.com/tutorials/git/plumbing.html11:40
← prudnikov left11:40
← siriuz left11:41
axilaris thanks...argh..too much to read... so difficlt just to move repo11:42
spuz axilaris: try: git show aeabed38b1443bbfd7f22f96780f410c1c9b71ff11:43
← skorgon left11:43
axilaris fatal: bad object aeabed38b1443bbfd7f22f96780f410c1c9b71ff11:43
didnt work11:44
→ siriuz joined11:44
spuz axilaris: make sure you do it from the repository you are readin11:44
reading*11:44
→ frenchlaf joined11:44
axilaris tried this also ...git cat-file -t aeabed38b1443bbfd7f22f96780f410c1c9b71ff11:44
error: unable to find aeabed38b1443bbfd7f22f96780f410c1c9b71ff11:45
→ EthanCooler joined11:45
axilaris yup11:45
→ normanrichards joined11:45
→ Macaveli joined11:45
← alkino left11:45
← engkur left11:45
← Dr4k3 left11:46
← robottinosino left11:46
spuz axilaris: git is getting that hash from somewhere, if you are local to the repository that ref comes from, then it should find it11:46
→ angelsl joined11:46
← EthanCooler1 left11:47
← normanrichards left11:47
→ LeMike joined11:48
← rob_w left11:49
→ Uniter joined11:49
gitinfo set mode: +v11:50
Uniter hi people, if I have some local commits that I want to actually get rid of... what should I do? I tried git reset HEAD --hard11:50
also git reset HEAD@{0} --hard11:50
→ rsv joined11:50
rsv how to merge a tag into a branch11:51
→ mitz joined11:51
Nevik rsv: the same way you'd merge anything else11:51
← yuwang left11:51
Nevik Uniter: are those commits the latest ones on your branch?11:51
→ Dr4k3 joined11:51
← siriuz left11:52
← dhruvasagar left11:52
rsv Nevik: i have not done merging before, i have a tag. how can i merge the tag.11:52
Uniter Nevik I checked with gitk11:52
Nevik rsv: while on the branch you want to merge the tag into, `git merge TAGNAME`11:53
Uniter yes Nevik11:53
and it's only one commit actually11:53
211:53
← LeMike left11:53
Uniter :S11:53
Nevik Uniter: then `git reset --hard` to the commit before the ones you wanna delete11:53
→ siriuz joined11:54
→ skorgon joined11:54
→ yuwang joined11:57
→ alkino joined11:57
← shruggar1 left11:58
→ gusnan joined11:58
→ shruggar joined11:59
← hellopat left11:59
→ howlymowly joined11:59
lb1a Uniter: dont forget to !backup before reseting hard11:59
gitinfo Uniter: Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups11:59
← shruggar left12:00
→ LeMike joined12:00
→ TheAscender joined12:01
← siriuz left12:02
→ DARSC0D3 joined12:02
← martinarielhartm left12:02
← skorgon left12:02
← pastime left12:03
→ AdrienBrault joined12:03
→ mitz_ joined12:03
← juril left12:03
← axilaris left12:04
→ siriuz joined12:04
← mitz left12:05
→ shruggar joined12:05
→ guy joined12:05
→ cannonball joined12:06
→ skorgon joined12:06
guy any clue what would be the best place to ask for a simple question about Bamboo CI setup?12:06
→ guampa joined12:06
← _Qman left12:08
← keller left12:10
→ sdeboey joined12:10
→ stack_ joined12:10
← maarhart left12:11
Nevik guy: atlassian support?12:11
guy yeah, I am more of an open-source person. Don't like calling commercial support. It misses the humiliation part, etc.12:11
Nevik then you're probably using the wrong product :P12:11
guy: also, google and stackoverflow12:12
← siriuz left12:12
guy anyhow, if you are familiar with it.. my question is laughingly simple. can I give a go?12:12
hiptobecubic guy, just ask12:12
← DoniRS left12:13
→ DoniRS joined12:13
← alunduil left12:13
← stack left12:13
← sdeboey left12:14
← skorgon left12:14
→ keller joined12:14
guy I've setup a test plan. Simple one repository pull. It pulls it to "/var/www/bamboo-home/xml-data/build-dir/CP-STAGE-JOB1/" How do I configure project base directory? I swear it is not in the configuration interface.. I am getting a feeling that I should add a task to the build project that if build is successful would move the files to the right path?12:14
→ siriuz joined12:15
← DoniRS left12:15
→ DoniRS joined12:16
← DoniRS left12:16
← tevio left12:17
→ sgambino joined12:17
→ tevio joined12:18
← Laurenceb_ left12:18
→ garbagecollectio joined12:18
← stack_ left12:19
→ rideh joined12:19
← vedant left12:19
→ vedant joined12:19
→ Sebo joined12:20
← garbagecollectio left12:20
→ ehsan joined12:20
→ stack joined12:21
← thierryp left12:21
← siriuz left12:21
→ DoniRS joined12:21
Sebo Hi,12:21
I've got a git repository in an unknown state. Which commands do I need to execute to force checkout it to the given sha-1.12:21
← DoniRS left12:22
→ R1KRDO joined12:22
→ mstormo joined12:22
← psoo left12:22
← mikecmpbll left12:22
_ikke_ git checkout -f <sha>12:23
→ micky62g joined12:23
→ Thra11 joined12:23
→ e66 joined12:23
loops make sure you back things up first to avoid heartbreak12:23
Sebo _ikke_: I was trying this ...but it seems not working. for instance it seems it leaves some untracked files.12:24
loops Sebo see git clean for removing untracked files (and reminder about backups)12:24
→ skorgon joined12:25
→ siriuz joined12:25
Sebo loops: ...but this is not very batch-friendly way :/12:25
← tevio left12:25
loops Sebo, in a normal process you shouldn't need it really.12:26
Sebo, thought you were just recovering from a muck-up in ad-hoc fassion, not looking for automated scripts12:26
→ beautifulmind joined12:27
→ engkur joined12:27
Sebo ...What i am trying to create is the post-update hooh for my git that holds php code at the server... and I would like it to make sure the workspace is execly what was pushed to the given branch.12:27
→ ojacobson joined12:27
← stack left12:27
loops Sebo, yeah.. Git isn't designed as a deployment tool.12:28
→ erichynds joined12:28
loops It's not designed at all to keep a remote working directory synced..12:28
Sebo but it works fine ... except those problems with those untracked files being left sometimes ;)12:29
← DARSC0D3 left12:29
loops and 10 other things you haven't run into yet12:29
→ Logiar joined12:29
loops But there are some tools around that purport to do this, although i'm not familiar with 'em12:29
← luneff left12:29
→ stack joined12:31
Logiar I got a problem, git lists a bunch of file deletes as unstaged changes and then the same files again as untracked files. I tried doing a "git reset --hard origin/master" and the git status still shows the same12:31
← siriuz left12:32
Logiar if i do a clean it removes the files, do another reset it adds them but ther are still shown as untracked and deleted in the unstaged changes12:32
← R1KRDO left12:32
← TheAscender left12:32
← loxs left12:33
← skorgon left12:33
← NiteRain left12:33
← eletuchy left12:33
→ freeed joined12:33
Sebo I've created proper apache configuration so that i've got .git dir hidden at the serwer... where I do store all the scm. And this works for me as a repository. And this hook which has one special branch... and checkouts this just after each push.12:33
gitinfo set mode: +v12:33
→ eletuchy joined12:33
→ siriuz joined12:34
guy anyone?12:34
ojacobson guy: what suggests to you that #git is a good place to as for Bamboo help?12:35
← fsvehla left12:35
ojacobson Atlassian has pretty good customer support, and it comes with your license. They'll probably be able to clear this up for you quickly.12:35
(Even the cheapie starter licenses.)12:35
→ fsvehla joined12:38
→ garbagecollectio joined12:38
Sebo ...Ok I can always think of *rm -rf `ls -A | fgrep -xv .git`* before the checkout... bot then the checkout does not restore the trached files as I would expect12:39
→ thierryp joined12:39
← nkambo left12:39
ojacobson !deploy12:39
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/the-list-and-irc/deploy.html12:39
← guy left12:39
ojacobson Sitaram's notes are pretty good if you insist on doing things this way12:39
← yacks left12:40
→ jpcamara joined12:40
→ yacks joined12:41
← eletuchy left12:41
← siriuz left12:42
→ DoniRS joined12:42
→ axl_ joined12:42
→ aartist joined12:43
→ bmac joined12:43
Logiar So i've figured out what, but not why the issue arose. Suddenly git does not take well to file names with utf-8 names12:43
→ siriuz joined12:44
← beautifulmind left12:44
← Ksg89 left12:44
→ yshh joined12:45
→ jatt joined12:45
← DoniRS left12:46
→ DoniRS joined12:46
← bmac left12:47
→ tmcmahon joined12:47
→ bmac joined12:48
← LeMike left12:48
← hafeez3000 left12:48
→ JaredMiller joined12:49
→ LeMike joined12:49
← yshh left12:50
← JaredMiller left12:50
← vedant left12:51
← mitz_ left12:51
← rsv left12:51
← daniel_- left12:51
→ Ksg89 joined12:52
← miso1337 left12:52
→ mitz_ joined12:52
→ nkambo joined12:52
← siriuz left12:52
→ simesy joined12:52
→ mstormo_ joined12:53
→ hafeez3000 joined12:53
→ siriuz joined12:54
← Hounddog left12:54
← simesy left12:54
→ plumpkin joined12:54
← elixir left12:55
→ simesy joined12:55
→ elixir joined12:55
← mstormo left12:55
→ dhruvasagar joined12:56
← Ksg89 left12:56
→ amigojapan joined12:57
→ sdeboey joined12:57
← hafeez3000 left12:58
→ hafeez3000 joined12:58
Wulf4 → Wulf13:00
→ Ksg89 joined13:01
← amigojapan left13:01
→ m0ltar joined13:01
→ amigojapan_ joined13:01
← siriuz left13:02
→ jonatasnona joined13:02
← tvw left13:02
→ dan2k3k4 joined13:02
← dan2k3k4 left13:02
→ tvw joined13:02
→ marhaban joined13:03
← jonatasnona left13:04
→ R1KRDO joined13:04
→ hyperair joined13:04
← tmcmahon left13:04
→ siriuz joined13:05
← axl_ left13:05
← Ksg89 left13:06
→ infynyxx joined13:06
→ bytephilia joined13:07
← Macaveli left13:07
→ axl_ joined13:07
→ kmels_ joined13:08
megha when i am doing "git push origin master i am getting -> did you run git update-server-info on the server error13:08
after entering my username and password.13:08
lov .... well did you?13:09
→ ovidiu-florin joined13:09
→ Praise joined13:09
→ Fandekasp joined13:10
megha lov: can't get you13:10
← Fandekasp left13:10
lov :>13:10
← pretty_function left13:11
→ breakingthings joined13:11
← kmels__ left13:11
← siriuz left13:11
→ herdingcat joined13:11
→ eletuchy joined13:12
← elixir left13:12
→ rabellamy joined13:12
→ jonatasnona joined13:13
soren megha: Well, it asks you: "did you run update-server-info on the server". Did you run update-server-info on the server?13:13
megha no i have not. ok i should run it than..13:13
← garbagecollectio left13:14
← nkambo left13:14
→ siriuz joined13:15
megha soren: even after running git update-server-info i am getting the same error.13:15
← Schmoozerd left13:16
→ nkambo joined13:17
→ Ksg89 joined13:17
← bytephilia left13:19
→ bytephilia joined13:19
→ yshh joined13:19
← Dr4k3 left13:19
← hafeez3000 left13:20
megha can i rename my current project ?13:21
← siriuz left13:22
← hoschi left13:22
susundbe1g megha: what do you mean rename? relocate?13:22
megha ok got it :)13:22
← eletuchy left13:22
← PanPan left13:22
megha susundbe1g: the error i was getting due to difference in name of the project on git and what i have initialize on my computer.13:23
← TheJH left13:23
megha so wanted to rename it.13:23
→ hafeez3000 joined13:23
→ siriuz joined13:24
→ brocken joined13:24
→ lu_zero joined13:24
→ elixir joined13:25
→ anonymuse joined13:25
→ TheJH joined13:25
→ AaronMT joined13:26
← j0ran left13:26
← simesy left13:26
← ovidiu-florin left13:26
← Ksg89 left13:27
→ fooey joined13:28
→ jackh joined13:28
→ Ksg89 joined13:29
→ trungqtran joined13:29
← nilg left13:29
← netiul left13:31
← siriuz left13:32
→ nilg joined13:32
→ marhaban1 joined13:33
→ oakdog8 joined13:33
← DoniRS left13:33
→ LekeFly joined13:34
→ DoniRS joined13:34
← marhaban1 left13:34
→ siriuz joined13:34
← jpcamara left13:34
← ISF left13:35
→ mihamina joined13:35
→ rsv joined13:36
rsv when i do git merge <tagname>. for some tags, i get only tag info. for some other tags i get some extra commits when i do git log13:37
← LekeFly- left13:37
→ jamesez joined13:37
→ noahsussman joined13:38
← noahsussman left13:38
megha susundbe1g: when i am doing "git push origin master i am getting -> did you run git update-server-info on the server error13:38
still the same prob13:38
→ hellopat joined13:38
megha do i also have to create a repo with the same name on github also ?13:39
→ j416_ joined13:39
→ netiul joined13:39
→ noahsussman joined13:40
← mihamina left13:40
← siriuz left13:42
→ lacrymology joined13:43
lb1a megha: status.github.com tells about errors13:43
→ JosefAssad joined13:44
→ TeckniX joined13:44
→ mihamina joined13:44
megha lb1a: it's giving me command not found13:44
→ adam12 joined13:44
→ siriuz joined13:45
→ SonderbladeWork joined13:45
lb1a megha: that is a website13:45
megha lbla i am new and just want to setup GIT properly than after following the guide.13:46
← Sonderblade left13:46
← sdeboey left13:46
lb1a megha: and i'm tellin you, that github is experiencing error right now, as you can read on their status page. so maybe it's not your fault that you see errors13:46
← engkur left13:47
megha ok so i will wait for some time :)13:47
HedgeMage megha: Just wait until github is fixed, then try again and see if the problem still exists.13:47
megha HedgeMage: ok :)13:47
→ Dr4k3 joined13:47
lb1a megha: and to answer your question, no your local repo does not have to be named exactly like the github repo you're trying to reach13:48
→ xckpd7_ joined13:48
lb1a it can be any name you like13:48
→ milStaja joined13:48
→ Ov3rTaf joined13:48
→ eletuchy joined13:48
megha ok.. first i tried changing the name to the one on my local machine.13:49
lb1a it just need's a remote with the url a the correct repo13:49
→ revagomes joined13:49
gitinfo set mode: +v13:49
Ov3rTaf hey13:49
gitinfo Ov3rTaf: 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.13:49
→ bitkiller joined13:49
→ Macaveli joined13:50
← noahsussman left13:50
← xckpd7_ left13:50
← TeckniX left13:50
bitkiller is export-ignore broken for directories?13:50
→ xckpd7 joined13:50
xckpd7 question: I have a pattern where I check out a local branch (called local for instance) and then push it up to the same remote every time (myname). so basically I'm always doing git push myname local1... git push myname local2... git push myname local3... anyway to be able to just type gpr and it automatically just know where to push it to?13:50
Ov3rTaf i seek a php video search engine script with no succes on github :x13:50
bitkiller i tried with trailing slash and without it, no success13:51
← bmac left13:51
bremner Ov3rTaf: alas, that is not a git question.13:51
Ov3rTaf oups lol wrong chan ^^ sorry13:51
← Ov3rTaf left13:52
lb1a xckpd7: if they all have a corrosponding branch, that's the tracking branch of the local branch you can just use git push --all13:52
corresponding*13:52
→ MattStratton joined13:52
← siriuz left13:52
→ acharlieh joined13:53
→ thl0 joined13:53
→ mercwithamouth joined13:53
lb1a bitkiller: http://git-scm.com/book/ch7-2.html the example is with trailing slash. but i'm not expert in this13:53
→ daniel_- joined13:53
xckpd7 lb1a: don't understand. I checked out a branch and tried to do git push --all and it says: W access for redacted/redacted DENIED to myname13:53
← KevinSjoberg left13:54
→ agile joined13:54
xckpd7 if I did git push myname nameoflocalbranch it would work13:54
← yshh left13:54
→ siriuz joined13:55
← milStaja left13:55
← Dr4k3 left13:55
→ engkur joined13:56
→ normanrichards joined13:56
→ dsirijus joined13:56
← Macaveli left13:56
→ sdeboey joined13:56
lb1a xckpd7: then the branch maybe does not have a corresponding remote branches that is the tracking branch.13:57
← ehsan left13:57
← hyperair left13:57
← Sebo left13:58
→ ehsan joined13:58
xckpd7 lb1a: it's a little disconnected... I don't think there is a tracking branch... I want to push where I'm not originally pulling from13:58
← dhruvasagar left13:58
→ Sebo joined13:58
→ hyperair joined13:58
xckpd7 basically I was thinking (but I'm a newb so I need suggestions) is that an alias would work... if my shell knew the branch I was currently on13:58
← infynyxx left13:58
→ vedant joined13:59
← bytephilia left13:59
xckpd7 so alias gpr git push myname [branch I'm working on] but I don't think it works like that13:59
and was wondering if there was a native way git could do that13:59
→ the_cybersphinx joined13:59
lb1a xckpd7: ah that's what you meant13:59
← soee left14:00
bitkiller lb1a, my fault. I changed the file to put the slash and forgot to commit.14:00
lb1a xckpd7: man git push see the setting push.default14:00
gitinfo xckpd7: the git-push manpage is available at http://jk.gs/git-push.html14:00
→ nathanr joined14:01
→ natechan joined14:01
lb1a xckpd7: so basically 'git config (--global) push.default current#14:02
xckpd7: so basically 'git config (--global) push.default current'14:02
← siriuz left14:02
← ehsan left14:02
lb1a bitkiller: so it's working with slashes? good news :)14:02
← mitz_ left14:03
← dean[h] left14:03
→ mitz_ joined14:03
→ Schmoozerd joined14:03
xckpd7 lb1a: do I need to substitute the (--global) part with my remote? or what you pasted exactly14:04
→ luksaur joined14:04
← nabdev left14:04
→ infynyxx joined14:04
→ vpopov joined14:04
lb1a xckpd7: setting it global mean system wide, not global for the repo only14:04
xckpd7: your decision14:04
xckpd7: man git config14:04
gitinfo xckpd7: the git-config manpage is available at http://jk.gs/git-config.html14:04
xckpd7 lb1a: yes I'm reading it... it's hard to decipher though14:05
lb1a xckpd7: ;)14:05
→ siriuz joined14:05
lb1a just head over to the options section and see the part with --global14:05
;)14:05
→ jcromartie joined14:05
lb1a xckpd7: there's also --system . using /etc/gitconfig instead of your ~/.gitconfig14:06
→ glosoli joined14:07
→ TeckniX joined14:07
← dsirijus left14:07
← infynyxx left14:08
← ph^ left14:08
→ dsirijus joined14:09
→ x82_nicole joined14:09
→ momomomomo joined14:10
← mitz_ left14:11
→ BillCriswell joined14:11
→ mitz_ joined14:11
← siriuz left14:12
← bartman` left14:12
← x82_nicole left14:12
→ bartman` joined14:13
bitkiller lb1a, yes, there's a regression referred in the mailing list for the case without slash.14:14
← shruggar left14:15
← Octalot left14:15
→ siriuz joined14:15
← DrShoggoth left14:15
→ garbagecollectio joined14:16
← Sky[x] left14:16
→ cbot_ joined14:16
← TheJH left14:16
→ AnimeCYC joined14:16
→ jargon joined14:17
→ v0n joined14:17
xckpd7 lb1a: I did git config push.default current... still getting "there may be no repository at the given path"14:17
→ TheJH joined14:18
→ _Qman joined14:18
lb1a xckpd7: is the url correct? git remote -v14:19
→ jpcamara joined14:19
→ alunduil joined14:19
→ tevio joined14:20
→ danishkhan joined14:20
← h0bbit left14:21
→ PigeonFriend joined14:21
xckpd7 lb1a: I really don't know. but if this way is the same way as me just doing git push [myname] [localbranch] I don't see how it wouldn't work unless it isn't the same14:21
← v0n left14:21
xckpd7 lb1a: the url looks right.14:22
→ v0n joined14:22
← siriuz left14:22
xckpd7 lb1a: the local branches aren't tracking anything14:22
lb1a git push <myremote> should work then14:22
← LekeFly left14:22
→ LekeFly joined14:23
← papegaaij left14:23
xckpd7 lb1a: it does, thanks. anyway to not specify that remote though? I push to the same remote all the time14:24
→ siriuz joined14:24
xckpd7 alias perhaps at this point?14:24
→ Nothing4You joined14:24
Nothing4You hey there14:25
gitinfo Nothing4You: 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.14:25
lb1a xckpd7: alias or track the remote branch14:25
→ infynyxx joined14:25
Nothing4You is it possible to push all local branches to the remote origin?14:25
→ killer joined14:25
← yrrrep left14:25
→ pitzips joined14:25
lb1a Nothing4You: man git push14:25
gitinfo Nothing4You: the git-push manpage is available at http://jk.gs/git-push.html14:25
→ wesside_ joined14:25
lb1a -all14:25
jast the option is pretty self-explanatory...14:25
xckpd7 lb1a: thanks14:25
Nothing4You k thanks14:26
← Nothing4You left14:26
→ yshh joined14:26
← yshh left14:26
→ yshh joined14:26
lb1a jast: i know, just love to present that the answer was there all the time14:26
← amigojapan_ left14:26
→ ErKa joined14:27
← rabellamy left14:28
→ amigojapan joined14:28
→ jaequery joined14:28
→ nabdev joined14:28
← danishkhan left14:28
← yshh left14:28
→ skorgon joined14:28
→ prudnikov joined14:29
← nabdev left14:29
→ nabdev joined14:29
megha fatal: https://github.com/codingenesis/Hello-World.git/info/refs?service=git-receive-pack not found: did you run git update-server-info on the server?14:29
→ yshh joined14:29
megha lb1a: this is the exact error that i was getting..14:29
after entering it ask me for credentials. than this error comes.14:29
→ geekbri joined14:29
→ chrismar035 joined14:29
→ traviscj joined14:30
→ knightshade joined14:31
jast megha: what version of git are you using? (git --version)14:31
megha 1.8.214:31
jast oh, I see14:32
→ darnir joined14:32
jast that repository simply doesn't exist14:32
← tevio left14:32
→ ehsan joined14:32
megha jast: i am simply following the tutorial on the github site.14:32
lb1a check for typos14:32
← siriuz left14:32
megha ok once again doing the tutorials.14:33
→ DrShoggoth joined14:34
jast megha: as the tutorial explains, you have to create the repository before you can push to it14:34
→ siriuz joined14:34
megha jast: i did init repository. which as mentioned in 1st and 2nd step14:34
jast no, the step before that14:35
under the heading "Make a new repository on GitHub"14:35
← infynyxx left14:35
← mihamina left14:35
→ Phoenixz joined14:35
← Phoenixz left14:35
→ Phoenixz joined14:35
← avinashrbhat left14:36
← wesside_ left14:36
← dogarrhea left14:36
→ wesside_ joined14:37
← dsdeiz left14:37
← vedant left14:38
← skorgon left14:38
megha jast: now it worked :)14:39
→ rotorooter joined14:39
← alunduil left14:39
jast cool14:40
megha got this error but my repo got on github error: failed to push some refs to 'https://github.com/codingenesis/Hello.git'14:40
jast: thanks :)14:40
← rchavik left14:40
Druide_ jast, you into hooks? :)14:40
← acharlieh left14:41
→ jjore joined14:41
← jackh left14:41
← frenchlaf left14:41
jast megha: look at the rest of the output, too14:41
that's just the last consequence, normally14:41
Druide_: a bit14:41
megha ok..14:41
← alexander__b left14:42
← lb1a left14:42
← siriuz left14:42
megha there are some hints given what might be the possible reason.14:42
→ zackiv31 joined14:42
→ spaceships joined14:43
jast if you !paste the complete message I can probably give you some extra hints, too14:43
gitinfo Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.14:43
Logiar my git suddenly seems to have trouble tracking files with utf-8 characters in their names, they get listed as deleted unstaged files and again as untracked files. Any ideas on how to fix it?14:43
→ siriuz joined14:44
→ tevio joined14:44
→ rue92 joined14:44
← kermit left14:44
→ alunduil joined14:45
→ kermit joined14:45
→ dhruvasagar joined14:46
Logiar http://pastebin.com/Pbcfnj1c14:48
→ jperry2_ joined14:49
→ Macaveli joined14:49
← alunduil left14:49
← Sigma left14:49
→ acharlieh joined14:51
← siriuz left14:52
→ PaulCapestany joined14:52
→ d2dchat joined14:52
→ Sky[x] joined14:53
← lacrymology left14:53
← eletuchy left14:53
← amigojapan left14:53
← Macaveli left14:53
→ FatDarrel joined14:54
→ siriuz joined14:54
→ Dougie187 joined14:55
← d2dchat left14:55
→ alunduil joined14:56
→ jerry66 joined14:56
← jerry66 left14:56
→ thiago joined14:56
→ lacrymology joined14:58
← hafeez3000 left14:59
← darnir left15:00
← siriuz left15:01
→ DARSC0D3 joined15:02
← daniel_- left15:03
← Vile1 left15:03
← rideh left15:04
→ goshawk joined15:04
← dsirijus left15:05
← netiul left15:06
→ Chikore joined15:07
← arvind_khadri left15:09
→ siriuz joined15:09
← ThomasLocke left15:09
→ avinashrbhat joined15:10
← cbreak-work left15:10
← ozette left15:11
← tevio left15:13
← DoniRS left15:14
← flijten left15:14
→ mmitchell joined15:14
← alunduil left15:15
→ DoniRS joined15:15
← siriuz left15:16
→ tevio joined15:16
← DARSC0D3 left15:16
→ dsdeiz joined15:17
← jjore left15:17
← dhruvasagar left15:17
→ eletuchy joined15:19
→ g0bl1n joined15:19
← Katafalkas left15:19
→ siriuz joined15:20
→ tinti joined15:20
Dougie187 Anyone have any tips for calling a bash function inside a --tree-filter in filter-branch?15:21
← traviscj left15:22
→ freestyler7 joined15:22
ojacobson Dougie187: define it in the same filter.15:22
Dougie187 So, inside of the ' ' I have to define the bash function?15:22
← LeMike left15:22
→ noahsussman joined15:23
→ praxa joined15:24
← mishok13 left15:24
→ newbie999 joined15:24
← aartist left15:24
← praxa left15:25
→ diget joined15:26
← prudnikov left15:26
← siriuz left15:27
→ LeMike joined15:28
→ haydenmuhl joined15:28
← Acony left15:28
charon Logiar: OS?15:29
→ siriuz joined15:30
← FatDarrel left15:30
← martinklepsch left15:31
→ NiteRain joined15:31
→ hwrd|work joined15:32
← howlymowly left15:33
← LekeFly left15:33
→ rue joined15:34
← tim left15:34
juvenal → juvenal_away15:34
← hyperair left15:35
→ rtjure joined15:35
→ Corey joined15:35
← jatt left15:35
→ alexander__b joined15:35
← narfnarf left15:36
→ dreiss joined15:36
← Phoenixz left15:36
← siriuz left15:36
← timini left15:36
← LeMike left15:36
charon Logiar: if os x, see core.precomposeunicode in man git-config. if not, it's some new issue and you should report it15:37
gitinfo Logiar: the git-config manpage is available at http://jk.gs/git-config.html15:37
→ Phoenixz joined15:37
← Phoenixz left15:37
→ Phoenixz joined15:37
→ LeMike joined15:38
→ eijk joined15:38
→ bmac joined15:39
→ siriuz joined15:39
→ casademora joined15:39
← eijk_ left15:41
→ maletor joined15:41
→ praxa joined15:41
→ _iron joined15:43
← hwrd|work left15:43
→ chuckharmston joined15:44
← bmac left15:45
← fooey left15:46
Dougie187 so, in my tree-filter, I'm checking for a directory that exists in some of the previous commits, but not all of them. And I want to put a .gitignore file in it when the directory is there, but it's not working.15:46
→ bmac joined15:46
Dougie187 Any tips? Or questions to help clarify my issue? :P15:46
← siriuz left15:46
hiptobecubic Has anyone here given any workshops or anything on using git?15:47
← goshawk left15:47
hiptobecubic I'm thinking about trying to put one together at my university. Scientists desperately need scm and no one uses it15:48
← rtjure left15:48
→ mezner joined15:49
→ fooey joined15:49
← maletor left15:49
PerlJam hiptobecubic: why do scientists need scm? (or, why stop at *just* scm?)15:50
← SonderbladeWork left15:50
→ siriuz joined15:50
← jperry2_ left15:50
→ Katafalkas joined15:51
hiptobecubic PerlJam, the need it for the same reasons anyone working on a rapidly shifting codebase needs it15:51
PerlJam hiptobecubic: (I pitched "software craftsmanship" as a CS elective to the local college a few years ago, but they didn't bite. It included things like scm, testing, writing code well, etc.)15:51
hiptobecubic and stopping there because you have you start (and stop) somewhere15:51
→ rideh joined15:51
hiptobecubic that's the second problem15:52
PerlJam IME, scientists have a big problem writing code that other people can read. It may get the job done, but you can't understand it very well15:53
hiptobecubic yes but the problem is that they also can't understand it well15:53
so backtracking when a mistake is made becomes hopeless15:53
← suy left15:53
Nevik Eugene, _ikke_, jast: is .version working again?15:53
PerlJam which boggles my mind because scientists deal with abstractions, but they can't articulate them in code (or prose sometimes)15:53
← mitz_ left15:53
→ vedant joined15:53
→ narfnarf joined15:54
hiptobecubic right now, my advisor has a collection of "backups" which are really just snapshots of the code at various dates whenever he thought it seemed like a good time, all kept in the same directory with names like "april_3"15:54
→ mikecmpbll joined15:54
← eletuchy left15:55
jast Nevik: *probably*15:55
Nevik well15:55
hiptobecubic But these seems like a pretty consistent pattern in academia15:55
Nevik .version15:55
gitinfo Nevik: .version: still at 1.8.2, not updating topic.15:55
Nevik huhn15:55
→ john_anderson joined15:55
Nevik jast: where does it get that number from?15:55
jast local clone of git.git, updated periodically15:55
→ r0bby joined15:56
Nevik ah15:56
because https://github.com/git/git/commits/v1.8.2.115:56
2d ago15:56
← thierryp left15:56
→ maletor joined15:56
jast oh, I see15:56
PerlJam hiptobecubic: yep. I deal with researchers who do the same.15:56
jast there's some breakage in the version comparison15:56
← maletor left15:57
← siriuz left15:57
Nevik jast: im in your codez, pointing out your bugz :>15:57
← lacrymology left15:58
← robbyoconnor left15:58
← rideh left15:58
hiptobecubic I was running git bisect the other day to try to justify "using all that crap instead of just saving a copy", It seemed like it made a reasonably good impression on everyone.15:58
Maybe there's hope15:59
→ danman joined15:59
→ siriuz joined15:59
ojacobson at some level git *is* "just saving a copy".15:59
← Iszak left15:59
hiptobecubic at a very very distant level, if you squint a lot and you're drunk, yes16:00
ojacobson Git's internals are snapshot-based -- every commit notionally contains the complete state, and diffs are computed from that, rather than the other way around (like, say, subversion, or hg)16:00
not even that distant16:00
PerlJam hiptobecubic: the other problem is once you've taught people to use git, you still might have to teach them to use it correctly.16:00
hiptobecubic the implementation is not what anyone cares about. Snapshots don't come with gits bell's and whistles.16:00
ojacobson That's a lovely theory, but git's UI is so bad that you have to care about the implementation to use it effectively. See also what PerlJam said.16:01
hiptobecubic PerlJam, if I can just get them to start committing at least once a day then I'll call it a success.16:01
PerlJam hiptobecubic: I worked with a woman who would use SCM (it was SVN at the time), but she would only commit like every couple of days rather than after each changem.16:01
ojacobson that said I've taken exactly that strategy with an arts student who was writing a webapp and it saved his bacon16:01
PerlJam s/changem/change/16:01
ojacobson forget all the complexity, just commit early and often16:01
and how to use the log16:01
hiptobecubic yes16:01
→ andrewSC joined16:02
andrewSC hi all16:02
→ infynyxx joined16:02
hiptobecubic the rest is not worth learning until you need it. you won't remember it until you've had to do it in hostile situation anyway16:02
at least I didn't16:02
andrewSC just to be certain, if i want to push a local branch to a remote branch with exactly the same name as my local branch, I just git push origin fooBranch16:02
remote repo*16:02
pitzips Question: What's the best way to update branches with the current master?16:02
Should I do git fetch, merge. Or, should I do git merge master?16:03
← LeMike left16:03
← markalanevans left16:03
andrewSC git fetch16:03
← jnavila left16:03
andrewSC git rebase16:03
→ ufk_ joined16:03
hiptobecubic if you fetch first you can look at the changes before merging/rebasing on them16:03
← mercwithamouth left16:03
pitzips great, thanks! i'll look into rebase16:03
jast .version16:03
gitinfo jast: .version error: repository contains no tags16:03
PerlJam pitzips: "branches"? The best way is to do them individually :)16:03
jast well, that's not entirely accurate yet :)16:03
→ maletor joined16:03
pitzips sorry, yes branch :-)16:04
jast .version16:04
gitinfo changed the topic to: Current stable version: 1.8.2.1 | Start here: http://jk.gs/git/ | Getting "Cannot send to channel" or unable to change nick? /msg gitinfo .voice | No gits, no glory!16:04
jast finally16:04
← trungqtran left16:04
jast the code is a bit ugly, though16:04
I might not actually commit it :}16:04
Nevik hehe16:04
hiptobecubic no gits no glory?16:04
← mmitchell left16:04
→ mmitchel_ joined16:04
Nevik indeed16:04
no gits no glory16:04
no commits no history16:05
jast blame Eugene for all the poor jokes16:05
hiptobecubic oh16:05
i suppose that's a reasonable interpretation16:05
Nevik interpretation?16:05
i didnt interpret anything16:05
→ doener joined16:05
hiptobecubic sure you did16:05
for example, a git is something entirely different in the uk16:06
→ BSaboia joined16:06
jast that's precisely the interpretation that inspired the name16:06
← maletor left16:06
jast ever noticed that it says "git - the stupid content tracker" in the manpage? :)16:07
← siriuz left16:07
→ wxcafe_ joined16:07
← jargon left16:07
AlexMax only took 1 min 5 seconds for someone to mention that16:07
wxcafe_ hey16:07
gitinfo wxcafe_: 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.16:07
wxcafe_ i have a problem with git16:07
i'm trying to add directories recursively16:07
but it stops at ~3 recursions16:07
← AlexMax left16:08
PerlJam wxcafe_: I doubt it. do the directories contain files?16:08
→ boratynski joined16:08
boratynski Hellow.16:08
Hello. :-)16:08
wxcafe_ (specifically, the problem only shows up with my vim config directory, which is 3 directories deep)16:08
PerlJam: yep they do16:08
boratynski Guys, how to check what files hasn't been commited yet?16:08
hiptobecubic well the original was "information manager from hell"16:09
boratynski, git status16:09
wxcafe_ the thing is, they have a .git/ of their own, so i don't know if that could mess with it16:09
→ tjbiddle joined16:10
→ mf_ joined16:10
← nabdev left16:10
wxcafe_ (managed with pathogen)16:10
→ siriuz joined16:10
wxcafe_ anyone has any idea?16:10
→ hwrd|work joined16:11
→ danishkhan joined16:11
→ mishok13 joined16:11
→ guns joined16:11
cmn that's why16:11
→ howlymowly joined16:11
cmn git will stop at any other git repo16:11
wxcafe_ cmn: oh :/16:12
cmn well, not any, just the ones with a worktree16:12
wxcafe_ so i guess i have to remove the .git/ directory in every subdir of my vim/bundle/ ?16:12
cmn if you want to track them as files, yes16:12
otherwise, !subrepo16:12
gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.16:12
← khushildep left16:13
→ khushildep joined16:14
→ penguin1 joined16:15
→ Andromeda joined16:15
→ crankycoder joined16:16
← hwrd|work left16:16
→ barneybook joined16:17
← siriuz left16:17
→ Gentlecat joined16:17
← herdingcat left16:17
← barneybook left16:17
→ herdingcat joined16:18
wxcafe_ oh, also16:18
→ barneybook joined16:18
← jpcamara left16:18
← jaequery left16:18
→ boombatower joined16:18
→ maletor joined16:18
← alorence left16:18
← andrewSC left16:18
wxcafe_ if i have a .gitignore with, for example, mnt and etc/moc in it16:19
→ dhruvasagar joined16:19
→ siriuz joined16:19
wxcafe_ and that i do a git add *16:19
← Watabou left16:19
wxcafe_ will mnt and etc/moc be added to the repo?16:19
→ hiroyuki joined16:19
→ Raging_Hog joined16:20
← AdrienBrault left16:20
jast if they aren't already tracked, no16:20
wxcafe_ hmm16:20
it says "The following paths are ignored by one of your .gitignore files"16:20
← heytrav left16:20
wxcafe_ how can i just ignore it totally, and just add everything except what is in the .gitignore?16:21
cmn git add .16:21
→ heytrav joined16:21
cmn the glob is being expanded by your shell16:21
so you're telling git to add those files too, and it refuses16:21
→ eletuchy joined16:21
→ mitz_ joined16:21
wxcafe_ thanks cmn16:22
← tevio left16:22
← _Qman left16:22
→ MacWinner joined16:22
→ ParanoidSP joined16:22
← guns left16:24
← thiago left16:24
hiptobecubic everytime i forget to commit for awhile, i also introduce some disgusting subtle bug16:25
→ jdunck joined16:25
→ trungqtran joined16:25
hiptobecubic it's the worst coincidence16:25
→ rideh joined16:25
← khushildep left16:26
← ParanoidSP left16:26
← fRAiLtY- left16:26
→ khushildep joined16:27
→ Saby joined16:27
← Saby left16:27
→ Saby joined16:27
← siriuz left16:27
← elixir left16:27
juvenal_away → juvenal16:27
→ scalability-junk joined16:28
← scalability-junk left16:28
→ GenTAR joined16:28
→ mikehaas763 joined16:28
→ ojacobson_ joined16:28
← mitz_ left16:28
→ dous joined16:29
← Andromeda left16:29
← rideh left16:29
→ siriuz joined16:30
← danishkhan left16:30
→ etcetera joined16:31
← herdingcat left16:31
← rue92 left16:32
← ojacobson left16:32
→ Chillance joined16:32
ojacobson_ → ojacobson16:32
← mikecmpbll left16:32
← dreiss left16:34
wxcafe_ hmm16:34
doesn't seem to work16:35
← rath left16:35
wxcafe_ i still don't get my bundle directories, even though i removed each .git/ subdir16:35
← heytrav left16:35
← khushildep left16:35
wxcafe_ hmm16:35
_ikke_ wxcafe_: Are those directories empty?16:36
wxcafe_ no16:36
that's the problem16:36
→ frenchlaf joined16:37
→ dorkmafi1 joined16:37
← siriuz left16:37
← spuz left16:37
→ tjbiddle_ joined16:37
← tjbiddle left16:38
wxcafe_ it really is a problem to me...16:38
→ weltall joined16:38
← mastro left16:39
← haydenmuhl left16:39
→ siriuz joined16:39
→ tjbiddle joined16:39
← GarethAdams left16:40
→ khushildep joined16:40
← dhruvasagar left16:40
→ Galaris_ joined16:40
← gwty left16:41
→ r0bby_ joined16:41
→ tevio joined16:41
← garbagecollectio left16:41
_ikke_ git config -l?16:41
← mikehaas763 left16:42
→ buibex joined16:42
← zoresvit left16:42
← tjbiddle_ left16:42
→ gregsmith joined16:42
→ mikehaas763 joined16:42
← r0bby left16:42
← Yougi left16:43
→ heytrav joined16:43
← jceb left16:44
→ ozette joined16:44
→ jaequery joined16:44
→ geoffry joined16:44
→ Shusshu joined16:44
← geoffry left16:44
← irqq left16:44
← dorkmafi1 left16:45
wxcafe_ http://pastie.org/738880516:45
→ jpcamara joined16:45
→ oriba joined16:45
→ leeN joined16:45
← GenTAR left16:45
→ gwty joined16:45
← siriuz left16:47
→ JEEB joined16:47
← dsdeiz left16:47
wxcafe_ so, i get this16:48
→ boffo joined16:48
wxcafe_ http://pastie.org/738884916:48
← eletuchy left16:49
wxcafe_ (with l being an alias for ls -la)16:49
anyone has a clue?16:49
← chuckharmston left16:49
→ siriuz joined16:50
→ Wolk joined16:50
gitinfo set mode: +v16:51
Wolk hello16:51
gitinfo Wolk: 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.16:51
→ aberrant joined16:51
→ hobodave joined16:51
→ netj joined16:51
Wolk Hello, i'm trying to get git running with my friend, we use bitbucket and well, we're having problems16:51
can anyone help?16:51
→ jperry2_ joined16:51
← praxa left16:52
lov Without more information, no, not really.16:52
Wolk we use eclipse16:52
and android sdk16:52
← wxcafe_ left16:52
Wolk I've used the trick and can pull and push now16:52
← heytrav left16:52
Wolk but he can't do any of those, he gets errors like The current branch is not configured for pull No value for key branch.master.merge found in configuration16:52
← achadwick left16:52
← Shusshu left16:53
Wolk when he tryes to pull16:53
→ ph^ joined16:53
Wolk and non fast error when he tryes to push16:53
→ tjbiddle_ joined16:53
lov "non fast error"16:53
how about you give us actual error messages16:53
→ heytrav joined16:53
→ tjbiddle__ joined16:53
→ Davey joined16:54
→ dhruvasagar joined16:54
← tjbiddle left16:54
tjbiddle__ → tjbiddle16:54
Wolk non fast forward16:54
→ hello joined16:54
Wolk that's what he gets when he pushes16:54
← hello left16:55
→ darnir joined16:56
→ praxa joined16:56
→ mastro joined16:56
← tevio left16:57
lov Wolk: that's probably because he has to pull and rebase before he pushes16:57
← Druide_ left16:57
Wolk yes, but when he tryes to pull16:57
The current branch is not configured for pull No value for key branch.master.merge found in configuration16:57
← tjbiddle_ left16:57
lov perhaps he should fix this?16:57
← siriuz left16:57
Wolk this?16:57
lov have him set the branch to point to an appropriate remote16:57
Wolk sec, we tryed using http://wangpidong.blogspot.com/2012/05/how-to-use-bitbucket-with-egit-in.html?showComment=1352228102788#c351286223964147906616:58
→ jjido joined16:58
← vedant left16:58
Wolk the [remote "origin"]16:58
is added16:58
Well, it worked for me, i can pull16:58
→ siriuz joined16:59
Wolk but he cannot16:59
Nevik then you did something different16:59
for you, than for him16:59
or you use a different version16:59
Wolk different version of?16:59
git?16:59
lov also, note the last part of this "tutorial" that mention modifying the .git/config file.16:59
Nevik you shouldnt manually edit your config files if you dont know what you're doing16:59
lov yes, that too16:59
this is really a terrible, terrible blagpost to just follow blindly17:00
Nevik egit and git both offer methods to add and modify remotes17:00
Wolk Well gee, i just want to share a simple code17:00
← Sebo left17:00
Wolk i've read thru the docs17:00
but i can't get it to work17:00
Well, how can he pull my code then17:00
Nevik remove those lines you added to his config file17:01
← BSaboia left17:01
← sdeboey left17:01
Nevik then open a terminal in the folder of the git repo on his computer17:01
→ chuckharmston joined17:01
Wolk yes?17:02
then?17:02
← penguin1 left17:02
→ anderse joined17:03
Nevik Wolk: you have removed the config lines ?17:03
Wolk yes17:03
← john_anderson left17:03
→ mitz_ joined17:04
← Error404NotFound left17:04
Nevik then run `git remote add bitbucked [email@hidden.address]17:04
er bitbucket* ofcourse17:04
Wolk he's not on linux17:04
bro17:04
i am17:04
Nevik you never mentioned that. what OS is he using17:04
Wolk win17:04
717:04
← tjbiddle left17:05
→ tjbiddle joined17:05
Nevik has he installed Git for Windows?17:05
Wolk Does he need to? We're using egit for eclipse17:05
← Chikore left17:05
← dvide left17:06
Nevik well, when egit isnt working, the command-line client will fix stuff. also, everyone here uses the CLI so when you need help, people can tell you what to do17:06
→ rideh joined17:06
Nevik you can try adding the remote with egit, but ive never done that17:06
so i cant give you step-by-step instructions17:06
→ elixir joined17:06
← siriuz left17:07
Wolk adding the remote branch?17:07
Nevik basically, in the repository view of egit, open the repo, right-click on Remotes and use "Create Remote"17:07
→ Artpicre joined17:07
← alkino left17:07
Nevik Wolk: you add the remote as a whole and usually fetch all branches17:07
that causes the least headache17:07
Wolk well17:08
there's remote17:08
pull from upstream17:08
and push and pull17:08
but no create remote17:08
cbreak Wolk: man git-remote add17:08
gitinfo Wolk: the git-remote manpage is available at http://jk.gs/git-remote.html17:08
→ siriuz joined17:09
Nevik cbreak: he doesnt wanna install the cli for his friend17:09
but use egit only17:09
cbreak egit? people still use that garbage?17:09
Nevik Wolk: well if the remote is already there, pull from it17:09
cbreak I've only heard of trouble with that thing17:09
← netj left17:09
Nevik cbreak: yes17:09
Wolk he can't pull17:09
Nevik yes, that too17:09
Wolk: then delete the remote and add it properly in egit17:09
no touching config files17:09
→ security joined17:10
Wolk what...17:10
← mitz_ left17:10
← rideh left17:10
← megha left17:11
← mmitchel_ left17:11
Wolk add it propperly?17:11
it was propperly added17:11
just read my link i posted17:12
Nevik Wolk: apparently not, or it would work17:12
delete the remote and use egit to add it17:12
→ Andromeda joined17:12
Wolk ok17:12
→ netj joined17:12
← praxa left17:12
→ markalanevans joined17:12
→ marcdel joined17:13
→ Chillance_ joined17:13
→ penguin1 joined17:13
Nevik Wolk: btw, http://wiki.eclipse.org/EGit/User_Guide17:15
→ eletuchy joined17:15
Wolk Well, leme retry pushing from start17:15
→ Noldorin joined17:15
← siriuz left17:16
← Chillance left17:16
security → baba17:16
→ ThePawnBreak joined17:17
→ cjz joined17:17
→ JohnBat26 joined17:17
cjz rebase seems to be squashing all the commits17:17
Nevik cjz: only if you tell it to17:17
cjz doesnt leaving it pick mean i want those commits not to be squashed?17:18
← angelsl left17:18
Nevik yes17:18
cjz well its squashing them17:18
i leave them pick and they are all gone17:19
→ lasers joined17:19
Nevik are you sure you're looking in the right place?17:19
cjz looking in the right place17:20
whats that mean?17:20
Nevik well, rebase moves history17:21
Wolk idk17:21
Nevik you might just be expecting it to be somewhere else17:21
Wolk now there's conflicts17:21
or some shit17:21
w/e17:21
this is bullshit17:21
why can't i overfuckingwrite it17:21
Nevik Wolk: because you'd lose work17:21
Wolk but i want to lose work17:21
lol17:21
because i've remade it from scratch17:22
← maxmanders left17:22
Wolk Ok so, i think my master branch is up17:22
Dougie187 How do you push a git commit -amend to a remote?17:22
Wolk does he have to pull remote?17:22
or fetch it17:22
or what17:22
← casademora left17:23
Nevik Dougie187: once youve committed, push normally. if you've already pushed the ammended commit before, that'll get rejected. in that case, `git push -f REMOTE BRANCH`17:23
→ cbot__ joined17:23
← Plouj left17:23
Dougie187 Nevik: Thanks. :D17:23
← yuwang left17:23
→ traviscj joined17:23
→ kit joined17:23
→ thiago joined17:23
Nevik Wolk: that depends on what he already has, really. but fetching and then merging or resetting the branch will work17:23
Wolk: also, dont call a tool shit if you dont take the time to learn how to use it17:24
(and in case you overlooked cbreak's pop-in earlier: egit is kinda shit)17:24
Wolk it'd take me longer to learn how to use git than C#17:24
→ siriuz joined17:24
imMute Wolk: with that attitude, yeah.17:24
Wolk Ok well17:24
← cbot_ left17:24
Wolk i'm trying to commit17:24
but it says there's a conflict17:24
do i merge?17:24
or reset the branch17:25
→ yuwang joined17:25
Nevik i'd say resolve the commit by checking out the revision you want, but honestly dont know how to do that in egit17:25
for stuff like that i use the cli17:25
cbreak Wolk: if there's a conflict then you tried to merge17:25
and the merge failed17:26
Wolk: resolve the merge17:26
or abort it17:26
Wolk is there anyone who uses egit...17:26
← buibex left17:26
cbreak none survived, sorry17:26
← dhruvasagar left17:27
→ Watabou joined17:27
Wolk then why should i use git17:28
imMute because git > egit17:28
Wolk in what way?17:29
my friend doesn't use linux17:29
and saving the folders17:29
and then using the git17:29
over the saved files17:29
sounds like a pain17:29
→ FatDarrel joined17:29
bremner you can use the CLI perfectly well on windows.17:29
Nevik you can use git without egit on windows17:29
es, as bremner said17:29
as i was starting to point out earlier, install Git for Windows17:30
cbreak Wolk: what are you babbling about?17:30
Wolk i'd rather just use the pastebin then17:30
cbreak I don't use linux either, and yet I use git17:30
and I've never saved folders17:30
Nevik but if you're this averted to learning how to use git, your friend probably wont like to touch a cli program17:30
Wolk i've read the the damn documentation17:30
and still can't use it17:30
because it's different17:30
on bitbucket17:30
→ arietis joined17:30
← marhaban left17:30
cbreak because you haven't installed it17:30
duh17:30
Wolk and egit17:30
← siriuz left17:31
Nevik tries out if bitbucket is actually that big of an issue or if people are just talking nonsense17:31
cbreak if you are actually stupid enough to judge git by how worthless egit is, then you're beyond help.17:31
Wolk yes i'm a retard17:31
← maxandersen left17:31
Wolk i just want to share a code17:31
← Vampire0 left17:31
Wolk in 15 seconds17:31
cbreak then use git17:32
Wolk don't wanna spend 3 weeks17:32
cbreak why would you spend 3 weeks?17:32
Wolk on learning how to use another rrepo17:32
bremner Wolk if pastebin works for you, do that.17:32
cbreak repo?17:32
Wolk i used svn17:32
it was simple17:32
cbreak using a repo doesn't take time17:32
Wolk and easy to use17:32
→ danishkhan joined17:32
Wolk then i tryed git17:32
cbreak no, you didn't17:32
Wolk and all sorts of problems pop up17:32
bremner Wolk: so use svn. We don't mind.17:32
cbreak you didn't even install it17:32
← ehsan left17:32
Wolk i'm using the built in git17:32
thingie17:32
→ maxandersen joined17:33
← maxandersen left17:33
→ maxandersen joined17:33
cbreak built in into what?17:33
→ lacrymology joined17:33
→ ehsan joined17:33
→ Vampire0 joined17:33
lacrymology I've got commits A B C D E, and I'd like to squash B and D, is it possible?17:33
→ soypirate joined17:33
cbreak lacrymology: yes.17:33
Wolk built into eclipse17:33
cbreak lacrymology: man git-rebase -i17:33
gitinfo lacrymology: the git-rebase manpage is available at http://jk.gs/git-rebase.html17:33
cbreak Wolk: that one's worthless, and it is not git17:33
Wolk i use eclipse android sdk17:33
right17:34
lol17:34
cbreak it's not even fully compatible to git17:34
→ siriuz joined17:34
cbreak for some reason they tried to reimplement it and failed spectacularly17:34
lacrymology cbreak: I looked into rebase -i, but it looks like it can only squash consecutive commits17:34
Nevik omg egit is so bad17:34
cbreak lacrymology: so reorder them17:34
Wolk i don't care, i just wanna click to share code17:34
push and pull17:34
cbreak lacrymology: you can just change the order of lines17:34
lacrymology cbreak: ah!17:35
← netj left17:35
← gregsmith left17:35
lacrymology cbreak: last one, how do I tell rebase to base it off the same root?17:36
Nevik Wolk: then git is not your solution17:36
cbreak lacrymology: git rebase -i HEAD~517:36
Nevik dropbox is probably more what you want, Wolk17:36
cbreak that will rebase the newest 5 commits17:36
→ Hounddog joined17:36
cbreak lacrymology: just do something similar17:36
Wolk Nevik i'd like to have a versioning system17:36
svn worked fine17:36
Nevik then use svn17:36
Wolk but this is crazy hard to configure17:36
cbreak Wolk: git? basically configures itself17:36
Nevik Wolk: the problem is that egit is shit17:36
Wolk why don't you just tell me how to use git instead17:36
cbreak Wolk: what's the problem?17:36
Wolk the problem is i can't commit17:37
and my friend can't pull17:37
cbreak Wolk: all you do is whine around17:37
Wolk yes17:37
because i'm lost17:37
cbreak instead of doing what we tell you to do17:37
Nevik cbreak: to improve your informed hate: egit doesnt set up remotes properly17:37
it doesnt set up a fetch and pull refspec17:37
cbreak Nevik: surprise...17:37
→ aartist joined17:37
cbreak Wolk: step 1: install git17:37
← eletuchy left17:38
cbreak Wolk: if you do not have git, then you're incapable of using git17:38
Nevik Wolk: to install git on your friend's comp, use http://code.google.com/p/msysgit/downloads/detail?name=Git-1.8.1.2-preview20130201.exe&can=1&q=17:38
lacrymology cbreak: fantastic, thank you17:38
Nevik that's git for windows17:38
cbreak lacrymology: no problem :)17:38
← jjido left17:38
Nevik Wolk: i assume that you've already installed the actual git on your own comp17:38
if not, do so, using your package manager17:38
Wolk yees17:38
i did17:38
and git server17:38
but that's usless as i use bitbucket17:39
Nevik correct17:39
cbreak there's a git server?17:39
Wolk yes17:39
Nevik he probably mean git-daemon17:39
cbreak git doesn't use separate servers17:39
→ netj joined17:40
← PaulCapestany left17:40
→ mitz_ joined17:41
→ mercwithamouth joined17:42
← siriuz left17:42
Wolk ok so17:44
source ref17:44
remote ref to delete17:44
what do i do17:44
to overwrite the previous version17:44
so it's on the main server17:44
→ h0bbit joined17:44
Wolk is the source ref master or is it head branch17:44
Nevik first of all, stop talking so much in so short lines17:44
ask precise questions17:45
→ siriuz joined17:45
Nevik Wolk: you're still trying to set up stuff on your friend's computer, right? throwing away all his local changes17:45
Wolk No, i'm trying to put a new clean version17:45
on bitbucket17:45
so he can fetch from that one17:45
→ gregsmith joined17:45
cbreak so, what is on bitbucket now?17:45
Wolk master rejected, non fast forward17:45
→ irqq joined17:45
Wolk beats me17:46
i have no idea17:46
probably a result of half failed files17:46
→ jfinn joined17:46
cbreak you commit half failed files?17:46
← boombatower left17:46
cbreak you shouldn't do that17:46
Wolk Well, can i create a new branch17:46
and just delete main?17:46
← traviscj left17:46
cbreak no point.17:46
Wolk ok then what should i do17:46
cbreak what you have to do is figure out where you want to be17:46
which commit do you want to be at?17:46
Wolk main branch17:46
cbreak you can look at the main branch commits with git log master17:47
Wolk new commit? so overwrite the first one? or latest one17:47
ok17:47
yeah i can see them17:47
bitkiller OMG17:47
Wolk ok well i've forced updated it17:47
cbreak if you're happy with that, then you can kill all local changes with git reset --hard HEAD17:47
Nevik bitkiller: you called?17:47
cbreak that will remove all uncommitted changes17:47
and all conflicts you mentioned before17:48
bitkiller :)17:48
cbreak then check if that state is acceptable17:48
if it is, then you can push it.17:48
Wolk ok so17:48
how can i check17:48
if my project really is up there17:48
how can i rollback now17:48
cbreak by using your eyes and your brain17:48
Wolk do i just pull?17:48
← netj left17:48
→ Wolkec joined17:49
cbreak if you pushed, and the push succeeded, then the push succeeded...17:49
duh...17:49
gitinfo set mode: +v17:49
← mitz_ left17:49
cbreak now all with access permissions can fetch17:49
→ boombatower joined17:50
→ netj joined17:50
→ rideh joined17:51
← threesome left17:51
→ threesome joined17:51
← rsv left17:52
→ rue92 joined17:52
← siriuz left17:52
← Wolk left17:52
→ Sigma joined17:53
← cthuluh left17:53
→ siriuz joined17:55
→ cthuluh joined17:55
→ TeckniX_ joined17:55
← TeckniX left17:56
TeckniX_ → TeckniX17:56
← Sky[x] left17:56
← infynyxx left17:56
← momomomomo left17:56
→ lolmaus joined17:57
Wolkec aww perfect17:57
now i have 3 different folders17:57
→ goshawk joined17:57
→ vedant joined17:58
→ momomomomo joined17:58
→ darnir_ joined17:59
→ flavius joined17:59
→ Milossh joined17:59
lolmaus I did `git add -A` and suddenly ALL files are in index. I was lucky to decide to do `git diff --name-only --cached` before committing. The history for each file looks like this: minus ALL lines, then plus all lines back. Why did this happen and how do i fix that? I haven't commited yet.17:59
imMute lolmaus: sounds like the line endings changed.18:00
lolmaus imMute, oh...18:00
← ojacobson left18:01
Wolkec ok so18:01
cbreak lolmaus: git add -A just means "Add everything18:01
Wolkec ok so, how can my friend pull now18:01
from the master branch18:01
← darnir_ left18:01
Wolkec what does he need18:01
cbreak Wolkec: git will set up everything automatically18:01
lolmaus cbreak, it means "add everything that changed, remove everything that disappeared"18:01
← darnir left18:01
Wolkec well18:01
it doesn't18:01
cbreak once you cloned, you can git pull and it'll merge the upstream branch18:01
→ sq-one joined18:01
Wolkec and it doesn't work18:01
cbreak of course it does18:01
→ whowantstolivef1 joined18:01
Wolkec no he gets an error18:01
cbreak what error?18:02
Wolkec the same one as before18:02
→ tjbiddle_ joined18:02
lolmaus imMute, oh, i got it. My code is in a virtual machine. I've been using git on host machine via a network FS. Then i fired `git add -A` on virtual machine and it treated line endings differently.18:02
cbreak lolmaus: aka "Add everything"18:02
lolmaus: it adds every kind of change. Including removals and including new file creations.18:02
← siriuz left18:02
lolmaus cbreak, i edited a couple of files. It added dozens of files.18:02
cbreak Wolkec: and what error was that?18:03
→ rakl joined18:03
Wolkec idk scroll up18:03
cbreak lolmaus: as I said, it'll add all changes you did18:03
Wolkec sec18:03
the current branch is not configured to pull18:03
that one18:03
cbreak Wolkec: then he didn't use git to clone18:03
Wolkec: because git will configure for pulling automatically18:03
Wolkec does he have to?18:03
ok sec18:03
cbreak if he wants to pull he has to configure it to pull18:03
does he want to pull?18:04
Wolkec yes18:04
→ eletuchy joined18:04
cbreak he can pull manually too18:04
but that requires more than noob knowledge18:04
Wolkec ok well then not manually it is18:04
← soypirate left18:04
→ soypirate joined18:05
→ siriuz joined18:05
← tjbiddle left18:06
tjbiddle_ → tjbiddle18:06
← rue92 left18:06
lolmaus imMute, i did `git reset` and then repeated `git add -A` from the host machine. Now it only has a couple of files in index. Thank you!18:06
← maxandersen left18:06
flavius Is it possible to just "read in" the changesets (commit messages/timestamps/authors and contents) of another repo (think about the subtree merge strategy) into a subdirectory of the current branch? With read-tree for instance I lose all that information18:06
Wolkec might help if someone told me how to do it18:06
cbreak Wolkec: what's the problem?18:06
Wolkec are you a goldfish18:07
cbreak every noob guide to git mentions how to clone18:07
Wolkec well i'm using the builtin egit18:07
deal with it18:07
there's no cloning reps18:07
cbreak too bad. then you're out of luck18:07
Wolkec well suck for me18:07
cbreak yep :D18:07
Wolkec i guess i'll stick on stuff you can actually use18:07
cbreak try git18:07
it'll work much better :P18:07
Wolkec no git sucks,why would i ever want to use a console18:08
to update my source files18:08
flavius cbreak: ignore me and help me instead, I'm using the console :)18:08
cbreak Wolkec: get some brain cells18:08
flavius actually, I love the console18:08
← acharlieh left18:08
Wolkec all out of those today18:08
flavius s/ignore me/ignore him18:08
cbreak flavius: can't hear you, I am ignoring you :)18:08
bremner Wolkec: nobody forces you to use git, but please don't get into trolling contests with cbreak. He always wins in the end.18:09
cbreak yep :D18:09
ChanServ set mode: +o18:09
Wolkec no i'm not trolling18:09
i just want to use the git18:09
cbreak I have the power!18:09
Wolkec and no one is helping18:09
cbreak Wolkec: go moan around in #egit18:09
flavius Wolkec: git means console. there's no git for ya18:09
cbreak there are GUI tools18:09
for windows maybe try gitextension18:09
imMute Wolkec: no, you want to use egit. fuck off.18:09
Wolkec cus everyone is on the damn arch linux using git commands for your pro asm program18:09
cbreak they use the normal git18:09
imMute cbreak: DOOO EEET.18:10
flavius cbreak: come on, akick and help me please :)18:10
cbreak flavius: you can git remote add any repository18:10
flavius cbreak: yeah, and then?18:10
Wolkec ok then tell me how to use the normal git? how will i be able to compare the changes18:10
cbreak then you can merge the history18:10
Wolkec if there's no gui18:10
cbreak into a subdirectory if you want18:10
flavius cbreak: how? that was the question18:10
JosefAssad some people just need directx interfaces to their development tools18:10
imMute Wolkec: 'git diff'18:10
bremner Wolkec: see !book18:11
gitinfo Wolkec: 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 !parable18:11
cbreak flavius: man git-merge, look at the subdirectory options18:11
gitinfo flavius: the git-merge manpage is available at http://jk.gs/git-merge.html18:11
cbreak flavius: I've not used them myself, so I can't go into details18:11
Wolkec yeah see you in 3 months18:11
when i read all 15 books18:11
bremner Wolkec: the first couple chapters are very short18:11
cbreak but the -s recursive -X subtree should work18:11
flavius cbreak: I never imagined merge could do that18:11
Wolkec i've already read those18:11
and everything i've read18:11
flavius cbreak: thanks18:11
→ acharlieh joined18:11
Wolkec doesn't work18:11
flavius Wolkec: if it doesn't work, then egit sucks18:12
Wolkec well screw me18:12
cbreak flavius: well, you basically said it already18:12
← zenx left18:12
← siriuz left18:12
Wolkec why was it even made18:12
then18:12
← momomomomo left18:12
flavius Wolkec: ask the authors of egit18:12
← normanrichards left18:12
→ momomomomo joined18:12
← TeckniX left18:13
→ johnbenz joined18:13
← Noldorin left18:13
→ Chaser joined18:14
← vedant left18:14
→ siriuz joined18:14
← rideh left18:14
→ TeckniX joined18:15
→ BSaboia joined18:15
cbreak set mode: -o18:17
→ praxa joined18:17
→ alainus joined18:17
→ garbagecollectio joined18:17
← praxa left18:18
← netj left18:18
→ LekeFly joined18:18
← ErKa left18:19
← johnbenz left18:19
→ netj joined18:19
→ knightshade2 joined18:19
→ mitz_ joined18:20
→ maxmanders joined18:20
alainus Is there anything similar to "git clone [email@hidden.address] I just switched to a new box and there are many projects in the company's gitlab18:20
dr_lepper alainus: generally it is not possible to list the remote repositories18:21
cbreak alainus: rsync? :)18:21
dr_lepper you have to have real ssh shell access18:21
← oriba left18:21
alainus dr_lepper, I do have ssh access18:21
→ oriba_ joined18:21
← Davey left18:21
dr_lepper then you can list the directory and clone each repository18:21
it's outside git's scope18:22
← momomomomo left18:22
→ momomomomo joined18:22
bremner alainus: it's really a gitlab question. I suspect "ssh git@server info" will give you a list of repos, but that depends on gitlab.18:22
← siriuz left18:22
→ praxa joined18:22
alainus dr_lepper, that would actually be bash programming right ?18:22
cbreak alainus: how about ssh user@host "ls -l ~user/*.git" | xargs ... git clone somethingsomething18:23
alainus bremner, thanks i'll look at the docs18:23
cbreak if you don't want to rsync :)18:23
alainus cbreak, that seems right18:23
thanks =)18:23
← knightshade left18:23
dr_lepper cbreak: git clone does not accept several urls, does it?18:23
← trungqtran left18:23
cbreak dr_lepper: you can tell xargs to split it18:23
grawity dr_lepper: imagine an -n1 in place of the ...18:24
cbreak -L 1 or so18:24
dr_lepper alainus: well, you can program it in anything18:24
cbreak: grawity: i know18:24
grawity but I thought you probably don't want to rsync as it'll grab gitlab-specific repo configs and hooks18:24
dr_lepper it's just it isn't immediately obvious18:24
→ siriuz joined18:24
← engkur left18:24
← cthuluh left18:24
→ trungqtran joined18:25
← soypirate left18:25
Wolkec http://f.kulfoto.com/pic/0001/0015/L80Cl14168.jpg18:25
→ oldcreek joined18:25
flavius cbreak: I've tried both git {pull,merge} -s recursive -X subtree=my/subdir <remote/treeish> but it puts the files under the repository root18:25
→ Laurenceb_ joined18:26
→ huoxito joined18:26
→ infynyxx joined18:27
→ maxandersen joined18:27
← maxandersen left18:27
→ maxandersen joined18:27
← mitz_ left18:27
cbreak flavius: well, I've never used it, so I can't give you any detailed hints on how to use them.18:27
← infynyxx left18:27
← elixir left18:27
← oldcreek left18:27
→ oldcreek joined18:27
→ infynyxx joined18:27
→ atrus joined18:28
cbreak it might be that you first have to adjust one of the trees to be in a subdirectory18:28
flavius cbreak: ok I'll try out different things and get back to you with the answer18:28
→ soypirate joined18:28
cbreak you can do that by just checking out a branch of it, moving everything into the subdir and committing...18:28
→ AeroNotix joined18:28
→ vedant joined18:28
cbreak (or you can rewrite history doing the same)18:28
flavius yeah (but I don't have writing rights for the other repo)18:29
→ cthuluh joined18:29
← Saby left18:29
AeroNotix is there some part of git or program which I can tell it to manage N repos and then query them all? I could write something myself but I assume this is out there somewhere18:29
flavius anyway, I'll do more testing18:29
← ehsan left18:29
→ variousnefarious joined18:29
← oldcreek left18:29
→ Saby joined18:29
← Saby left18:29
→ Saby joined18:29
cbreak AeroNotix: submodules do something like that, but they are very likely not what you want.18:29
flavius AeroNotix: add them as submodules to a superrepo and use git submodule foreach18:30
← acharlieh left18:30
AeroNotix cbreak: nah, fuck submodules worst idea ever.18:30
cbreak AeroNotix: I heard google had a tool called "repo" for managing repositories, but who knows what it does18:30
→ draginx joined18:30
→ Joe7 joined18:30
cbreak AeroNotix: nah, they are cool18:30
just never used properly :/18:30
→ khmarbaise joined18:30
AeroNotix cbreak: maybe. I've tried to incorporate them into my work but I realise that separate repositories are much easier to use18:30
← siriuz left18:30
← marthinal left18:31
cbreak submodules are for strong binding18:31
in many cases that's not needed18:31
AeroNotix indeed18:31
hmm, I'll just throw a script together for the basic functionality I need18:32
→ PaulCapestany joined18:32
cbreak flavius: you probably know this already: http://git-scm.com/book/de/Git-Tools-Subtree-Merging18:33
flavius yeah, thanks cbreak18:34
← gregsmith left18:34
→ penguin1_ joined18:34
→ system64 joined18:34
→ siriuz joined18:34
→ dhruvasagar joined18:34
← penguin1 left18:34
← Chillance_ left18:35
→ vamosdime joined18:35
flavius I've tried that already (without --squash of course) it doesn't work, it puts the files in the root)18:36
← variousnefarious left18:36
← infynyxx left18:37
→ tjbiddle_ joined18:37
cbreak well, the way it seems to work is to guess where it has to place them18:37
penguin1_ → penguin118:37
cbreak that's what the read tree and commit part is for18:37
to put files into the index so the subtree strategy knows where to put them18:37
don't ask me why -X subtree needs that though18:38
(I'd have expected it to honor the path the user specifies)18:38
flavius I think the notion of "subtree" refers to the "subtree" in the remote repo, not the current repo18:38
→ variousnefarious joined18:38
cbreak I think it's actually local18:38
flavius yeah, it doesn't take the path into account18:39
→ aksnot joined18:39
flavius tried both with and without a leading /, and both from within that other directory and from the root18:39
although once it did something strange to say the least. it has dropped the files in a completely different directory18:40
← Treggats left18:40
cbreak did you try to commit a snapshot of the remote repository first?18:40
flavius commit a snapshot?18:40
← frenchlaf left18:40
cbreak as shown with git read-tree --prefix?18:40
← tjbiddle left18:41
tjbiddle_ → tjbiddle18:41
cbreak that would allow you to read the tree of the commit you specify into a subdirectory18:41
flavius why would I do that?18:41
cbreak to make subtree merging find the location18:41
flavius oh18:41
let me try18:41
good idea18:41
cbreak it's described in the article I linked above18:41
→ sq-one_ joined18:41
→ jjido joined18:42
← jpcamara left18:42
← siriuz left18:42
→ tjbiddle_ joined18:42
→ acharlieh joined18:42
→ tjbiddle__ joined18:43
FatDarrel hey'll i got a merge /rebase question anyone can help?18:43
← tjbiddle left18:43
tjbiddle__ → tjbiddle18:43
← sq-one left18:43
→ zenx joined18:43
grawity only if you actually ask the question.18:44
→ siriuz joined18:44
← praxa left18:44
→ jpcamara joined18:45
FatDarrel ok so i have a change from a branch that I have merged using git merge COMMIT_ID18:46
→ mikef joined18:46
← tjbiddle_ left18:46
← mikef left18:47
→ Schmoozerd_ joined18:47
→ sq-one joined18:47
← mastro left18:48
→ smirn0v joined18:48
→ elixir joined18:49
← Wolkec left18:49
← kit left18:49
→ tjbiddle_ joined18:49
FatDarrel now when i push this up will i get the whol log of that commit18:49
← Schmoozerd left18:50
→ tenmilestereo joined18:51
→ m0viefreak joined18:51
→ makkes joined18:51
← acharlieh left18:51
← sq-one_ left18:52
← arietis left18:52
← siriuz left18:52
→ sq-one_ joined18:52
cbreak FatDarrel: !lol18:53
← WinstonSmith left18:53
→ trusktr joined18:53
cbreak hmm18:53
← tjbiddle left18:53
tjbiddle_ → tjbiddle18:53
cbreak did the bot die?18:53
alias.lol=log --graph --decorate --oneline --all18:54
← dhruvasagar left18:54
cbreak that alias will show you your local history, all of it18:54
→ ehsan joined18:54
← sq-one left18:54
cbreak that way you can see what you would push18:54
→ siriuz joined18:54
← makkes left18:54
→ dhruvasagar joined18:55
→ tjbiddle_ joined18:55
→ acharlieh joined18:55
→ dreiss joined18:55
← chimay left18:56
→ mitz_ joined18:56
→ cotton joined18:57
← whowantstolivef1 left18:57
← vedant left18:57
FatDarrel danke18:58
← sq-one_ left18:58
→ Zhut joined18:58
→ john2496 joined18:58
← Zhut left18:58
← tjbiddle left18:59
tjbiddle_ → tjbiddle18:59
ChanServ set mode: +o18:59
Eugene changed the topic to: Current stable version: 1.8.2.1 | Start here: http://jk.gs/git/ | Getting "Cannot send to channel" or unable to change nick? /msg Eugene for help18:59
→ sq-one joined18:59
← vamosdime left19:00
→ normanrichards joined19:00
→ WinstonSmith joined19:00
← momomomomo left19:00
← smirn0v left19:01
← siriuz left19:01
→ traviscj joined19:02
← ryez_ left19:03
→ momomomomo joined19:03
→ a1phanumrc joined19:03
← a1phanumrc left19:03
← narfnarf left19:04
← mitz_ left19:04
→ siriuz joined19:05
← Andromeda left19:06
→ btree joined19:07
← rakl left19:07
→ infynyxx joined19:07
→ chrismar035_ joined19:08
← chrismar035_ left19:08
→ nuba joined19:08
← chrismar035 left19:08
← aksnot left19:08
→ prudnikov joined19:08
← etcetera left19:10
← DoniRS left19:10
← groundup left19:10
← bitkiller left19:11
← siriuz left19:12
← oriba_ left19:12
→ groundup joined19:13
→ siriuz joined19:15
→ etcetera joined19:16
← rednaks left19:16
→ warthog9 joined19:16
→ wheezl joined19:18
→ DoniRS joined19:18
→ rednaks joined19:18
flavius cbreak: managed to do it like this: 1. read-tree 2. commit 3. reset --hard HEAD (had to do this, because read-tree leaves the working copy dirty, with deleted files) 4. git merge -s subtree <treeish>. What bothers me though is the extra merge commit. Can't it be done without it?19:19
cbreak sounds like you didn't use -u for read-tree?19:19
flavius oh, another run19:20
cbreak I saw it in the example19:20
and the man page says it updates the working dir19:20
also, if you don't want an extra merge commit19:20
how about git merge -X subtree --ammend?19:21
← revagomes left19:21
← siriuz left19:22
flavius -X subtree? you mean -s recursive -X subtree?19:22
→ OmnipotentEntity joined19:22
cbreak -s recursive is default19:22
you can still write it I guess19:22
← wheezl left19:23
← OmnipotentEntity left19:23
→ wheezl joined19:23
joephilly If someone deletes a remote branch from origin then I do a pull, will that branch disappear from my local?19:24
→ siriuz joined19:24
joephilly rather, will that reference to origin's branch disappear19:24
→ Kje10L joined19:24
grawity joephilly: no, not unless you fetch --prune or `git remote prune`19:24
joephilly dang...19:25
← momomomomo left19:25
cbreak joephilly: git is careful with losing history19:26
← DoniRS left19:26
← warthog9 left19:27
→ skystar joined19:28
flavius cbreak: merge doesn't seem to know about ammend, perhaps you meant commit?19:28
→ skystar84 joined19:28
← jkremser left19:28
cbreak right19:28
was thinking of --no-commit && git commit --amend19:28
← trusktr left19:29
flavius yeah I've figured that out. thanks cbreak it all worked19:30
→ ISF joined19:30
← hellopat left19:30
→ kit joined19:30
cbreak excellent :)19:30
→ hellopat joined19:30
← g0bl1n left19:31
cbreak so now I know what to do should I ever need that :)19:31
← traviscj left19:31
quuxman How do I do `git checkout --theirs foo/bar.java` without touching the file, and just show that in a pager?19:31
→ rakl joined19:32
← siriuz left19:32
→ rabellamy joined19:33
← tvw left19:33
flavius cbreak: yeah, and I know how to help others in here with similar problems. Win-win :)19:33
cbreak quuxman: you can use git cat-file -p if you know the commit it came from19:34
← Uniter left19:34
cbreak as in git cat-file -p COMMIT:file | less19:34
← Hounddog left19:35
→ siriuz joined19:35
→ mitz_ joined19:36
flavius cbreak: oh, ammend in the middle of a merge doesn't work19:36
← rabellamy left19:36
→ rabellamy joined19:36
← danishkhan left19:36
→ Hounddog joined19:36
cbreak hmm. ah well, then I guess you'll have to squash them later19:36
git has too many safety features lately :D19:37
← rabellamy left19:37
← khushildep left19:38
← netj left19:39
← jamesez left19:39
→ pppaul joined19:40
← pppaul left19:40
→ pppaul joined19:41
← pppaul left19:41
← Milossh left19:41
→ vedant joined19:41
← btree left19:41
→ pppaul joined19:41
← pppaul left19:41
→ pppaul joined19:42
← pppaul left19:42
← skystar left19:42
← skystar84 left19:42
← siriuz left19:42
→ netj joined19:42
← Raging_Hog left19:43
→ pppaul joined19:43
← glosoli left19:44
← mitz_ left19:44
→ siriuz joined19:45
← zenx left19:46
→ slacx joined19:46
← infynyxx left19:48
→ praxa joined19:50
→ rue92 joined19:50
← siriuz left19:52
← dhruvasagar left19:52
← anderse left19:53
→ dhruvasagar joined19:53
→ gasbakid joined19:53
→ anderse joined19:53
→ jaseemabid joined19:54
← rue92 left19:55
→ siriuz joined19:55
→ warthog9 joined19:56
← tenmilestereo left19:56
→ pantsman joined19:57
← pantsman left19:57
→ pantsman joined19:57
← rakl left19:57
→ mikef joined19:57
← netj left19:59
→ infynyxx joined19:59
→ aksnot joined19:59
← garbagecollectio left19:59
← ozette left20:00
← siriuz left20:00
→ vfr joined20:00
→ axl__ joined20:00
→ tangledhelix joined20:01
← MattStratton left20:01
→ netj joined20:02
← axl_ left20:02
axl__ → axl_20:02
← freestyler7 left20:02
← acharlieh left20:03
→ blackjack joined20:03
→ mmitchell joined20:03
← tangledhelix left20:03
→ rue92 joined20:04
→ MattStratton joined20:04
→ siriuz joined20:05
→ danishkhan joined20:07
→ acharlieh joined20:07
→ Treggats joined20:08
← khmarbaise left20:10
← maxmanders left20:10
→ mitz_ joined20:10
→ garbagecollectio joined20:11
← jjido left20:11
→ guns joined20:11
→ alegen joined20:12
← siriuz left20:13
← vfr left20:14
→ skorgon joined20:14
→ siriuz joined20:14
← danishkhan left20:15
→ chrismar035 joined20:15
← alainus left20:15
← sonda left20:16
→ maxmanders joined20:17
← eijk left20:17
← huoxito left20:17
← praxa left20:17
→ gregsmith joined20:17
← gregsmith left20:17
→ frenchlaf joined20:18
← Watabou left20:19
→ heroux joined20:21
← netj left20:21
← siriuz left20:22
→ netj joined20:22
→ siriuz joined20:24
← siriuz left20:24
→ siriuz joined20:24
← aksnot left20:24
← nioncode left20:25
← skorgon left20:26
← MattStratton left20:26
→ jast joined20:26
← netj left20:28
→ gitinfo joined20:28
ChanServ set mode: +o20:28
→ MattStratton joined20:29
← guns left20:29
← mitz_ left20:30
→ amcsi joined20:30
← taylanub left20:30
→ netj joined20:30
→ ErKa joined20:31
← MattStratton left20:31
← siriuz left20:32
→ i7c joined20:32
→ Watabou joined20:33
→ MattStratton joined20:33
← system64 left20:34
← erichynds left20:34
→ siriuz joined20:34
→ system64 joined20:34
→ guns joined20:35
← mstormo_ left20:35
← JohnBat26 left20:36
← jpcamara left20:37
→ traviscj joined20:38
← traviscj left20:38
→ traviscj joined20:39
→ buibex joined20:40
ChanServ set mode: +v20:40
→ danishkhan joined20:42
← siriuz left20:42
← danishkhan left20:42
← h0bbit left20:42
→ praxa joined20:42
← Anders_J left20:42
→ danishkhan joined20:43
← penguin1 left20:43
← AaronMT left20:43
← fsvehla left20:44
→ siriuz joined20:44
← BillCriswell left20:47
← Hounddog left20:47
→ AeroNoti1 joined20:50
→ btanaka joined20:50
← AeroNoti1 left20:50
→ tevio joined20:51
← pppaul left20:51
← AeroNotix left20:52
← siriuz left20:52
← freeed left20:53
→ siriuz joined20:54
→ thasmo joined20:54
← vpopov left20:54
← geekbri left20:55
← pantsman left20:55
← Treggats left20:55
← tevio left20:56
→ FabTG joined20:57
← MattStratton left20:57
gitinfo set mode: +v20:58
elixir Hi. If I try ssh -T [email@hidden.address] , I get an error . Read from socket failed: Connection reset by peer , stuck and cant find a solution , can someone help with this one ? thanks!20:58
→ pppaul joined20:58
← pppaul left20:58
← meLon left20:58
oakdog8 Is there a config parameter to make reflog show dates by default?20:58
→ dr34mc0d3r joined20:58
→ pppaul joined20:58
cbreak elixir: dig github.com?20:59
→ jason237 joined20:59
cbreak elixir: ping github.com?20:59
oakdog8: check out man git-log -g20:59
gitinfo oakdog8: the git-log manpage is available at http://jk.gs/git-log.html20:59
← siriuz left20:59
cbreak it has much more formating capabilities, see --pretty21:00
if you find something you like then you can make an alias for it21:00
→ Element9 joined21:00
dr34mc0d3r im new to git - is there a way to see repository file changes when there is no commit - or dose a commit have to happen in order for git to store the file ??21:00
→ thierryp joined21:00
→ guy joined21:01
← Artpicre left21:01
oakdog8 cbreak: I just want something like git reflog --date=relative to be default. I don't want all the other commit messages and such that show up in log21:01
← howlymowly left21:01
cbreak dr34mc0d3r: without a commit, git will not record the change21:01
you can see the difference between the last commit and working dir though21:02
dr34mc0d3r ok thanks cbreak21:02
guy How do I ignore all folders that contain .git? Be default, they are entirely ignored, but add as a link (or whatever else would the term be), which is really annoying in some cases21:02
cbreak or between the staged changes and working dir21:02
→ siriuz joined21:02
elixir cbreak: dig result: http://pastebin.com/N2SYyPWT21:02
grawity guy: As a submodule?21:02
elixir cbreak: and ping github.com gets me no reply !21:03
guy ya.21:03
grawity it's possible to add the contents if you use `git add dir/` instead21:03
← garbagecollectio left21:03
← netj left21:03
cbreak oakdog8: does git config log.date help?21:03
grawity (assuming it's not being tracked as a gitlink/submodule right now)21:03
FatDarrel zomg! http://stackoverflow.com/questions/2003505/how-do-i-delete-a-git-branch-both-locally-and-in-github21:03
cbreak elixir: that sounds bad.21:03
elixir: do you have internet access?21:03
elixir cbreak: http://pastebin.com/BUiqiK3r but i claim that my net connecttion is good.21:04
cbreak: yes.21:04
guy grawity: right. I am asking not how to add the content, I am asking how to completely ignore existence of any folders that contain .git21:04
→ psoo joined21:04
cbreak elixir: maybe someone blocks github.com21:04
are you in china or iran or so?21:04
guy: git can't automatically do that. you'll have to specify them in .gitignore or similar.21:04
← praxa left21:05
guy I see. Thanks21:05
elixir cbreak: any method to unblock? any what was that dig command, can u infer anything from it?21:05
→ john_anderson joined21:05
elixir cbreak: india21:05
cbreak elixir: dig is like nslookup, it queries the name server21:05
→ netj joined21:05
→ xrogaan joined21:05
cbreak but that doesn't seem to be your problem21:05
oakdog8 cbreak: no, log.date relative changes the format of the date in git-log, but git-reflog still has no date unless I pass it the flag explicitly21:05
elixir cbreak: okay, any help how to go ahead21:05
?21:05
cbreak the IP you got from ping is correct21:05
→ dkpi joined21:06
cbreak elixir: tried a VPN?21:06
like tor?21:06
https://www.torproject.org/21:06
← traviscj left21:06
cbreak you'd probably have to use https if you use tor21:06
elixir cbreak: no. previously i used to send patches like this only, might be a temp problem, i dnt think i shud use vpn21:06
← maxmanders left21:07
cbreak oakdog8: hmm :/ well, then consider using git log -g and an alias with --oneline and so on21:07
elixir cbreak: also i've never configured vpn in ubuntu, i've used it in windows21:07
cbreak oakdog8: you can control everything you want in detail with --pretty=format:...21:07
elixir: tor is rather easy to use21:07
oakdog8 cbreak: bummer. I was hoping to avoid an alias. Maybe I'll look at contributing that change21:07
cbreak at least on OS X, which is where I tried it21:07
→ traviscj joined21:07
elixir cbreak: i cant open the above link :(21:08
→ gregsmith joined21:08
cbreak sounds bad.21:08
elixir cbreak: certificate issue21:08
← acharlieh left21:08
cbreak you sure you have uncensored internet?21:08
elixir cbreak: i am in college, they block many things21:09
cbreak: so i am not in uncensored zone21:09
→ FernandoBasso joined21:09
cbreak sounds like they block github and tor too.21:09
elixir cbreak: are you sure, this is the only issue, i mean if i use vpn, it'll work ?21:09
cbreak maybe they even try to man in the middle attack you21:09
that'd explain the cert issue with torproject21:10
milki whaaat. why would a college block github -.-21:10
elixir cbreak: but i can easily open github.com21:10
cbreak I am not sure21:10
→ momomomomo joined21:10
milki elixir: what about https://github.com?21:10
elixir: check the cert too if it goes through21:10
← siriuz left21:10
elixir cbreak: github is not blocked for sure, we've been using it, milki: easily accesiible21:10
cbreak how can you open github.com if you can't even ping it?21:10
maybe some braindead admin filters ICMP :/21:10
elixir milki: didnt asked for certificate either21:11
← draginx left21:11
milki elixir: sure, CHECK the cert21:11
→ maxmanders joined21:11
elixir milki: where, no hint how to do :x21:11
→ perlstein joined21:11
milki what browser are you using?21:11
elixir chrome21:11
→ acharlieh joined21:11
← yshh left21:12
← ErKa left21:12
milki is there like a green lock in the url bar somewhere21:12
→ cehteh joined21:12
cbreak github has sha1 CE:67:99:25...21:12
→ yshh joined21:12
→ siriuz joined21:12
milki or view page info in the right click menu21:12
cbreak (why the hell are the fields in the cert viewer not copyable? firefox UI designers must be blind)21:12
← cannonball left21:13
← thierryp left21:13
→ TheMoonMaster joined21:13
← thasmo left21:14
cbreak elixir: well, my working hypothesis at the moment:21:14
← guy left21:14
cbreak your network is adminsited by idiots21:14
→ thasmo joined21:14
cbreak they block ICMP and SSH21:14
← mercwithamouth left21:14
cbreak and might be potentially MITM attacking http21:14
→ mercwithamouth joined21:14
elixir cbreak: cert. matched21:14
→ johnw joined21:14
elixir CE:67:99:25... same21:14
← irqq left21:15
← thasmo left21:15
elixir what can/should i do to submit my patch21:15
cbreak torproject.org has 1F:9D:30:6E21:15
← mercwithamouth left21:15
elixir i use terminal to push21:15
cbreak elixir: try to use git's HTTPS transport21:15
elixir torproject.org doesnt opens21:15
cbreak it's not as elegant and secure as ssh, but it should do21:15
elixir cbreak: how?21:15
cbreak to to the project page21:16
→ rakl joined21:16
cbreak it should show you the URLs of the repository21:16
you are looking for something like https://github.com/<username>/<reponame>.git21:16
elixir which page?21:16
cbreak the one of the repository you want to push to21:17
you must have an account on github21:17
→ dirte joined21:17
gitinfo set mode: +v21:17
elixir i simply push by command git push <branchname> : refs/for/master, i dont know deeper what happes :| sorry21:18
yes, i have an accnt21:18
→ nutron joined21:18
→ Davey joined21:18
cbreak that looks like gerrit syntax21:19
if you use github, you'll have to do it normally21:19
so git remote add remotename url21:19
then git push remotename branchname21:19
elixir yes its is pushed to gerrit21:19
← jcromartie left21:19
elixir okay..i'll try that . thanks21:20
cbreak you should read a git basic tutorial21:20
they should cover adding remotes and pushing21:20
← netj left21:21
cbreak you'll need to create a repository on github (or gain access to someone elses) to push too21:21
← ehsan left21:21
→ netj joined21:22
→ sgu joined21:22
← garply left21:22
← siriuz left21:22
← traviscj left21:22
← etcetera left21:23
→ ErKa joined21:24
→ hakunin_ joined21:24
← JosefAssad left21:24
→ etcetera joined21:24
← sq-one left21:24
→ tvw joined21:25
→ garply joined21:25
← elixir left21:25
→ deavidsedice joined21:26
→ Orphis_ joined21:26
→ petteyg_ joined21:26
→ siriuz joined21:26
← kit left21:26
flavius Is there a built-in way of publishing a remote's address? Google doesn't help, it gives results about the usual scenarios21:26
← hiroyuki left21:27
← hellopat left21:27
→ ghoti_ joined21:27
→ shihan_ joined21:27
FatDarrel what is the best way to back up my git repo with unfinished changes21:27
flavius FatDarrel: a new branch21:28
→ flo`_ joined21:28
← doener left21:28
→ ewanm89_ joined21:28
→ electrog1ek joined21:28
→ a___ joined21:28
→ michel_v_ joined21:28
→ sirdancealo2 joined21:28
→ borior_ joined21:28
← borior_ left21:28
→ borior_ joined21:28
→ pigeon_ joined21:28
→ plasticb1y joined21:28
→ Nickeeh_ joined21:28
flavius FatDarrel: you can use merge --squash afterwards, no extra commits would be visible21:28
← micky62g left21:28
→ knitt1 joined21:28
→ Odd_Blok1 joined21:28
→ tonyj joined21:29
→ comps_ joined21:29
→ JakePee_ joined21:29
→ kevc_ joined21:29
flavius of course, also push the new branch, to really have a back up: git push origin backup21:29
→ dsantiag_ joined21:29
← samuel02 left21:29
← Davey left21:29
→ elixir joined21:29
← etcetera left21:30
→ samuel02 joined21:30
← Laurenceb_ left21:30
cbreak flavius: git has no publishing capabilities21:30
← netj left21:30
→ s00pcan_ joined21:31
→ MrRoot joined21:31
← samuel02 left21:31
→ samuel02_ joined21:31
→ kennethreitz_ joined21:32
→ JrCs joined21:32
← psoo left21:32
gitinfo set mode: +v21:32
→ alip_ joined21:32
→ iiivvvooo joined21:32
elixir cbreak milki: i just noticed even ping google.com also doent give me any respons, while i can very well access it via browser, what is the problem, i cnat figure out.21:32
→ Seveaz joined21:32
→ dozymoe joined21:32
→ Alenah joined21:32
→ tr4656_ joined21:32
→ ajpiano_ joined21:32
→ RobertLaptop joined21:32
→ sb- joined21:32
→ Maelstrom joined21:32
→ plaisn joined21:32
→ averell_ joined21:32
sgu Hi all, when I use git status, I can see files under "changes not staged for commit". I want to add all those changes(but not the untracked files), so I use "git add -u". But nothing happens. Any clue what is missing or goes wrong?21:32
→ netj joined21:32
cbreak elixir: as I said above21:32
← ghoti_ left21:32
← siriuz left21:32
← jason237 left21:32
→ aguynamedben_ joined21:32
cbreak probably idiot admins that block ssh and icmp21:32
elixir ohh..21:33
this is sad...21:33
← Katafalkas left21:33
ajpiano_ → ajpiano21:33
ewanm89_ → Cap_J_L_Picard21:33
alip_ → alip21:33
borior_ → borior21:33
Seveaz → Seveas21:33
milki its not idiotic to block ssh -.-21:33
cbreak milki: very idiotic :)21:33
→ ghoti_ joined21:33
milki it prevents me from wasting time on irc21:33
:o21:33
→ mitz_ joined21:33
cbreak obviously.21:34
cbreak is chatting via ssl21:34
milki oo, nice21:34
jaequery lets say i cloned a project from github, and now i want to put that project into my own github but also have option to update from the original project's github. is this possible?21:34
juvenal → juvenal_away21:34
milki thats called forking in github terms21:34
jaequery: https://help.github.com/articles/fork-a-repo21:35
→ SirCmpwn joined21:35
jaequery its already forked21:35
← samuel02_ left21:35
milki did you read the rest of the page?21:35
jaequery now how can i pull in updates fromt he original repo?21:35
cbreak jaequery: you can add multiple remotes to your local repo21:35
milki jaequery: try reading step 321:36
→ samuel02 joined21:36
← vedant left21:36
jaequery ah gotdcha21:36
thank you guys21:36
→ daniel_- joined21:37
← lacrymology left21:37
→ siriuz joined21:37
daniel_- → Guest3157921:37
→ etcetera joined21:37
← thelodger left21:38
→ hwrd|work joined21:38
→ chrisdev joined21:39
← anderse left21:39
→ bjornars joined21:39
→ hesco joined21:39
→ srcerer_ joined21:39
← newbie999 left21:39
← buibex left21:40
→ imMute joined21:40
→ _ikke_ joined21:40
→ rking joined21:40
← samuel02 left21:41
← Dougie187 left21:41
→ lonewulf` joined21:41
← siriuz left21:41
→ quadz joined21:41
→ prismatictrail joined21:41
→ poohtarou joined21:41
→ w0m_ joined21:41
FatDarrel flavius: so i would do git push backup?21:41
← ldlework left21:42
→ p3lim_ joined21:42
← p3lim left21:42
flavius FatDarrel: yeah21:42
→ sontek joined21:42
srcerer_ → srcerer21:42
FatDarrel so do git push origin backup and then when I want o merge to master?21:42
← ErKa left21:43
→ eth00 joined21:43
← bmac left21:43
← mitz_ left21:43
← fooey left21:43
flavius git checkout master; git merge --squash --no-commit origin/backup21:43
FatDarrel i see21:43
flavius I think you won't need --no-commit though21:43
→ yibe_ joined21:43
→ ldlework joined21:45
→ techlife joined21:45
← techlife left21:45
← netj left21:45
← Guest31579 left21:45
→ jonmasters_ joined21:45
→ techlife joined21:45
← techlife left21:45
→ enex joined21:45
← trungqtran left21:46
→ techlife joined21:46
← techlife left21:46
→ techlife joined21:46
← techlife left21:46
→ techlife joined21:47
← techlife left21:47
← ghoti_ left21:47
← elixir left21:47
→ techlife joined21:48
← techlife left21:48
→ tabakhase_ joined21:48
→ ghoti joined21:48
→ techlife joined21:48
← techlife left21:48
← chrismar035 left21:48
→ elixir joined21:48
→ khushildep joined21:48
→ techlife joined21:49
← techlife left21:49
→ netj joined21:49
→ siriuz joined21:49
← boffo left21:49
→ trungqtran joined21:49
← sgu left21:49
→ techlife joined21:49
← techlife left21:49
← gasbakid left21:49
→ techlife joined21:50
← techlife left21:50
← revyd left21:50
← rednaks left21:50
→ techlife joined21:50
← techlife left21:50
→ rednaks joined21:51
← mikef left21:51
→ techlife joined21:51
← techlife left21:51
← nkr left21:51
→ techlife joined21:52
→ BadQuanta joined21:52
← ghoti left21:52
→ ghoti joined21:53
← tinti left21:53
← elixir left21:54
→ thasmo joined21:54
→ Katafalkas joined21:54
← trungqtran left21:54
→ ojacobson joined21:54
→ elixir joined21:54
← rue left21:54
→ rue joined21:55
gitinfo set mode: +v21:55
comps_ → comps21:55
← maxmanders left21:57
← siriuz left21:57
← hobodave left21:57
→ p3lim joined21:57
← acharlieh left21:57
← flavius left21:57
→ Davey joined21:58
← dr34mc0d3r left21:58
← luksaur left21:58
← sente left21:59
← nielsbusch left22:00
← p3lim_ left22:00
→ mitz_ joined22:01
→ p3lim_ joined22:01
← MrRoot left22:01
→ anderse joined22:02
→ daniel_-` joined22:02
→ p3lim__ joined22:02
→ siriuz joined22:03
← kermit left22:03
→ sente joined22:03
← netj left22:03
← breakingthings left22:03
← BBonifield left22:04
← oakdog8 left22:04
→ mmitchel_ joined22:04
← mmitchell left22:04
← p3lim left22:04
→ traviscj joined22:05
→ kermit joined22:05
← daniel_-` left22:05
← anderse left22:05
← mmitchel_ left22:05
→ ErKa joined22:06
← p3lim_ left22:06
→ netj joined22:06
← gregsmith left22:06
← rue92 left22:07
← siriuz left22:07
← john2496 left22:08
← traviscj left22:09
→ revyd joined22:09
← jast left22:11
→ madewokherd joined22:11
← chuckharmston left22:11
→ davidh joined22:12
→ siriuz joined22:12
← etcetera left22:13
← R1KRDO left22:13
← elixir left22:14
← TeckniX left22:14
← ThePawnBreak left22:14
← infynyxx left22:14
← wheezl left22:15
→ BBonifield joined22:15
→ Adlai joined22:15
← lonewulf` left22:15
← pppaul left22:15
← tvw left22:16
→ wheezl joined22:16
→ gregsmith joined22:16
→ elixir joined22:17
← gitinfo left22:17
← b1rkh0ff left22:17
← elixir left22:17
← siriuz left22:17
→ jaseg joined22:18
→ jast joined22:18
baba when i am doing git add demo.txt it's giving fatal: pathspec 'demo.txt' did not match any files as error.22:18
← goshawk left22:18
cbreak sounds like you do not have a demo.txt22:18
baba cbreak: but here i am adding demo.txt22:19
ChanServ set mode: +v22:19
→ gitinfo joined22:19
ChanServ set mode: +o22:19
← revyd left22:19
cbreak you can only add things you have22:19
milki adds baba's passwd22:20
→ revyd joined22:20
baba milki: my passwd :P22:20
cbreak: can't get you . then what if i want to create a demo.txt file ?22:21
→ acharlieh joined22:21
→ revyd_ joined22:21
→ elixir joined22:22
cbreak baba: use a text editor22:22
or touch22:22
or what ever22:22
→ hsn joined22:22
→ siriuz joined22:22
← revyd left22:22
cbreak baba: how do you create text files normally?22:22
baba ok than after git add will add that file ..22:22
because i am following pro GIT in it they have not mentioned about creating files they have directly gone through adding files.22:22
hsn i need something like git diff for 2 branches which lists commits instead of diff22:23
← thasmo left22:23
baba on the first page of chapter 2 itself.22:23
cbreak they assume the files already exist22:23
baba yeah22:23
cbreak hsn: git log22:23
hsn: see man gitrevision22:23
hsn: see man gitrevisions22:23
gitinfo hsn: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html22:23
cbreak something like git log a..b, git log b..a or git log a...b, depending on what you want to see22:24
→ zastern joined22:24
← jonatasnona left22:25
→ revagomes joined22:25
→ alvaro_o joined22:25
← Wulf left22:26
hsn why i have after git reset --hard still changed files in git status?22:26
milki what commit did you reset to?22:26
→ AdrienBrault joined22:26
→ CareBear\ joined22:26
← elixir left22:27
→ hiroyuki joined22:27
← siriuz left22:27
milki hm, looks like it defaults to HEAD22:27
milki tries to think of what might have happened22:28
→ rockets joined22:28
← Element9 left22:29
← p3lim__ left22:29
→ elixir joined22:29
→ p3lim joined22:29
← p3lim left22:29
cbreak file system permissions, open files, weird corruption, ...22:30
← zastern left22:30
hsn git fsck reports just dangling blobs22:31
milki thats normal22:31
→ siriuz joined22:31
→ garbagecollectio joined22:31
arnej hsn: Are these changed or not tracked files?22:32
← avinashrbhat left22:32
→ traviscj joined22:32
← khushildep left22:33
← axl_ left22:33
hsn http://pastebin.ca/235414922:33
← system64 left22:34
← shel3over left22:34
→ avinashrbhat joined22:35
→ rideh joined22:35
← v0n left22:36
← m0ltar left22:37
← siriuz left22:38
→ Milossh joined22:38
→ pppaul joined22:38
← sirdancealo2 left22:39
→ bmac joined22:39
→ pastime joined22:39
→ etcetera joined22:39
→ SBoudrias joined22:39
arnej That should not happen...22:41
← elixir left22:41
→ elixir joined22:42
← elixir left22:42
→ siriuz joined22:43
← Davey left22:43
arnej hsn: Do you know what was unchanged before reset?22:44
→ Davey joined22:45
milki hsn: what does git ls-files -v say for that file?22:45
→ infynyxx joined22:45
← pastime left22:45
→ Schrostfutz joined22:45
← cbot__ left22:47
Schrostfutz hi. im developing a project and publish it via github while documenting it on my blog. now i forgot to remove my real name at the class files. is there a way of changing it to my nickname in the first commit so the original version doesnt appear in git anymore?22:47
juvenal_away → juvenal22:47
→ Octalot joined22:47
← siriuz left22:47
cbreak Schrostfutz: man git-filter-branch22:48
gitinfo Schrostfutz: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html22:48
cbreak look at the env filter22:48
then force push22:48
(if you pushed already)22:48
Schrostfutz thanks, i will read that22:48
cbreak oh, if the name is inside the files, then you'll need a tree filter22:48
→ R1KRDO joined22:48
cbreak something with sed or awk maybe22:48
grawity interesting, I've seen many people put their real names in commits even if they're almost always known by the nickname22:48
cbreak or what ever scripting language you want22:48
→ hsn_ joined22:49
cbreak grawity: at work I do it because it's the rule22:49
Schrostfutz yeah its as a comment in the files itself.22:49
← lasers left22:49
→ breakingthings joined22:49
→ aflag joined22:49
→ simesy joined22:50
← bmac left22:51
← cjz left22:51
← hsn left22:51
→ astroo- joined22:51
← momomomomo left22:51
→ elixir joined22:52
← mezner left22:52
← hsn_ left22:52
→ siriuz joined22:52
→ hsn joined22:52
← traviscj left22:53
hsn git ls-files says H22:53
← rednaks left22:53
← elixir left22:54
→ elixir joined22:54
← infynyxx left22:54
← hiroyuki left22:54
← eletuchy left22:54
← pppaul left22:55
← gregsmith left22:55
→ eletuchy joined22:55
← elixir left22:56
→ elixir joined22:56
← siriuz left22:57
→ miso1337 joined22:58
← _iron left22:59
← acharlieh left22:59
← eletuchy left22:59
← garbagecollectio left23:00
→ Bosox20051 joined23:00
← dreiss left23:00
→ siriuz joined23:01
← thl0 left23:01
← nardev left23:02
→ tinti joined23:02
← frenchlaf left23:03
→ daniel_- joined23:04
daniel_- → Guest1737723:04
← etcetera left23:04
→ mklappstuhl joined23:05
← mikehaas763 left23:05
hsn git version 1.8.1.323:05
→ traviscj joined23:07
→ diegoviola joined23:07
← revagomes left23:07
← traviscj left23:07
→ alunduil joined23:08
← siriuz left23:08
→ AaronMT joined23:09
→ Areckx joined23:10
→ huoxito joined23:10
→ garbagecollectio joined23:11
← FernandoBasso left23:11
← lolmaus left23:11
→ pur3forlyphe joined23:11
Areckx I added files to a repo that I created on github after git clone but when I git add . and git commit the github is still saying it only has 1 commit, I tried git push but it says The requested URL returned error: 403 while accessing https://github.com/areckx/learning.git/info/refs23:12
→ siriuz joined23:12
r0bby_ → robbyoconnor23:12
→ meLon joined23:12
← guns left23:15
← Areckx left23:15
→ dreiss joined23:15
→ eletuchy joined23:16
← blackjack left23:16
← miso1337 left23:16
← siriuz left23:16
← meLon left23:18
milki hsn: huh, i wouldnt expect it to be H and still show changed in status23:18
somethign wierd is going on23:18
← Guest17377 left23:18
→ Squarism joined23:19
← redrocket left23:20
→ siriuz joined23:20
→ chuckharmston joined23:22
→ redrocket joined23:22
→ sirdancealo2 joined23:23
→ Chryyz joined23:23
← danman left23:23
→ mtlatif joined23:23
→ digitalfiz joined23:23
→ etcetera joined23:24
yac http://stevelosh.com/blog/2013/04/git-koans/ any idea what this does have to do wtih koans?23:24
← rockets left23:25
← simesy left23:25
← AnimeCYC left23:26
grawity http://en.wikipedia.org/wiki/Hacker_koan23:27
→ w09x joined23:27
← chuckharmston left23:27
← siriuz left23:28
→ frenchlaf joined23:28
← garbagecollectio left23:28
→ simesy joined23:29
← simesy left23:29
← redrocket left23:30
→ pastime joined23:30
→ siriuz joined23:31
← prudnikov left23:32
← Davey left23:32
← jaseemabid left23:33
→ fuzzybunny69y joined23:35
← wesside_ left23:35
← jperry2_ left23:35
← NiteRain left23:35
→ engkur joined23:36
← siriuz left23:36
← holodoc left23:36
← wheezl left23:37
← R1KRDO left23:37
→ prudnikov joined23:37
← engkur left23:38
→ MattStratton joined23:38
→ ChrisAnn joined23:38
slacx I think that blog is poking at gits interface23:38
→ wheezl joined23:38
→ engkur joined23:38
← normanrichards left23:39
→ siriuz joined23:39
← pastime left23:40
← sirdancealo2 left23:42
→ Yakko_ joined23:42
← MattStratton left23:42
→ rjcarr joined23:43
→ MattStratton joined23:44
→ Andromeda joined23:44
← rjcarr left23:45
← Yakko left23:45
hsn if i rm that file and then git reset --hard, changes are back23:45
→ rjcarr joined23:45
→ Andromed_ joined23:45
← Andromed_ left23:46
→ trusktr joined23:46
← siriuz left23:48
→ Andromed_ joined23:49
← Andromeda left23:49
→ sirdancealot joined23:49
gitinfo set mode: +v23:49
→ siriuz joined23:50
rjcarr Getting "Cannot send to channel" or unable to change nick? /msg Eugene for help23:50
(sorry about that)23:50
I accidentally rm -rf'd the root of my git working directory (don't judge me!) but .git is still there … any way to recover my uncommitted changes?23:50
breakingthings good jorb23:51
what happens if you call git23:51
→ Andromeda joined23:51
→ Noldorin joined23:51
→ NimeshNeema joined23:51
rjcarr breakingthings: are you asking me? not sure what you mean by "call git"23:51
breakingthings rjcarr: eg git status23:52
rjcarr breakingthings: it says I have a few changes to be committed and then a bunch of deleted files23:52
breakingthings so your repo should be fine23:53
git checkout -- .23:53
will undelete all the things23:53
rjcarr breakingthings: perfect, thanks so much!23:53
breakingthings np23:53
← Andromeda left23:54
← Andromed_ left23:55
→ pastime joined23:56
← amcsi left23:56
← siriuz left23:58
← hsn left23:59

Logs Search ←Prev date Next date→ Channels Documentation