IRCloggy #git 2014-03-05

Logs Search ←Prev date Next date→ Channels Documentation

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

2014-03-05

→ Balliad joined00:00
← Gavrisimo left00:00
→ Droolio joined00:00
→ johnkevinmbasco joined00:00
← Exancillatus left00:00
→ Dreadnaught joined00:01
← Dreadnaught left00:01
→ Dreadnaught joined00:01
← ntio left00:01
→ Gavrisimo joined00:02
← chrisshattuck left00:03
← robbyoconnor left00:04
→ northfurr joined00:04
← northfurr left00:04
→ northfurr joined00:04
← Not_Whatever left00:04
← thiago left00:04
← rbartos left00:04
→ thiago joined00:04
← Gavrisimo left00:06
← harish_ left00:06
→ mizu_no_oto joined00:07
→ hahuang61 joined00:08
→ rbartos joined00:08
→ leeN joined00:08
→ srji joined00:08
← thiago left00:09
→ thiago joined00:10
→ ncthom91 joined00:10
← hahuang65 left00:11
← srji_ left00:12
← ncthom91_ left00:14
→ RichardJ joined00:14
→ rchavik joined00:14
→ fauxtoniche joined00:15
→ Kayra joined00:15
→ ben_alman joined00:15
← jaequery left00:15
← fauxtoniche left00:15
→ treaki__ joined00:16
← Kayra left00:16
→ tokik joined00:16
← mrpink left00:17
→ jatt joined00:17
← cfoch left00:17
← jatt left00:17
→ jatt joined00:17
← treaki_ left00:17
→ Kayra joined00:18
→ nszceta joined00:18
→ misterpink joined00:19
← ben_alman left00:19
→ nick108_ joined00:20
← wongon left00:20
→ mellernoia joined00:20
→ kcj joined00:21
← lolmaus left00:21
← noxd left00:21
← dagnachew left00:21
← Balliad left00:21
→ dagnachew joined00:22
← o9 left00:22
→ john2x joined00:22
← nick108 left00:23
← FatDarrel left00:24
→ jaequery joined00:25
← tplaner left00:26
→ ben_alman joined00:26
→ btree joined00:27
← hyperair left00:27
← merica left00:28
→ lindenle_ joined00:28
← ben_alman left00:30
← btree_ left00:31
→ infynyxx joined00:31
← maestrojed left00:31
hfp Hey, so I have a git repo. And I created another repo for a complete overhaul of the project. Now I would like to merge this new git repo into the complete_overhaul branch from the original repo. Is there a way to do that at all?00:31
← n-st left00:32
frogonwheels hfp: sure00:32
→ reskp joined00:33
frogonwheels hfp: Presumably you started the 'overhaul' repo from a clone of the original?00:33
hfp frogonwheels: No, that's what makes it tricky00:34
frogonwheels: the overhaul was basically `rm -rf *`00:34
frogonwheels hfp: well that was (imho) a little strange... Do you know which point you deperated the overhaul from the original?00:34
← Orbitrix left00:35
Hello71 if you don't care about history00:35
hfp frogonwheels: Well, I started over from scratch, i didn't reuse anything from the original version for the overhaul00:35
frogonwheels hfp: You can just push it up to the project -there's nothing that says you have to have just one initial commit in your repo00:35
Hello71 hm... that might actually work00:35
→ Exancillatus joined00:35
→ Sabbath joined00:35
Hello71 git push origin master:complete_overhaul00:35
← lithiumjake left00:35
frogonwheels hfp: this is one of those cases where it is not unreasonable to have them co-exisiting.00:36
→ pwnz0r joined00:36
hfp frogonwheels: How do you mean? Two separate repos?00:36
frogonwheels hfp: what I'm saying is that yo ucan have two separate trees in the one repo00:37
hfp: in practice it would be silly to put 2 unrelated trees in the same upstream repo, but this is one of those cases where it makes sense.00:37
← AaronMT left00:37
hfp frogonwheels: Hmmm... So how would I do that? Clone the original project from bitbucket, replace all files and push it back?00:37
← reskp left00:38
frogonwheels hfp: if you want to start doing merges and stuff - I'm not sure of the point00:38
← koda left00:38
← infynyxx left00:38
frogonwheels hfp: just set the bitbucket as upstream and push it up. It all depends on the circumstances. Possibly some more information?00:38
→ woollyams joined00:39
frogonwheels hfp: Why does it need to be in the same repo?00:39
→ Orbitrix joined00:39
← Orbitrix left00:39
tgummere` → tgummerer00:39
← lindenle_ left00:39
← nick108_ left00:39
→ Orbitrix joined00:39
← Orbitrix left00:39
→ Orbitrix joined00:40
hfp I have it up on a private repo on bitbucket. In my overhaul, I have two branches, one is for design_a and the other for design_b. I would somehow like to keep all of this in the same repo because they all belong to the same project. It's more like there was a v1.0 and now there is a v2.000:40
^ frogonwheels00:40
frogonwheels hfp: Do you need any interaction between the old and the new?00:40
hfp frogonwheels: No00:41
→ ehmatthes joined00:41
→ mikepack_ joined00:42
← jatt left00:42
← _xyro left00:42
→ sluther joined00:42
← joelroa left00:42
frogonwheels hfp: so just set the bitbucket repo as a remote on the new repo, and push up your new branch00:42
← Zaknefain left00:43
frogonwheels hfp: you might want to rename it locally first.00:43
← pfg left00:43
→ Zaknefain joined00:43
frogonwheels hfp: technically there's nothing wrong with having 'master' locally as 'overhaul' remotely, but in practice it gets confusing00:43
← robarelli left00:44
→ ivan\ joined00:44
frogonwheels hfp: in fact the handling of that kind of situation has improved dramatically over the last couple of year00:44
hfp frogonwheels: I'm confused, master on bitbucket isn't the same master as locally00:44
frogonwheels s00:44
hfp: master is just a name. If you want clarity, rename your master locally to 'overhaul' or whatever, and push it up.00:45
hfp frogonwheels: Ok let me try that00:45
frogonwheels This is how you would have local and remote as different names (possibly with -u ) <Hello71> git push origin master:complete_overhaul00:45
hfp: but I would suggest that it's unnecesarily confusing.00:46
← Exancillatus left00:46
← mikepack_ left00:47
← woollyams left00:47
← Orbitrix left00:47
← Zaknefain left00:48
← budrose left00:48
← Kayra left00:49
→ lolmaus joined00:49
→ woollyams joined00:50
← specious left00:50
← kcj left00:50
← bwreilly left00:50
← polyzen left00:51
← rbartos left00:52
← nZac left00:52
→ ntio joined00:53
ntio hi, how do I make git diff wrap lines?00:53
→ Orbitrix joined00:53
← Orbitrix left00:54
frogonwheels ntio: it should afaik. are you piping it ?00:54
ntio nope00:54
→ Orbitrix joined00:54
ntio ok, solved00:54
GIT_PAGER='' git diff00:54
not sure what it does though!00:54
frogonwheels ntio: do you know what a 'pager' is?00:55
!pager00:55
worth a try00:55
Hello71 !less00:55
gitinfo [!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach00:55
Hello71 hm, no00:55
!more00:55
darn.00:55
frogonwheels ntio: The system PAGER is the 'more' program (or 'less') that is used for piping output to by default.00:55
← drodger left00:55
frogonwheels ntio: GIT_PAGER='' git diff runs git diff with no pager.00:56
ntio makes sense! It's probably OSX which messes things up00:56
as always00:56
frogonwheels ntio: you could try using 'less' as a pager if you have it.00:56
ntio: (less is more, in case you didn't know)00:57
→ joelroa joined00:57
ntio Yup :)00:57
oh, nice!00:58
→ drodger joined00:58
ntio This works perfectly, now everything is not thrown at me at once00:58
← SocalNick left00:58
frogonwheels ntio: you might want to use the option that doesn't invoke paging if there's less than a page00:58
→ cads joined00:58
← johnkevinmbasco left00:59
ntio Trust me, my diffs are huge00:59
← xsbeats left00:59
Vampire0 That should be gits default behaviour, using less with options FRSX00:59
frogonwheels ntio: yeah but pager is used for more than diffs00:59
Vampire0: thanks00:59
ntio wait01:00
actually when I use less, it's not wrapped again!01:00
uhh01:00
frogonwheels ntio: use a better terminal?01:00
→ mrhooray joined01:00
← scelis left01:00
← mikecmpbll left01:00
Vampire0 That's not a matter of terminal01:01
frogonwheels ntio: ahh.. remove -S01:01
ntio: read the manpage01:01
Vampire0 As I said, git by default uses less with FRSX01:01
frogonwheels ntio: less -FRX01:01
for the default01:01
Vampire0 One of those options prevents linebreak01:01
frogonwheels yeah, it's S01:01
Vampire0 read man git config01:01
gitinfo the git-config manpage is available at http://jk.gs/git-config.html01:01
Vampire0 and search for LESS01:01
→ enigmus joined01:01
Vampire0 It will explain how to get rid of one of those options if you don't want to have them ntio01:02
ntio Got it! Thank you guys01:02
frogonwheels Vampire0: ++01:02
← mrhooray left01:02
→ mrhooray joined01:02
← becks__ left01:04
→ recycle joined01:04
← mrhooray left01:04
← mizu_no_oto left01:05
← not_a_guest left01:07
← robustus left01:08
← vu left01:08
← ehmatthes left01:08
← dmarkham left01:09
→ robustus joined01:11
→ xsbeats joined01:12
← axl_ left01:13
→ rbartos joined01:16
→ Kayra joined01:17
← freestyl3r left01:18
← blackmesa left01:19
→ freestyl3r joined01:19
← gnugnu8_ left01:21
→ codeFiend joined01:22
→ Zaknefain joined01:24
→ not_a_guest joined01:25
← ErKa left01:25
→ robbyoconnor joined01:26
→ ben_alman joined01:26
← beyondcreed_ left01:26
← rchavik left01:26
→ nZac joined01:28
→ harish_ joined01:28
← Zaknefain left01:28
→ hyperair joined01:29
← godgodgodgo left01:29
← xsbeats left01:30
← ben_alman left01:30
→ mvensky joined01:30
← hahuang61 left01:31
→ fairuz joined01:31
→ Dougie187 joined01:34
→ scelis joined01:34
→ sohail joined01:35
← sohail left01:35
→ sohail joined01:35
← nZac left01:36
→ mizu_no_oto joined01:36
← Bombe left01:36
← dort left01:36
→ Wulf joined01:39
Wulf hi01:40
→ koell joined01:40
Wulf a git repo is owned by some user account. Can I somehow keep root from messing with the repo?01:41
→ lindenle_ joined01:42
← shruggar left01:42
ojacobson can you keep root from writing to any other files on the filesystem?01:43
Wulf ojacobson: no, but that's not the question01:44
→ zumba_addict joined01:44
ojacobson Wulf: it is, however, the answer01:44
Wulf no01:44
ojacobson git, whenever you're not actually running a `git` subcommand, is just files01:44
→ ErKa joined01:45
← multi_io left01:45
← Kayra left01:45
ojacobson (those files aren't even terribly complex; you could probably reimplement git's internals on a case of soda)01:45
Wulf okay, root is using the git command. Can the git command check if the acting user is root and refuse to do anything?01:45
→ dort joined01:45
← SilverBln left01:45
ojacobson Why would that matter? It would be trivial to remove that check.01:45
Wulf that would be okay01:45
ojacobson Which root can do, because root controls the entire computer.01:45
Wulf just got some users who use the root account01:46
ojacobson Why do people run so many things as root that this is even an issue?01:46
→ SilverBln joined01:46
Wulf historical reasons, trying to fix it01:46
ojacobson Restricting root's access is actually not a crazy idea, but it's not practical for *git* to do that. You'd have to run git on an OS with a more granular permissions system.01:46
← luxgeek left01:46
ojacobson On unix and linux, using sudo when and only when you need root is a better compromise, I think01:46
→ multi_io joined01:46
flazz_gone → flazz01:46
ojacobson being logged in as root on a regular basis is a major ops red flag :)01:46
→ noisewaterphd_ joined01:47
flazz → flazz_gone01:47
← scarabx left01:47
← scelis left01:48
→ Bombe joined01:48
← jaequery left01:49
← ErKa left01:49
Vampire0 ojacobson, I don't think Wulf thinks different because you are completely right. But often this is not easily fixable, I've seen enough similar situations01:50
Wulf right now I can't control logins as root01:51
people login as root out of convenience01:51
← mizu_no_oto left01:52
ojacobson Vampire0: likely so01:52
talking about the underlying theory of *why* git can't do what he wants is hopefully more useful than simply telling him "no"01:52
← kballou left01:53
Wulf ojacobson: you didn't yet tell me why it can't do it ;-)01:53
I understand that git can't ultimately *enforce* it01:53
ojacobson It can't do it because there's no point01:53
total waste of developer time01:53
Wulf well, there might be workarounds01:53
ojacobson if you think it should make an effort anyways, I'm sure the mailing list would love to review your patch :)01:54
Wulf haha ;)01:54
ojacobson You might get more traction with a patch that introduced a "don't run this as root, you moron" advice01:54
← zackiv31 left01:54
Wulf e.g. is it right that I can't add git aliases for existing commands?01:54
ojacobson (man git-config has a list of other advices)01:54
gitinfo the git-config manpage is available at http://jk.gs/git-config.html01:54
← sohail left01:55
← thiago left01:55
← dort left01:56
← lifelike left01:57
→ mizu_no_oto joined01:57
→ bwreilly joined01:57
→ lifelike joined01:57
← ncthom91 left01:58
→ cfoch joined01:58
← robbyoconnor left01:58
→ robbyoconnor joined01:58
Vampire0 Wulf, actually it is quite easy to prevent root from committing02:00
But only as a reminder of course, it costs root only a second to work-around it02:01
Just add the following to a pre-commit hook:02:01
Wulf Vampire0: really? how?02:01
Vampire0 if [ "x$USER" == "xroot" ]; then echo "Go away root and come back as user"; exit 1; fi02:01
← bwreilly left02:01
→ luc_ joined02:01
Vampire0 At least that works for one repository02:02
→ robarelli joined02:02
Wulf thanks, will look into it. Never worked with hook before02:02
→ daito joined02:02
→ danman joined02:03
→ FabTG joined02:03
flazz_gone → flazz02:03
← woollyams left02:04
flazz → flazz_gone02:04
→ bwreilly joined02:04
← robbyoconnor left02:05
flazz_gone → flazz02:05
→ woollyams joined02:05
→ DolpheenDream joined02:07
Vampire0 yw02:08
← fairuz left02:08
→ fairuz joined02:08
→ scarabx joined02:09
← codeFiend left02:09
← woollyams left02:10
→ dzho joined02:10
→ sohail joined02:10
← sohail left02:10
→ sohail joined02:10
← CodeShark left02:10
← nfk left02:12
→ weiyang joined02:12
→ dhilipsiva joined02:13
← teran left02:15
→ tmcmahon joined02:16
← knownasilya left02:16
→ ErKa joined02:17
← koglinjg left02:17
→ Zaknefain joined02:18
→ jeek joined02:18
→ Vampire0_ joined02:18
← cfoch left02:19
→ Dougie2187 joined02:19
← sdouglas_ left02:20
→ sdouglas joined02:20
→ wongon joined02:20
← Vampire0 left02:22
→ buffal0 joined02:22
← Zaknefain left02:22
→ Annak joined02:22
gitinfo set mode: +v02:22
→ TylerE joined02:23
← multi_io left02:23
← SilverBln left02:23
TylerE Need advise on a workflow. Have working tree on local machine and remote (Which is actually a VM on the local machine). I push and pull from both sides. IDE on local also pushes to the remote end02:23
→ SilverBln joined02:23
TylerE How can I do a pull on the remote end and have it "force success"02:23
e.g. ignore "untracked files" (which will still be there because they'll be in the pull)02:24
(and no, the answer isn't to turn off uploads in my IDE)02:24
← tokik left02:24
flazz → flazz_gone02:24
flazz_gone → flazz02:24
← Diemuzi left02:24
ojacobson nil02:25
→ multi_io joined02:25
ojacobson git will blankly refuse to check out a commit or initiate a merge if that would overwrite uncommited changes or untracked files; such an operation would destroy data02:25
← wongon left02:25
ojacobson even if in some edge cases that data is safe to destroy, in the general case it's not02:25
← recycle left02:25
ojacobson you can obliterate the uncommitted changes yourself, obviously, or commit them first02:25
TylerE yea, but I want some way to do it automatically02:26
← ntio left02:26
TylerE basically the remote site doesn't matter, except when I explicitly do a commit-and-push02:26
(basically when I have files created by a CLI util on the remote side that I need to pull back into my dev copy)02:26
I mean, I can do a stash each time but it's a PITA02:26
Annak → Diemuzi02:27
→ bobdobbs joined02:28
bobdobbs hey guys. I'm coding in sass. my sass and css are under version control. I've got a branch called 'colours'. I've been hacking my colour scheme in that branch.02:29
→ recycle joined02:29
bobdobbs at the moment 'colours' and 'master' are in obviously different states.02:30
If I switch between these branches, my site look obviously different. I want to use the version of my sass that is in 'colours'02:30
→ NBhosting joined02:30
bobdobbs but if I switch to 'master' and do 'merge colours', git tells me "nothing to commit (working directory clean)"02:31
← lindenle left02:31
ojacobson Can you !repro the command, and the output of !lol ?02:31
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.02:31
A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all02:31
→ lindenle joined02:32
← yhager left02:32
bobdobbs from master: http://hastebin.com/repufunuhu.vbs02:32
← bwreilly left02:32
← axsuul left02:32
← recycle left02:33
→ axsuul joined02:33
fairuz Looks like you already merged colours02:33
bobdobbs ojacobson: which command do you mean?02:33
← oskarkv left02:33
ojacobson !lol02:34
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all02:34
→ rchavik joined02:34
ojacobson but skip it02:34
line one of your hastebin post has a bit of a dead giveaway in it02:34
→ reskp joined02:34
← lindenle left02:35
→ Goplat joined02:35
← _ikke_ left02:35
→ joemcgill joined02:35
→ yhager joined02:35
bobdobbs ojacobson: is that a record of a merge taking place?02:36
ojacobson it is.02:36
→ _ikke_ joined02:36
→ ben_alman joined02:36
bobdobbs so how can I figure out what went wrong with that merge?02:37
techfilmer → ^s02:37
bobdobbs or even better, how do I merge the code from 'colours' into master?\02:37
← sohail left02:38
← pwnz0r left02:38
← reskp left02:39
← fairuz left02:40
← jorn left02:40
→ sohail joined02:40
← buffal0 left02:40
→ dreiss joined02:41
bobdobbs actually, I think I figured it out. I'll just switch to the colours branch, copy the file, switch to master and paste.02:41
← mvensky left02:41
bobdobbs I'm sure that that's an ugly solution. but I reckon it'll work02:41
→ fairuz joined02:41
→ thiago_ joined02:42
← fairuz left02:42
→ fairuz joined02:42
← ben_alman left02:42
← rbartos left02:43
← ErKa left02:44
→ Exancillatus joined02:44
→ thiago__ joined02:45
← thiago__ left02:46
→ monokrome joined02:46
→ thiago__ joined02:46
← thiago_ left02:46
thiago__ → thiago02:47
← dougsland left02:47
← unixpro1970 left02:48
→ chrisshattuck joined02:48
^s → should02:48
← Samual left02:48
← Exancillatus left02:49
→ lindenle joined02:49
→ Gamecubic joined02:50
→ robbyoconnor joined02:50
→ nadirvardar joined02:51
← ojacobson left02:51
← madewokherd left02:52
← joemcgill left02:53
→ ehmatthes joined02:54
→ Samual joined02:55
→ tokik joined02:55
← freestyl3r left02:55
← jayallen left02:55
← sohail left02:56
→ freestyl3r joined02:56
← m0viefreak left02:56
→ wongon joined02:57
should → ^s02:57
← mellernoia left02:57
← nadirvardar left02:57
→ githogori joined02:57
← alvaro_o left02:57
→ mikepack_ joined02:57
→ l0x3py joined02:59
→ nadirvardar joined02:59
← lindenle_ left03:00
← marcjs left03:00
← wongon left03:01
← ehmatthes left03:01
→ mani2399 joined03:01
← mani2399 left03:01
← robarelli left03:02
→ woollyams joined03:04
← enigmus left03:04
→ shingshang joined03:04
→ el3ctron joined03:05
← tmcmahon left03:06
→ vkrest_ joined03:06
← woollyams left03:07
← nlogn left03:07
→ woollyams joined03:07
→ konr joined03:08
→ Rastus_Vernon joined03:08
→ jaequery joined03:08
← jaequery left03:08
← Noldorin left03:08
→ jaequery joined03:09
← jaequery left03:09
→ mani2399 joined03:09
← mani2399 left03:09
← werlley left03:09
→ teran joined03:09
rawtaz guys, i cloned a repo from github. then i fixed a bug in a file, and now i want to contribute this back. so i forked the repo on github, and then i removed the origin remote from that first cloned repo. i then added it back but with the name "upstream" instead (realizing i could just have renamed it)03:09
→ jaequery joined03:09
← yhager left03:10
← vkrest left03:10
rawtaz then i also added my fork on github as the 'origin' remote03:10
i have a feeling there's some more command i should run to make things be as if i had cloned from my fork originally. setting some default push thing, right?03:10
its not *required* to be able to push, but i want to understand what's needed to make the setup just like if i had cloned my fork instead03:11
← vkrest_ left03:11
← Gamecubic left03:11
← noisewaterphd_ left03:11
OMGOMG what are you actually trying to do?03:11
→ Gamecubic joined03:11
rawtaz OMGOMG: what i wrote above03:12
OMGOMG what is your goal03:12
← teran left03:12
rawtaz i really dont know how to word it differently..03:12
let me try then.03:12
→ Zaknefain joined03:12
→ mdub joined03:12
OMGOMG perhaps you could link the repo and show what is wrong03:12
← woollyams left03:12
← mikepack_ left03:12
← francesca left03:13
rawtaz there's nothing wrong03:13
nothing is not working with it03:13
→ mikepack_ joined03:13
→ sambae joined03:13
← danman left03:13
OMGOMG great03:13
rawtaz in a way03:14
← sdouglas left03:15
rawtaz of the things i wrote above, what parts are unclear?03:15
← simesy left03:16
Vampire0_ → Vampire003:16
→ mani2399 joined03:16
← mani2399 left03:16
Vampire0 rawtaz, the easiest would be to just clone your fork and compare the configs for unequiality03:16
→ sdouglas joined03:16
← Zaknefain left03:17
Vampire0 Other than that, I think the only thing that could be needed to change is if you had some remote tracking branches setup03:17
git config --get-regexp branch.*03:17
← mik3y left03:17
→ noisewaterphd_ joined03:17
rawtaz yeah i really havent done anything to the local repo except modifying that file, deleting origin, adding back another remote as origin, and adding the previous origin as upstream :)03:17
← mikepack_ left03:18
→ sdouglas_ joined03:18
← SilverBln left03:18
rawtaz thanks for the tip of comparing configs. they're almost the same03:18
Vampire0 Those you can either update manually, or on explicit push with -u03:19
yeah, they should03:19
besides the second remote03:19
rawtaz thats the one i was having in mind, what -u does03:19
cool03:19
← bobdobbs left03:20
→ mikepack_ joined03:20
← harish_ left03:21
← sdouglas_ left03:21
← sdouglas left03:21
→ harish joined03:21
→ sdouglas joined03:21
Vampire0 That should be the branch.<name>.... things iirc03:22
→ xMYTHICx joined03:22
→ mikepa___ joined03:23
← Devels left03:23
← RaceCondition left03:23
← xMYTHICx left03:24
← cwillu_at_work left03:24
→ xsbeats joined03:25
← mikepack_ left03:25
← joelm left03:26
← sdouglas left03:26
→ mani2399 joined03:26
← mani2399 left03:27
rawtaz Vampire0: i take it you mean the two lines remote = origin and merge = refs/heads/devel that were deleted from under the [branch "devel"] in the config, when i removed and added the old and new origin?03:27
i.e. that is what you're talking about03:27
→ gasull2 joined03:29
← TylerE left03:29
rawtaz yeah03:29
← WaReZ left03:29
→ sdouglas joined03:30
← gasull2 left03:30
→ gasull joined03:31
← mikepa___ left03:31
→ mikepack joined03:31
← gasull left03:31
← lifelike left03:33
→ mani2399 joined03:33
← mani2399 left03:33
→ lifelike joined03:33
→ simesy joined03:33
→ mani2399 joined03:33
← mani2399 left03:33
→ lindenle_ joined03:34
→ reskp joined03:35
← mikepack left03:35
→ yacks joined03:35
→ tomengland joined03:36
← koell left03:36
← dagnachew left03:36
→ madewokherd joined03:36
→ sethwklein joined03:37
← arnihr left03:37
→ mribeirodantas joined03:37
← Zifre left03:38
→ Cache_Money joined03:39
← reskp left03:40
← scarabx left03:40
← rq60 left03:41
← _iron left03:43
← howitdo left03:43
→ fluter joined03:44
→ axl_ joined03:44
→ Exancillatus joined03:44
→ jason237 joined03:46
Cache_Money I've added some aliases to my ~/.bashrc file. When I quit my terminal they aren't available anymore. What am I doing wrong?03:47
→ recycle joined03:48
rawtaz are you opening a new terminal?03:49
← Exancillatus left03:49
→ dserodio joined03:49
thiago Cache_Money: are you saying that the ~/.bashrc file resets?03:50
Cache_Money: how did you load the aliases in the shell before you quit it?03:50
→ danman joined03:51
Cache_Money thiago: No, I just wasn't aware that I need to source ~/.bashrc every time I open a new terminal03:51
is there any way to do this automatically?03:51
← danman left03:51
→ Devels joined03:51
offby1 bash is supposed to read that file when it starts.03:51
thiago Cache_Money: you can read your shell's manual to figure that out03:51
Cache_Money offby1: bashrc or bash_profile?03:51
thiago either how to make it read that file or what file it already reads03:51
my guess is that your terminal launches bash in such a way that it doesn't read ~/.bashrc03:52
→ synbyte joined03:52
thiago not a #git question, though...03:52
← makubi left03:52
→ Caelum joined03:52
← hochmeis_ left03:52
→ TheMoonMaster joined03:53
variable is it possible to set multiple upstreams for a default push?03:53
thiago no03:53
ashooby Cache_Money: if you're using OS X apparently it uses the .bash_profile instead of .bashrc03:53
Cache_Money thiago: I had to put "source ./bashrc" within my .bash_profile file03:53
ashooby so, just put . .bashrc in .bash_profile03:54
Cache_Money thiago: you're right. Originally I thought it was. Sorry03:54
→ makubi joined03:54
Cache_Money ashooby: correct... I'm on OS X03:54
ashooby Cache_Money: it sounds like you got it just before me :)03:55
thiago it's explained in the bash manual, by the way03:55
if it's interactive, it reads ~?.bash_profile; if it's not interactive, it reads ~/.bashrc03:55
sorry03:55
when it's interactive and login, it reads ~/.bash_profile; if it's interactive but not login, it reads ~/.bashrc03:55
← joelroa left03:55
← Dougie187 left03:56
← Dougie2187 left03:56
← moisan` left03:56
→ yhager joined03:56
← Wulf left03:56
← mribeirodantas left03:56
← mizu_no_oto left03:57
→ hochmeister joined03:57
→ howitdo joined03:57
← craigp left03:57
→ macrover joined03:58
← lindenle_ left03:58
→ Wulf joined03:58
→ scarabx joined03:59
→ saurabh joined03:59
saurabh → Guest9542204:00
variable Cache_Money: don't use source ~/.bashrc; if you need that you are doing it wrong04:02
Cache_Money variable: why?04:02
← shingshang left04:02
variable Cache_Money: bash will read every file it needs to read at startup04:02
there is a difference between .bashrc and .bash_profile04:03
and they should not be conflated04:03
(consider things like running gpg-agent or ssh-agent only on startup; there are additional reasons)04:03
Cache_Money: carefully read the man page when deciding which file to sue04:03
→ aviraldg joined04:03
→ RaceCondition joined04:03
ashooby the .bash_profile in every system I've ever used have included a '. .bashrc' in the .bash_profile04:03
rawtaz meep04:04
→ pwnz0r joined04:05
→ Tuna-Fish joined04:05
→ hahuang61 joined04:06
← unknwn- left04:06
→ Zaknefain joined04:06
← yhager left04:06
→ [aviraldg] joined04:07
ashooby variable: maybe try this? http://stackoverflow.com/questions/4255865/git-push-to-multiple-repositories-simultaneously04:07
← [aviraldg] left04:08
fluter hi, is there git rpm for centos 6.5?04:09
→ [aviraldg] joined04:09
fluter the git 1.7.1 is too old04:09
← nszceta left04:10
→ phy1729 joined04:10
← nfroidure left04:10
← aviraldg left04:10
thiago fluter: build from sources if you can't find compatible RPMs elsewhere04:10
→ teran joined04:10
phy1729 What if I want to start a commit line with a # ?04:10
← Zaknefain left04:10
thiago git commit --whitespace=verbatim04:12
phy1729 it's a merge; same option?04:13
thiago yes04:13
remember to remove the lines starting with # that git commit added for you04:13
phy1729 good tip04:13
← pbrobst left04:14
← teran left04:14
→ robarelli joined04:15
phy1729 thiago: I'm getting "error: unknown option `whitespace=verbatim'"04:15
ashooby phy1729: thiago: --cleanup=whitespace04:15
thiago sorry, --cleanup=verbatim04:16
ashooby or --cleanup=verbatim04:16
thiago I got confused because one of the options is --cleanup=whitespace04:16
phy1729 merge is still giving me "error: unknown option `cleanup=whitespace'"04:17
→ vkrest joined04:18
← robbyoconnor left04:18
phy1729 git merge --cleanup=whitespace foo/bar bar/foo04:18
thiago git commit --cleanup=whitespace04:18
not merge04:18
← omegahm left04:18
phy1729 I need to do a merge04:18
thiago I meant that it's the same option when you're committing the merge04:18
git merge --no-commit, then git commit04:19
phy1729 ah04:19
seems an odd way to do it but ok04:19
← sdouglas left04:19
← robarelli left04:19
thiago not really. It's just a corner-case.04:20
→ sdouglas joined04:20
← Cache_Money left04:20
thiago I think I've done verbatim commits at most once a year, for the past 5 years. And never has it been a merge.04:20
← axl_ left04:21
← kenneth left04:21
ashooby phy1729: you could also just do a commit --amend --cleanup=verbatim after the merge04:21
phy1729: or just put a space in front of the #04:21
many options04:22
several at least04:22
← CheckDavid left04:22
→ sdouglas_ joined04:22
→ beautifulmind joined04:22
phy1729 sure but way doesn't merge have a superset of commit's options?04:22
← daito left04:23
thiago because merge is not a superset of commit04:23
→ joelroa joined04:23
thiago the fact that it creates a commit is incidental04:23
rebase might create lots of commits too04:23
ashooby if a merge fast forwards, then it doesn't even create a commit04:23
unless told04:23
thiago right04:24
phy1729 just git br -f that (joking)04:24
thiago also, merge must *not* accept some options that git commit does, like -a04:24
those don't make sense, since merge operates on commits, not on files04:24
← RaceCondition left04:24
← scarabx left04:25
thiago should merge get a --cleanup= option? maybe. But wholesale adding commit's options, no, that's not right.04:25
← sdouglas left04:25
→ Watabou joined04:26
← nikkos left04:27
← DolpheenDream left04:28
→ RaceCondition joined04:29
→ mani2399 joined04:29
← mani2399 left04:29
→ craigp joined04:29
← the_cybersphinx left04:30
phy1729 thiago: fair enough04:30
← jcvfen left04:30
← joelroa left04:30
phy1729 thanks for the help guys04:30
rawtaz Vampire0: spank you for the help earlier, too04:32
ugh, awful grammar.04:32
← noisewaterphd_ left04:33
← thiago left04:33
← sambae left04:34
→ nszceta joined04:34
gitinfo set mode: +v04:34
→ sambae joined04:34
← craigp left04:34
→ thiago joined04:35
→ reskp joined04:36
← simesy left04:36
→ lindenle_ joined04:37
← reskp left04:41
← kermit left04:41
← Guest95422 left04:41
→ kermit joined04:41
→ arvind_khadri joined04:43
← zivester left04:44
→ simesy joined04:45
→ Exancillatus joined04:45
← Gamecubic left04:46
← jdav_gone left04:46
← nszceta left04:47
→ ben_alman joined04:48
← invinceable left04:48
← ben_alman left04:48
← Exancillatus left04:50
← [aviraldg] left04:50
→ aviraldg joined04:51
← thiago left04:55
→ thiago joined04:55
← madewokherd left04:56
← aviraldg left04:56
← tomengland left04:59
→ tomengland joined04:59
→ omegahm joined04:59
← sambae left04:59
→ Zaknefain joined05:00
→ Gamecubic joined05:01
← Zaknefain left05:01
← Diemuzi left05:01
→ daito joined05:01
→ SLY1986 joined05:01
← jaequery left05:03
→ FatDarrel joined05:03
← tomengland left05:04
← kukks left05:05
← CKyle left05:05
← FatDarrel left05:08
→ refried_ joined05:09
→ cxreg joined05:11
→ robbyoconnor joined05:11
→ luxgeek joined05:13
← daito left05:19
← diverdude left05:19
← luc_ left05:20
← refried_ left05:20
→ luc_ joined05:20
← RaceCondition left05:21
← fatalhalt left05:23
← veebers left05:25
← luc_ left05:26
→ luc_ joined05:26
← hahuang61 left05:27
→ joelroa joined05:28
→ h0bbit_ joined05:28
→ jdav_gone joined05:30
← pierre1_ left05:30
← vkrest left05:31
← joelroa left05:33
→ maestrojed joined05:36
→ hahuang61 joined05:36
→ reskp joined05:37
← not_a_guest left05:37
← tpollard left05:38
← reskp left05:42
→ craigp joined05:42
→ tgkokk joined05:43
← craigp left05:46
← h0bbit_ left05:47
← tgkokk left05:47
← jon_x8 left05:47
→ jizanthapus joined05:48
→ Raging_Hog joined05:48
→ h0bbit_ joined05:50
→ Tommy[D]_ joined05:50
← Gamecubic left05:52
→ Gamecubic joined05:52
← Tommy[D] left05:54
→ devoldmx joined05:54
← lindenle_ left05:55
← nicedice left05:55
→ Zaknefain joined05:55
→ dsdeiz joined05:55
← tureba left05:56
→ m0ltar joined05:56
→ aviraldg joined05:57
→ tureba joined05:57
← el3ctron left05:58
→ tjadmin_ joined05:58
← tjadmin_ left05:58
← Hecter left05:59
← macrover left06:00
← Zaknefain left06:00
→ daito joined06:00
← tureba left06:02
← chamunks- left06:03
← chrisshattuck left06:03
← pwnz0r left06:05
→ teran joined06:09
→ Hecter joined06:09
→ ewet joined06:11
← ewet left06:11
→ QoS joined06:12
→ kcj joined06:13
→ ewet joined06:13
← teran left06:13
→ BABA joined06:14
BABA → Guest9675706:14
← Guest96757 left06:15
← robbyoconnor left06:15
← snuffeluffegus left06:16
→ robarelli joined06:16
← Lemony left06:16
→ snuffeluffegus joined06:17
→ gabedain joined06:17
← gabedain left06:18
← Kartagis left06:18
→ flappy_bird joined06:18
→ gabedain joined06:18
→ pwnz0r joined06:18
→ Kartagis joined06:19
→ saurabh joined06:21
← robarelli left06:21
saurabh → Guest1822806:21
← gabedain left06:21
← nadirvardar left06:22
→ Zaknefain joined06:23
→ ThomasLocke joined06:24
→ yhager joined06:25
← h0bbit_ left06:27
→ shingshang joined06:27
← hahuang61 left06:28
← weiyang left06:28
→ zumba_ad_ joined06:32
→ cff joined06:32
→ hoschi joined06:32
← zumba_addict left06:33
← yhager left06:34
← tokik left06:35
→ toki joined06:35
← JerryT left06:35
→ JohnBat26 joined06:35
→ arif-ali joined06:36
← arif-ali left06:36
← JohnBat26 left06:37
→ JohnBat26 joined06:37
← JohnBat26 left06:37
→ JohnBat26 joined06:37
→ reskp joined06:38
← starkhalo left06:38
→ arif-ali joined06:38
→ joelroa joined06:39
← daito left06:39
→ iokill joined06:41
← freestyl3r left06:41
→ weiyang joined06:41
→ fr33 joined06:41
→ vkrest joined06:42
→ darnir_ joined06:42
← reskp left06:42
← vkrest left06:42
→ jargon joined06:42
→ pantsman joined06:43
← simesy left06:43
→ cloud|nix joined06:43
← weiyang left06:44
→ weiyang joined06:44
→ arietis joined06:45
→ pierre1_ joined06:45
→ kbart joined06:46
→ Anticom joined06:50
→ ferreum joined06:50
→ marthinal joined06:51
→ hobodave joined06:51
← sdouglas_ left06:52
mozzarella → YourFavoriteBot06:52
→ nfk joined06:52
YourFavoriteBot → mozzarella06:52
← Gamecubic left06:55
→ tomengland joined06:56
← tyreld left06:56
mozzarella → bro06:57
→ aarapov joined07:01
→ tphd joined07:01
← tomengland left07:01
→ tomengland joined07:01
→ yhager joined07:02
→ ehmatthes joined07:02
← bgerber left07:03
← lindenle left07:04
← dreiss left07:04
→ chamunks joined07:05
→ hkon_ joined07:05
← hochmeister left07:05
→ przemkovv joined07:05
→ _tpavel joined07:07
← pantsman left07:07
Kartagis can we pull a specific commit? git pull <hash> ?07:07
I mean up to that commit07:08
j416 Kartagis: try it (yes)07:08
→ bgerber joined07:08
j416 Kartagis: pull is the same as fetch + merge07:08
Kartagis j416: okay (thanks)07:08
j416 Kartagis: fetch will get everything, merge will merge whatever the argument is07:09
Kartagis: not sure though if you can actually do 'git pull <commit>' but nonetheless you can 'git fetch' and then 'git merge <commit>'07:10
Kartagis j416: so basically I pull everything, but only up to that commit will be shown07:10
→ lindenle joined07:10
→ Kicer86 joined07:10
j416 Kartagis: careful with the terminology. pull = fetch + merge07:10
→ teran_ joined07:11
→ robbyoconnor joined07:11
→ cbreak-work joined07:11
j416 Kartagis: 'git fetch' always get everything. After that you operate locally to do what you want with what you fetched.07:11
(merge it, rebase on top of it, look at it...)07:12
→ j0ran joined07:12
Kartagis okay07:12
→ enigmus joined07:12
j416 'git fetch' and 'git push' are the only commands that communicate outside of your repo07:12
everything else is local07:13
(arguably 'git pull' too, but that includes fetch so)07:13
→ tobeplugged joined07:13
← snuffeluffegus left07:14
← teran_ left07:16
← maestrojed left07:16
→ robarelli joined07:17
→ teran joined07:17
→ roelmonnens joined07:18
→ bwreilly joined07:19
→ rath joined07:20
← nnyk_ left07:20
→ bousquet joined07:21
grumbel_ IIRC, you cannot pull a hash directly, only references (though that might depend on the protocol)07:21
← robarelli left07:22
grumbel_ There was some argument that the only way to "delete" a commit from a public repository was to make it unreferenced by any named reference07:22
→ snuffeluffegus joined07:22
→ konadr joined07:23
→ sdouglas joined07:23
→ yaru22 joined07:24
grumbel_ http://thread.gmane.org/gmane.comp.version-control.git/73368/focus=7399407:24
← arif-ali left07:24
← sdouglas left07:25
→ sdouglas joined07:25
thiago it's a security feature07:26
← beautifulmind left07:27
j416 grumbel_: indeed.07:27
Kartagis: ^07:27
my assumption was that the hash was part of a branch/tag history07:28
not sure if git translates 'git pull <commit>' into 'git fetch && git merge <commit>' or not07:28
→ modocache joined07:28
j416 maybe it just barfs out an error07:28
← tomengland left07:29
→ tomengland joined07:29
← darnir_ left07:29
← Rastus_Vernon left07:29
← tomengland left07:29
← sdouglas left07:30
→ Cache_Money joined07:30
→ FatDarrel joined07:30
→ leakybuckit joined07:30
→ tomengland joined07:30
→ h0bbit_ joined07:31
→ Gizburdt joined07:32
→ xlinkz0 joined07:32
→ SorenHolm joined07:32
← hobodave left07:33
→ a-l-e joined07:33
← tomengland left07:34
→ rob_w joined07:36
→ daito joined07:37
← enigmus left07:38
→ reskp joined07:38
Guest57954 → mf_07:40
→ rethus joined07:40
→ HelperW joined07:41
thiago j416: the translation is a bit more complex07:41
it's git fetch <remote part of the ref> && git merge <ref>07:41
← reskp left07:43
→ mlechner joined07:44
→ tureba joined07:44
j416 thiago: naturally; though the remote part may be in config, right?07:45
hm maybe that's just for fetch07:45
I hardly ever use pull with arguments so I forget its syntax07:46
→ rednaks joined07:46
→ joelrobichaud joined07:47
← jas4711 left07:48
→ pduin joined07:49
→ ifdm_ joined07:50
→ Sicp joined07:50
← yacks left07:50
← mdub left07:51
← cloud|nix left07:52
← l0x3py left07:52
← Cache_Money left07:53
→ lavong joined07:53
→ blahzik joined07:54
← lindenle left07:55
→ ayaz joined07:55
← Sicp left07:56
← blahzik left07:56
→ hahuang61 joined07:57
→ gua_ould joined07:57
→ MattStra_ joined07:58
→ Misan joined08:00
→ matteo joined08:01
← hahuang61 left08:01
→ jsilver_ joined08:02
→ qinbo joined08:02
→ Gooder` joined08:03
→ lavaman1 joined08:03
← lavaman left08:03
→ Tuna-Fish2 joined08:04
→ lolmaus_ joined08:04
→ ronskisika joined08:04
→ jayne_ joined08:05
→ caseydri_ joined08:05
← zequence left08:05
→ Lemony joined08:05
→ soren_ joined08:05
← FatDarrel left08:06
← weiyang left08:06
→ warbaque_ joined08:06
→ makubi_ joined08:06
→ cfedde_ joined08:06
→ Nikoli_ joined08:06
→ jacobt joined08:06
→ archdori joined08:06
→ nevyn_ joined08:06
→ JSharpe_ joined08:06
→ lite_ joined08:07
→ cbreak_ joined08:08
→ jas4711 joined08:08
← Lemony left08:08
→ Lemony joined08:08
← aarapov left08:09
→ loglaunch_ joined08:09
→ Don joined08:10
Don → Guest4547008:10
← joelrobichaud left08:11
← rednaks left08:11
← tobeplugged left08:11
← cbreak-work left08:11
← _tpavel left08:11
← kcj left08:11
← aviraldg left08:11
← Raging_Hog left08:11
← Tuna-Fish left08:11
← makubi left08:11
← harish left08:11
← monokrome left08:11
← fluter left08:11
← Orbitrix left08:11
← lolmaus left08:11
← jsilver left08:11
← ezrafree left08:11
← v0n left08:11
← mf_ left08:11
← DrShoggoth left08:11
← zacts left08:11
← DolphinDream left08:11
← osse left08:11
← JSharpe left08:11
← armyriad left08:11
← Exdaix left08:11
← bluefirecorp1 left08:11
← Fandekasp left08:11
← oojacoboo left08:11
← kinboster left08:11
← tirengarfio left08:11
← warbaque left08:11
← cfedde left08:11
← ss1891 left08:11
← loglaunch left08:11
← breakingthings left08:11
← Guest42943 left08:11
← soren left08:11
← caseydriscoll left08:11
← Gooder left08:11
← Andrevan left08:11
← Nikoli left08:11
← xSmurf left08:11
← nevyn left08:11
← hays left08:11
← silverf0x left08:11
← frobware left08:11
← camt left08:11
← jayne left08:11
← lunaphyte_ left08:11
← ayaz left08:11
← xlinkz0 left08:11
← bwreilly left08:11
← teran left08:11
← j0ran left08:11
← robbyoconnor left08:11
← bgerber left08:11
← przemkovv left08:11
← nfk left08:11
← jargon left08:11
← toki left08:11
← pwnz0r left08:11
← dsdeiz left08:11
← jdav_gone left08:11
← kermit left08:11
← howitdo left08:11
← Sabbath left08:11
← john2x left08:11
← northfurr left08:11
← Xiti left08:11
← kaictl left08:11
← amcsi_work left08:11
← EdGruberman left08:11
← javawizard left08:11
← n8chur__ left08:11
← diget left08:11
← Fuxx_ left08:11
← Ywe left08:11
← akiva left08:11
← takamichi left08:11
← Segfault_ left08:11
← saorge left08:11
← MattMaker left08:11
← mitz left08:11
← tmart left08:11
← SegFaultAX left08:11
← texel left08:11
← p8952 left08:11
← mivok left08:11
← JrCs left08:11
← someElise left08:11
← Davey left08:11
← mgomezch left08:11
← Asenar left08:11
← bhldev__ left08:11
← ianmcorvidae left08:11
← kadoban left08:11
← jast left08:11
← george2 left08:11
← Vinnie_win left08:11
← thegattaca left08:11
← stellarhopper left08:11
← AndreSomers left08:11
← pekster left08:11
← linduxed left08:11
← ciaranm left08:11
← kloeri left08:11
← jon-mac left08:11
← NaiveFrost left08:11
← milki left08:11
← expr left08:11
← ProducedRaw left08:11
← babilen left08:11
← flexo left08:11
← dfarler left08:11
← kossy left08:11
← Sewdo left08:11
← iAsterisk left08:11
← aboudreault left08:11
← whoami left08:11
← idoru left08:11
← surfdue left08:11
→ Exdaix joined08:11
→ ghostlines joined08:11
→ jceb joined08:11
→ shennyg joined08:11
→ yacks joined08:11
→ aarapov joined08:12
← lacrosse_ left08:12
jayne_ → jayne08:13
← snuffeluffegus left08:13
→ dreiss joined08:13
→ osse joined08:14
← Goplat left08:14
← jmcantrell left08:14
→ jmcantrell joined08:15
→ not_a_guest joined08:15
→ konadr1 joined08:15
→ papegaaij joined08:15
← conan_ left08:16
→ jnavila joined08:16
→ jagob joined08:16
→ zacts joined08:17
← konadr left08:17
← phuh left08:17
→ harish joined08:18
→ robarelli joined08:18
→ mf_ joined08:18
→ tirengarfio joined08:18
← modocache left08:18
→ _tpavel joined08:18
→ v0n joined08:18
→ weiyang joined08:19
← axsuul left08:20
← Hecter left08:21
→ axsuul joined08:21
→ shafox joined08:21
→ mewm joined08:22
← robarelli left08:22
→ djapo joined08:22
← jceb left08:23
→ tobeplugged joined08:23
djapo hello world, when i try to push code to my github it asks me for my username and password but when i try to push code to my bitbucket it asks for my pasphrase, how can i make my github repo do the same?08:24
→ harobed joined08:25
→ noxd joined08:25
shafox djapo, add ssh-keys to your github account and follow the help guide08:25
← mewm left08:26
← nepochal left08:27
moritz djapo: and use the ssh URLs that github offers, not the https URL08:28
→ DolphinDream joined08:28
djapo shafox: i already have that08:28
→ francisfish joined08:28
djapo moritz: how do i do that? do i edit the .git folder files08:29
?08:29
→ armyriad joined08:29
moritz djapo: .git/config, yes08:29
→ nick108 joined08:29
moritz or you can use git remote set-url08:29
shafox I have a git repo. with some 50 odd commits . I want to rebase squash all the commit starting from 1 to 45 , how to specify while using git rebase -i id id ??08:30
← nick108 left08:30
osse shafox: git rebase -i --root08:30
→ lb1a joined08:31
djapo moritz: neat, thanks!08:31
→ nick108 joined08:31
osse mark commits 2 through 45 as squash08:31
shafox osse, that will give me the all the commit list and ah ok lemme try08:31
→ Gavrisimo joined08:32
← thiago left08:32
→ FatDarrel joined08:33
← dreiss left08:33
shafox osse, with fixup i can remove the commit message but will have commits ?08:33
moritz correct08:34
← m0ltar left08:34
→ liuzhoou joined08:34
shafox that way i will lose every other contributors name ?08:34
moritz yes08:34
→ alorence joined08:34
→ jceb joined08:36
→ pikaren joined08:36
← ifdm_ left08:36
← dhilipsiva left08:36
← arietis left08:36
← FatDarrel left08:36
→ arietis joined08:37
→ shruggar joined08:37
→ arif-ali joined08:37
→ ifdm_ joined08:37
pikaren Does git internally store every commit with a completely snapshots of the committed files?08:39
→ jaf2k joined08:39
→ aviraldg joined08:40
→ nnyk_ joined08:41
→ tvw joined08:41
grumbel_ pikaren: That's how it is modeled, yes; however, on storage level, similar files can be compressed using some delta encoding, and identical files are only ever stored once08:41
→ mewm joined08:42
→ luxgeek1 joined08:43
← axsuul left08:43
← luxgeek left08:43
→ axsuul joined08:43
← pikaren left08:43
← a-l-e left08:43
→ pikaren joined08:44
→ dhilipsiva joined08:44
→ arand joined08:45
→ Juzzika joined08:46
→ breakingthings joined08:47
pikaren Does 'git cat-file -p' output the thing that has been preprocessed by this storage level trick?08:47
Does 'git cat-file -p' output the thing that has been preprocessed by this storage level trick?08:48
→ dmarkham joined08:48
pikaren sorry for repeating... my irc client is behaving weirdly08:48
← pikaren left08:48
→ icbaek joined08:49
← shruggar left08:49
← ewet left08:49
← axsuul left08:50
grumbel_ no, that compression is completely transparent to practically all git commands08:50
→ Trudko joined08:50
→ [aviraldg] joined08:51
Trudko Guys I am using git bash under the windows and it only seems to remember commands run when since opening it. I would like to see also old commands which I have used id different git bash commands if you know what I mean08:51
osse Trudko: let me guess: You close Git bash by pressing the X in the corner? That will incorrectly shut bash down. Try 'exit' and see if it remembers history then08:53
Trudko osse: yeah you are ofc right...08:53
osse \o/08:54
Trudko ou well I am window user you have to excuse me :)08:54
← aviraldg left08:54
osse Trudko: you *can* make bash write the command history to disk after every command, but I can't remember how. If you want something quicker than 'exit' to close the window then you can press Ctrl-D08:54
Trudko i will try to find out saveing after every command would be safe meanwhile i Will use ctrl d , thx08:55
arand PROMPT_COMMAND="history -a;$PROMPT_COMMAND" I think08:56
moritz http://askubuntu.com/questions/80371/bash-history-handling-with-multiple-terminals08:56
← luxgeek1 left08:56
moritz arand was faster :-)08:56
arand (in .bashrc or equivalent)08:56
→ pikaren joined08:56
→ Balliad joined08:57
→ filter joined08:58
→ mikecmpbll joined08:59
← liuzhoou left08:59
soren_ → soren09:00
← soren left09:00
→ soren joined09:00
Trudko arand: yeap that seems to work09:01
→ W0rmDr1nk joined09:01
→ Sonderblade joined09:01
→ hays_ joined09:01
→ jaequery joined09:01
→ silverf0x joined09:01
→ Hecter joined09:01
→ gitinfo joined09:01
→ camt joined09:01
→ frobware joined09:01
→ nfroidure joined09:01
→ surfdue joined09:01
→ idoru joined09:01
→ whoami joined09:01
→ iAsterisk joined09:01
→ Sewdo joined09:01
→ aboudreault joined09:01
→ kossy joined09:01
→ dfarler joined09:01
→ flexo joined09:01
→ babilen joined09:01
→ ProducedRaw joined09:01
→ expr joined09:01
→ milki joined09:01
→ NaiveFrost joined09:01
→ jon-mac joined09:01
→ kloeri joined09:01
→ ciaranm joined09:01
→ linduxed joined09:01
→ pekster joined09:01
→ AndreSomers joined09:01
→ stellarhopper joined09:01
→ thegattaca joined09:01
→ Vinnie_win joined09:01
→ george2 joined09:01
→ jast joined09:01
→ kadoban joined09:01
→ ianmcorvidae joined09:01
→ bhldev__ joined09:01
→ Asenar joined09:01
→ mgomezch joined09:01
→ Davey joined09:01
→ someElise joined09:01
→ JrCs joined09:01
→ p8952 joined09:01
→ texel joined09:01
→ SegFaultAX joined09:01
→ tmart joined09:01
→ mitz joined09:01
→ MattMaker joined09:01
→ saorge joined09:01
→ Segfault_ joined09:01
→ takamichi joined09:01
→ akiva joined09:01
→ Ywe joined09:01
→ Fuxx_ joined09:01
→ diget joined09:01
→ n8chur__ joined09:01
→ mivok joined09:01
→ javawizard joined09:01
→ EdGruberman joined09:01
→ amcsi_work joined09:01
→ kaictl joined09:01
→ Xiti joined09:01
→ northfurr joined09:01
→ john2x joined09:01
→ Sabbath joined09:01
→ howitdo joined09:01
→ jdav_gone joined09:01
→ dsdeiz joined09:01
→ toki joined09:01
→ jargon joined09:01
→ nfk joined09:01
→ przemkovv joined09:01
→ bgerber joined09:01
→ robbyoconnor joined09:01
→ j0ran joined09:01
→ teran joined09:01
→ xlinkz0 joined09:01
→ ayaz joined09:01
→ otiose joined09:01
→ bluefirecorp joined09:01
→ Huevos joined09:01
→ xSmurf joined09:01
→ lacrosse_ joined09:01
→ LAAJEIJ joined09:01
→ DrShoggoth joined09:01
→ fluter joined09:01
→ Andrevan joined09:01
→ draftqin joined09:01
→ CodeShark joined09:01
→ lunaphyte_ joined09:01
→ rednaks joined09:01
→ monokrome joined09:01
→ ezrafree joined09:01
→ GrEEnFiRe joined09:01
wagle i checked out branch foo and it says: Your branch is behind 'local/foo' by 3 commits, and can be fast-forwarded.09:01
what do i do?09:01
→ Naeb joined09:01
← aarapov left09:01
← GrEEnFiRe left09:01
lite_ git pull ?09:02
wagle oh.. i guess i didnt actually pu;l09:02
← daito left09:02
wagle the pull musta failed09:02
osse wagle: depends. ''git merge local/foo'' is the usual course of action but you don't *have* to do anything09:02
→ GrEEnFiRe joined09:02
← frobware left09:02
→ frobware joined09:02
← xSmurf left09:02
→ xSmurf joined09:02
bluefirecorp → Guest3774509:02
→ kcj joined09:03
→ Advocation joined09:03
osse wagle: when you pull Git will fetch and the merge the *current* branch. So if you ad master checked out at the time of pulling and later checked out foo then this is completely normal09:04
← neurodrone left09:04
← leakybuckit left09:05
→ pwnz0r joined09:05
← rednaks left09:05
wagle osse: i was confused because I thought I had pulled09:05
couldnt understand how i could possibly be 3 commits behind09:06
canton7 understand what pull *does*09:06
→ hochmeister joined09:06
canton7 just like merge, it can only modify the currently checked out branch. it cannot modify any branch which is not checked out09:06
→ tfnico joined09:07
wagle i understand, but imagine yourself getting that message when you thought you had pulled09:07
→ snuffeluffegus joined09:07
canton7 if you'd learnt what pull does, it's not at all surprising09:07
wagle oh well, feexed now09:07
→ neurodrone joined09:07
wagle ummm, now you are trolling09:08
← rachma left09:08
← djapo left09:08
osse wagle: It's entirely possible that you have in fact pulled. That was my entire point09:09
→ ben_alman joined09:09
← pwnz0r left09:09
→ jaequery_ joined09:10
osse but only you know which branch you had checked out when you ran pull.09:10
← tobeplugged left09:10
→ oodavid joined09:10
← ippxs left09:10
← hochmeister left09:11
pikaren is there to see what's inside .git/index09:11
→ ewet joined09:11
← ewet left09:12
→ daito joined09:12
→ canton7-mac joined09:12
→ camth joined09:12
← camt left09:12
← bousquet left09:13
← canton7 left09:13
← toki left09:13
→ ArSn joined09:13
→ ewet joined09:13
→ canton7 joined09:13
← shingshang left09:14
← jaequery left09:14
← ben_alman left09:15
osse pikaren: it's a binary file. You can open it in a hex editor etc09:15
there is no pretty-printer for it as far as I know09:15
→ hays joined09:15
pikaren osse: thanks09:16
→ Druide_ joined09:16
osse pikaren: In Documents/technical/index-format.txt there is a description of it09:16
→ m0ltar joined09:16
← dmarkham left09:16
osse (in the git source tree. I doubt it gets installed)09:16
← hays_ left09:16
→ rgr joined09:17
jast 'git ls-files -s' can give you pretty much all of the information in the index09:17
osse oh, nice09:18
→ robarelli joined09:18
← snuffeluffegus left09:20
→ NCS_One joined09:21
← teran left09:21
→ teran joined09:21
NCS_One hi09:22
ewet it should largely be a tree object. sadly cat-file doesn't work on it. so ls-files is where it's at...09:22
→ shruggar joined09:22
NCS_One how can I check the differences between a commited and a not commited file?09:22
→ axsuul joined09:22
← robarelli left09:23
grumbel_ NCS_One: git diff <filename>09:23
assuming you have not "git add"ed the file before09:24
ewet NCS_One: man git-diff09:24
→ tobeplugged joined09:25
← m0ltar left09:25
NCS_One grumbel_: I add"ed it :(09:25
oodavid git diff --cached filename09:25
→ fatalhalt joined09:25
← teran left09:25
→ shingshang joined09:26
ewet gitinfo? why u no work?09:26
osse !cookie09:26
← Trudko left09:27
ewet NCS_One: well read the man page for git-diff. it's giving you a lot of ways to compare files in any direction :)09:27
← devoldmx left09:28
→ jatt joined09:28
← jatt left09:29
→ jatt joined09:29
→ reskp joined09:29
→ m0ltar joined09:30
← Naeb left09:30
→ elhamer joined09:30
→ Keridos_off joined09:30
→ nucc1 joined09:31
→ robmozart_ joined09:31
← Gavrisimo left09:31
nucc1 hi, if i want to pull the changes from the server and overwrite local changes, do i have to delete the entire directory and clone again?09:31
→ Naeb joined09:32
Keridos_off → Keridos09:32
Watabou nucc1: I would just git stash and then git pull.09:33
osse nucc1: instead of pulling use fetch and then reset09:33
→ arnihr joined09:34
← elhamer left09:34
→ samsamm777 joined09:34
robmozart_ i have a folder for my web apps, each folder has its own .git directory. i noticed that the folder i first mentioned also has a .git folder, why? can i delete it?09:35
nucc1 Watabou, osse thanks.09:35
← tvw left09:35
osse robmozart_: sounds like a "mother repo" with several submodules in it09:35
← jnewt left09:36
fluter how can I let git think it is not in a repo?09:36
osse if that's the case then no09:36
→ jnewt joined09:36
osse then you can delete it09:36
← Hecter left09:36
→ vince_prignano joined09:36
→ gain joined09:37
Keridos → Keridos_off09:37
→ sgambino joined09:37
robmozart_ osse: okay i may have initalised it as a repo and then forgot about it, don’t understand why it would grow to 100 mb as i can’t recall commiting much to it.09:37
thanks09:37
→ snuffeluffegus joined09:37
osse robmozart_: before deleting it you might want to check the log09:38
maybe you did it for good reasons09:38
→ Macaveli joined09:38
→ BiggFREE joined09:39
→ simesy joined09:39
→ sixlu joined09:39
→ mishok13 joined09:39
ewet robmozart_: there's probably stuff in it you committed my accident and meant to be in one of your sub-repos09:40
s/my/by09:40
→ lolmaus joined09:41
→ sdouglas joined09:42
← lolmaus_ left09:42
← Guest18228 left09:42
robmozart_ "fatal: This operation must be run in a work tree"09:42
so it’s a bare repo09:43
ewet: yeah probably09:43
→ ChrisAnn joined09:43
← kerrick left09:43
robmozart_ git log returns "fatal: bad default revision 'HEAD'"09:43
moritz that means there isn't any commit yet09:44
→ Kayra joined09:44
→ vurma joined09:45
→ blackmesa joined09:46
← jargon left09:46
← sdouglas left09:46
← mishok13 left09:46
← daito left09:46
← yhager left09:47
← weiyang left09:48
→ Kneferilis joined09:49
→ daito joined09:50
→ darnir_ joined09:52
→ Gonzo89 joined09:52
← harish left09:52
→ mrhooray joined09:53
← nucc1 left09:54
→ ghoti joined09:55
← SorenHolm left09:55
→ SorenHolm joined09:56
→ intellix joined09:57
← rgr left09:57
gitinfo NCS_One: the git-diff manpage is available at http://jk.gs/git-diff.html09:57
← Nikoli_ left09:58
→ aarapov joined09:59
→ Nikoli joined09:59
← Juzzika left09:59
← ghoti left10:00
← fluter left10:00
→ fluter joined10:00
pikaren i wonder why there isnt a great and widely used git wrapper out there since so many people complain about its usability10:00
fluter how can I let git think it is not in a repo?10:00
→ ghoti joined10:01
→ saurabh joined10:01
Watabou pikaren: I use tig10:01
→ welly joined10:01
saurabh → Guest7237210:01
→ tokik joined10:01
Watabou Not really a git wrapper, but it's a pretty awesome command line gui for git: let g:netrw_dirhistmax =1010:02
let g:netrw_dirhist_cnt =310:02
let g:netrw_dirhist_1='/Users/ajh/dotfiles/.vim/bundle/python-mode'10:02
let g:netrw_dirhist_2='/Users/ajh/dotfiles/.vim/bundle/emmet-vim'10:02
let g:netrw_dirhist_3='/Users/ajh/dotfiles'10:02
Crap10:02
→ Gavrisimo joined10:02
Watabou Sorry about that10:02
I meant this: https://blogs.atlassian.com/2013/05/git-tig/ :(10:02
→ Gavrisimooo joined10:04
→ BeardlessOne joined10:04
→ mishok13 joined10:04
pikaren Watabou: hmm.. I'll check it out. Thanks10:05
→ tshirtman joined10:05
← ghoti left10:05
→ toki joined10:06
← tokik left10:06
← Gavrisimo left10:07
→ ghoti joined10:07
← gitinfo left10:08
→ gitinfo joined10:08
ChanServ set mode: +o10:08
jast pikaren: because the people who complain don't actually have decent solutions10:08
← Gavrisimooo left10:08
← tobeplugged left10:09
jast most of them are kind of "let's just pretend git is svn"10:09
ewet pikaren: with a powerful tool like git there's no way around learning how it works.10:10
→ rednaks joined10:10
← northfurr left10:10
← ghoti left10:12
← HelperW left10:12
→ thevishy joined10:12
→ ghoti joined10:13
→ vijay13 joined10:13
← arietis left10:15
← zacts left10:16
tshirtman hi, i did myself a small hook sometime ago, to display the stashed changes on the branch everytime i checkout, (https://github.com/tshirtman/git/blob/master/template/hooks/post-checkout) but i just realized that it broke git rebase, causing it to tell me i'm in detached head, while telling me it couldn't detach head, do i need to make my script return something to mark success?10:16
← reskp left10:16
→ reskp joined10:16
← sixlu left10:17
← ghoti left10:18
← takamichi left10:18
← NCS_One left10:18
→ ghoti joined10:19
→ robarelli joined10:19
→ beautifulmind joined10:20
jizanthapus-work tshirtman, stashes are shared between all branches, no?10:20
→ tvw joined10:20
tshirtman jizanthapus-work: yes, but i grep on the branch i'm checking out10:21
→ zacts joined10:21
→ arietis joined10:21
tshirtman so i know i stashed things there next time i check it out10:21
→ mossplix joined10:23
← robarelli left10:24
← ghoti left10:24
→ ghoti joined10:25
→ tobeplugged joined10:25
← mossplix left10:27
← joelroa left10:27
→ frogonwheels_ joined10:27
→ jluc joined10:27
tshirtman ok, i just needed an "exit 0" at the end of the script10:27
← hkon_ left10:28
→ WaReZ joined10:28
← mishok13 left10:29
← rednaks left10:29
→ NCS_One joined10:29
← ghoti left10:30
← frogonwheels left10:31
→ ghoti joined10:31
← zacts left10:31
← reskp left10:31
← aarapov left10:31
← vince_prignano left10:31
→ vince_prignano joined10:32
→ HelperW joined10:32
→ shinnya joined10:32
← mrhooray left10:32
← ehmatthes left10:33
← shafox left10:34
→ mossplix joined10:34
→ reskp_ joined10:34
← fairuz left10:35
← luc_ left10:35
→ vtunka joined10:35
→ Nizumzen joined10:35
← Guest72372 left10:35
→ carbon joined10:35
← carbon left10:35
← ghoti left10:35
→ aarapov joined10:36
frogonwheels_ → frogonwheels10:36
→ dmarkham joined10:36
→ cilly joined10:36
← lolmaus left10:36
→ ehmatthes joined10:37
← hyperair left10:37
→ teran joined10:37
→ ghoti joined10:37
← not_a_guest left10:37
→ lolmaus joined10:37
← icbaek left10:38
→ Hecter joined10:38
→ PeterBooker joined10:40
→ zacts joined10:41
← fatalhalt left10:42
← ghoti left10:42
→ sdouglas joined10:42
→ ghoti joined10:43
← tobeplugged left10:45
← sdouglas left10:47
← fluter left10:47
→ fluter joined10:47
→ Foredoomed joined10:47
→ Guest72372 joined10:48
← ghoti left10:48
→ ghoti joined10:49
← h0bbit_ left10:49
→ jargon joined10:49
→ hkon_ joined10:51
← kcj left10:52
→ mishok13 joined10:52
→ kenyasue joined10:53
← Lemony left10:54
→ h0bbit_ joined10:54
← jaf2k left10:54
→ joelroa joined10:54
← ghoti left10:54
→ Lemony joined10:54
← h0bbit_ left10:54
→ ghoti joined10:55
← kenyasue left10:55
→ tmart_ joined10:55
← rethus left10:56
→ dhilipsi_ joined10:57
← tmart left10:58
→ rethus joined10:58
← dhilipsiva left10:58
→ teran_ joined10:59
← darnir_ left11:00
← ghoti left11:00
← teran left11:00
→ ghoti joined11:01
← m0ltar left11:02
← Foredoomed left11:02
← reskp_ left11:02
← souther left11:02
→ souther joined11:03
← Nizumzen left11:04
← otiose left11:04
← joelroa left11:04
← pierre1_ left11:04
→ Gavrisimo joined11:04
← shingshang left11:05
→ lithiumjake joined11:05
→ hochmeister joined11:06
← ghoti left11:06
← _Vi left11:07
← Sonderblade left11:07
→ ghoti joined11:08
→ mellernoia joined11:08
→ rgr joined11:08
← zacts left11:08
← dmarkham left11:09
← Gavrisimo left11:09
→ Juzzika joined11:09
→ ben_alman joined11:10
← hochmeister left11:10
← vurma left11:12
← ghoti left11:13
→ ghoti joined11:13
→ Hounddog joined11:14
← daito left11:14
← ben_alman left11:14
→ oskarkv joined11:14
→ daito joined11:14
← Gizburdt left11:15
← teran_ left11:17
→ teran joined11:18
← ghoti left11:18
← daito left11:19
→ felipewm joined11:19
← cagedwisdom left11:19
→ Sicp joined11:19
→ ghoti joined11:19
→ robarelli joined11:20
→ leakybuckit joined11:20
→ ben_alman joined11:20
pikaren what is this font? http://i.imgur.com/I1valOP.png11:21
→ shingshang joined11:22
← QoS left11:22
osse pikaren: try http://www.myfonts.com/WhatTheFont/11:22
→ marcjs joined11:24
← ghoti left11:24
← robarelli left11:24
← mossplix left11:24
← Watabou left11:25
→ zacts joined11:25
→ ghoti joined11:25
→ pierre1_ joined11:25
← john2x left11:26
← ben_alman left11:26
← vtunka left11:26
→ john2x joined11:26
jast pikaren: possibly Andale Mono11:27
→ Gavrisimo joined11:27
← ferreum left11:29
pikaren jast: hmm... it seems quite similar11:29
jast tshirtman: quicker way to get the branch name: git symbolic-ref --short HEAD11:30
→ HeN_ joined11:30
→ tomengland joined11:31
← ghoti left11:31
pikaren osse: that's a cool site... but the suggestion is a bit off for my case11:31
jast pikaren: it's not *actually* Andale Mono... the lowercase L is different11:31
← flappy_bird left11:31
→ ghoti joined11:31
→ scottj joined11:32
← rethus left11:33
← torsten left11:33
← draftqin left11:34
→ BbT0n joined11:34
→ torsten joined11:34
scottj Isn't there a way to show the changes that will be made in the COMMIT_EDITMSG file? I often want to refer to them while writing the commit message11:34
jast scottj: git commit -v11:35
(the changes are not automatically included in the commit message)11:35
scottj jast: thanks11:35
← tomengland left11:35
← Misan left11:36
→ mossplix joined11:36
→ Gizburdt joined11:36
ewet pikaren: look no further ;) http://www.fsd.it/fonts/pragmatapro.htm11:36
← ghoti left11:36
→ ghoti joined11:37
← intellix left11:38
→ tobeplugged joined11:38
→ MacGyver joined11:38
← MacGyver left11:38
→ MacGyver joined11:38
fluter how can I let git think it is not in a repo?11:39
→ reskp joined11:39
jast for what purpose?11:39
akheron GIT_DIR=/does/not/exist maybe?11:40
jast that will give you an error message on many operations11:40
fluter jast, some script checks souce control in my dir, I wanna avoid that11:40
jast right, try the GIT_DIR approach11:41
fluter ah, that works11:41
→ rethus joined11:42
← vijay13 left11:42
← ghoti left11:42
← oskarkv left11:42
→ oskarkv joined11:42
ewet still think this is !xy11:42
→ ferreum joined11:42
jast perhaps the whole script is xy11:42
→ ghoti joined11:43
osse pikaren: I tried it at got an error about the image file itself. Did you do something with it ?11:44
← aarapov left11:44
jast meanwhile I'll go have lunch. perhaps gitinfo will fix itself while I'm gone. :)11:44
← Balliad left11:44
ewet :)11:44
→ _iron joined11:45
→ clone1018_ joined11:46
→ mrpink joined11:46
→ aarapov joined11:47
→ caseydriscoll joined11:47
pikaren osse: nope11:47
→ qknight_ joined11:48
→ a joined11:48
→ runnyspot joined11:48
← ghoti left11:48
→ lemonjelly joined11:48
a → Guest8461511:48
→ samsamm joined11:48
→ dc5ala joined11:48
→ here_ joined11:49
→ hamster joined11:49
→ wcpan_ joined11:49
→ lolmaus_ joined11:49
→ wagle_ joined11:49
→ noname001__ joined11:49
→ razZzz joined11:49
→ JonasF_ joined11:49
→ rjc_ joined11:50
→ pradeepc joined11:50
→ xsbeats_ joined11:50
← Hecter left11:50
→ chris2_ joined11:50
→ robmozart__ joined11:50
→ Moult_ joined11:50
→ Drakevr_ joined11:51
→ elijah_ joined11:51
→ potatoe- joined11:51
→ jonasdk90 joined11:51
→ mackanfk1 joined11:51
→ multi_io_ joined11:51
← jnewt left11:51
→ jonny| joined11:51
→ Balliad joined11:51
← cilly left11:51
→ Orphis joined11:51
← mehdi left11:51
→ cillybabe joined11:51
→ comps_ joined11:51
→ nephyrin joined11:51
→ jnewt joined11:51
→ alorence_ joined11:51
→ Drool joined11:52
→ h12o_ joined11:52
→ mehdi joined11:52
← samsamm777 left11:52
→ BeardlessOne_ joined11:52
samsamm → samsamm77711:52
→ DanielHollands joined11:52
→ ahf_ joined11:52
→ harleypig_ joined11:52
→ Raging_Hog joined11:52
→ chuckharmston__ joined11:52
→ adam_____ joined11:53
→ jeffhung_ joined11:53
→ dsop_ joined11:53
Drakevr_ → Drakevr11:53
→ ping_pong joined11:53
→ vital_ joined11:53
→ sjmikem1 joined11:53
← sjmikem1 left11:53
← Drakevr left11:53
→ Drakevr joined11:53
→ foredoomed joined11:53
→ Khere_ joined11:53
← samsamm777 left11:54
→ Sajbar_ joined11:54
→ arand_ joined11:54
→ mjessome_ joined11:54
→ hiredman_ joined11:54
→ Seveaz joined11:54
→ samsamm777 joined11:54
→ krkini joined11:54
→ sjmikem1 joined11:54
→ kapowaz_ joined11:54
← sjmikem1 left11:54
← toki left11:54
→ mtlatif__ joined11:55
→ ghoti joined11:55
→ iamtakingiteasy joined11:55
→ dglambert__ joined11:55
→ kwmiebach____ joined11:55
← mossplix left11:55
→ PLejeck- joined11:55
→ _richardJ joined11:55
→ ballock_ joined11:55
← elijah left11:55
← tapout left11:55
← sword left11:55
← misterpink left11:55
→ sword joined11:55
← caseydri_ left11:55
elijah_ → elijah11:55
← gua_ould left11:55
← runnyspo1 left11:55
← blast_hardcheese left11:55
← catsup left11:55
← tieTYT left11:55
← jagob left11:55
← here left11:55
→ MrDHat joined11:55
razZzz → raz11:55
← lolmaus left11:55
→ Klumben joined11:55
← wcpan left11:55
← BeardlessOne left11:55
← alorence left11:55
← xsbeats left11:55
← troyt left11:55
← adam____ left11:55
← robmozart_ left11:55
← raz left11:55
→ raz joined11:55
→ kamal_ joined11:56
→ _main_ joined11:56
→ Novacha joined11:56
← __noname001__ left11:56
← JonasF left11:56
← sjmikem left11:56
← harleypig left11:56
← OMGOMG left11:56
← nanotech left11:56
← gitinfo left11:56
← multi_io left11:56
← kwmiebach___ left11:56
← chris2 left11:56
→ sword` joined11:56
← Leoneof left11:56
← scalability-junk left11:56
→ m0ltar joined11:56
→ freestyl3r joined11:56
→ OMGOMG_ joined11:56
→ Vampire0_ joined11:56
→ tieTYT joined11:56
harleypig_ → harleypig11:56
→ drsykb joined11:56
→ OMGOMG joined11:56
← Octalot left11:56
← nephyrin` left11:56
← _ikke_ left11:56
← PLejeck left11:56
→ BaconOverflow___ joined11:56
→ sjmikem joined11:56
→ blast_hardcheese joined11:56
BeardlessOne_ → BeardlessOne11:56
→ _ikke__ joined11:56
adam_____ → adam____11:56
← Droolio left11:56
← tphd left11:56
← dserodio left11:56
← rchavik left11:56
← LimeBlast left11:56
← ronskisika left11:56
← bartman`` left11:56
← vital left11:56
→ jgornick joined11:56
← BbT0n left11:56
← john2x left11:56
→ gnarf joined11:56
← Druide_ left11:56
← ValicekB left11:56
← chrisward left11:56
← dglambert_ left11:56
robmozart__ → robmozart_11:56
← mjessome left11:56
← MrDHat left11:56
← Seveas left11:56
→ bartman`` joined11:56
← WaReZ left11:56
← Vampire0 left11:56
← xrogaan left11:56
← gnarf left11:56
→ gnarf joined11:56
→ dmarr joined11:56
← Bombe left11:56
→ arjun_ joined11:56
→ BbT0n joined11:56
→ Bombe joined11:56
→ brewmaster joined11:56
← Bombe left11:56
→ Bombe joined11:56
→ mjulian joined11:56
→ xrogaan joined11:56
→ MrDHat joined11:56
← ScottE left11:56
→ chriswk__ joined11:56
← sword left11:56
← iamtakin1iteasy left11:56
← WakiMiko left11:56
→ scalability-junk joined11:56
← mjulian left11:56
→ mjulian joined11:56
← xrogaan left11:56
→ xrogaan joined11:56
→ thunderbolt_ joined11:56
→ bandroidx joined11:56
→ dserodio joined11:56
← RichardJ left11:56
→ slax0r joined11:56
← OMGOMG left11:56
→ gitinfo joined11:56
→ Okaria joined11:56
sword` → sword11:56
→ Druide_ joined11:56
← peper left11:56
← chriswk__ left11:56
→ chriswk__ joined11:56
← scalability-junk left11:56
→ scalability-junk joined11:56
← thunderbolt_ left11:56
→ thunderbolt_ joined11:56
Seveaz → Seveas11:56
ChanServ set mode: +o11:56
← dserodio left11:56
→ dserodio joined11:56
← Okaria left11:56
→ Okaria joined11:56
← bandroidx left11:56
→ bandroidx joined11:56
→ rchavik_ joined11:56
→ tapout joined11:56
→ troyt joined11:56
→ luminous joined11:57
→ Leoneof joined11:57
← slax0r left11:57
→ slax0r joined11:57
→ neal__ joined11:57
→ peper joined11:57
→ ConstantineXVI joined11:57
→ nanotech joined11:57
dglambert__ → dglambert_11:57
chuckharmston__ → chuckharmston_11:57
ahf_ → ahf11:57
→ vurma joined11:57
→ MindfulMonk joined11:57
kapowaz_ → kapowaz11:57
→ chrisgward joined11:57
→ jokajak joined11:57
→ ruskie joined11:58
← jonasdk90 left11:58
← Novacha left11:58
→ Novacha joined11:58
← paulweb515 left11:58
→ tplaner joined11:58
→ Rylee joined11:59
_main_ → __main__11:59
← tplaner left11:59
→ ValicekB_ joined11:59
← ghoti left11:59
← blackmesa left12:00
→ mossplix joined12:00
→ hahuang61 joined12:00
→ john2x joined12:00
→ ghoti joined12:01
← pduin left12:01
→ joelroa joined12:01
→ jonasdk89 joined12:01
← Sicp left12:01
chrisgward → chrisward12:01
→ pduin joined12:02
→ sdrfnord1 joined12:02
← sdrfnord1 left12:02
→ takamichi joined12:02
ValicekB_ → ValicekB12:04
→ ggherdov joined12:04
← hahuang61 left12:04
← joelroa left12:05
← SLY1986 left12:05
_ikke__ → _ikke_12:05
← ghoti left12:06
← pduin left12:06
→ ghoti joined12:07
← noxd left12:08
→ reim joined12:08
→ gua_ould joined12:09
→ PeterBoo joined12:10
← PeterBoo left12:10
← PeterBooker left12:11
→ _Vi joined12:11
← vince_prignano left12:11
← joki left12:11
← ghoti left12:12
→ PeterBooker joined12:12
→ Hecter joined12:12
→ ghoti joined12:13
← reskp left12:13
→ reskp joined12:14
→ tgkokk joined12:14
→ joki joined12:17
← mf_ left12:17
→ vijay13 joined12:17
→ mf_ joined12:17
→ Sicp joined12:17
← Sicp left12:17
→ Sicp joined12:17
mf_ → Guest4377212:18
← ghoti left12:18
← vijay13 left12:19
→ ghoti joined12:19
→ n-st joined12:19
→ blinkdesign joined12:20
→ craigp joined12:20
→ Misan joined12:20
→ WaReZ joined12:20
← bartman`` left12:21
n-st hi, i'm trying to remap C-F4, but pressing Ctrl+F4 inserts "1;5S"...12:21
→ robarelli joined12:21
→ WakiMiko joined12:21
← nick108 left12:21
jast n-st: you may be in the wrong channel :)12:21
moritz git doesn't do any character mappings :-)12:21
→ nick108 joined12:22
→ codeFiend joined12:22
luto but you can version your character mappings with git!12:22
n-st oops, that was meant to go on #vim. sorry :/12:22
luto: i already am :)12:22
← Sicp left12:22
moritz only has an edit distance of 212:22
:-)12:22
chris2_ → chris212:22
Keridos_off → Keridos12:23
osse lebensraum distance = 212:23
n-st moritz: well, with three characters, a hamming distance of 2 is quite a lot ;)12:23
→ pduin joined12:24
osse oops, I mean levenshtein distance12:24
← arjun_ left12:24
← ghoti left12:24
moritz pah, relativism!12:24
→ SilverBln joined12:24
→ ss1891 joined12:24
→ ngladitz joined12:24
Keridos → Keridos_off12:25
→ ghoti joined12:25
← robarelli left12:26
← nick108 left12:26
← tgkokk left12:27
torsten how do I stop git from tracking vim .swp files?12:28
→ Xethron joined12:28
← Xethron left12:28
→ Xethron joined12:28
canton7 add *.swp to your .gitignore, git rm --cached offending_files12:29
add, commit, etc12:29
bremner also, don't use commit -a12:29
← sluther left12:29
alorence_ → alorence12:29
→ eletuchy_ joined12:29
← n-st left12:29
bremner I mean you can, if everything is just right with your .gitignore, but these are the kind of problems it leads to12:29
→ n-st joined12:30
osse bremner: commit -a will only commit already tracked files, though12:30
→ skorgon joined12:30
→ kriks joined12:30
← ghoti left12:30
bremner ah, good point.12:30
"git add ." then12:30
osse oui12:30
→ ghoti joined12:31
Guest43772 → mf_12:31
→ nkr joined12:31
→ tomengland joined12:32
← Kayra left12:32
→ fairuz joined12:32
Keridos_off → Keridos12:33
← eletuchy left12:33
← eletuchy_ left12:34
← tomengland left12:36
→ tgkokk joined12:36
← tgkokk left12:36
← ghoti left12:36
← codeFiend left12:36
→ plitzenberger joined12:36
← Gavrisimo left12:37
← fluter left12:37
→ ghoti joined12:37
← fairuz left12:37
→ arjun_ joined12:37
→ GT4066 joined12:38
← Sabbath left12:41
← ghoti left12:42
→ CheckDavid joined12:43
→ cannonball joined12:43
→ ghoti joined12:43
→ sdouglas joined12:44
← ChrisAnn left12:44
→ sohail joined12:45
← sohail left12:45
→ sohail joined12:45
← john2x left12:46
← Leoneof left12:46
→ vince_prignano joined12:47
→ Ericx2x joined12:47
→ DoniRS joined12:47
→ john2x joined12:48
← ghoti left12:48
→ becks__ joined12:48
← sdouglas left12:48
← luminous left12:49
→ luminous joined12:49
→ ghoti joined12:49
→ shpoont joined12:49
← Guest72372 left12:50
← Advocation left12:51
→ Advocation_ joined12:51
→ northfurr joined12:51
→ eletuchy joined12:52
→ nick108 joined12:52
→ deciph3r joined12:52
→ mani2399 joined12:52
← ghoti left12:54
→ harish joined12:55
→ ghoti joined12:56
→ saurabh joined12:56
← cads left12:56
← nick108 left12:56
→ omarek joined12:56
saurabh → Guest55912:56
← mani2399 left12:57
→ intellix joined12:57
omarek Hi, I accidentally made a mess and commited older version of 4 images to production. I want to restore the 4 images from previous commit and make a push to origin from production.12:57
What command can do this ?12:57
→ bicyclette joined12:58
→ cads joined12:58
omarek I know I 0) git is not a deployment tool 1) no one should ever push FROM production, but this project is a mess anyway and I'm trying to keep my head above water surface.12:58
grumbel_ omarek: You can checkout old versions of those files using git checkout <commit-id-from-where-to-get-the-images> -- <image-filenames>12:59
then commit & push12:59
← NCS_One left13:00
→ conan joined13:00
← ghoti left13:00
scottj I clone upstream, create feature branch, create commits, create fork on github, add my fork as remote, now how do I associate my feature branch with my remote so that I can push it to my github correctly?13:01
→ ghoti joined13:02
← zumba_ad_ left13:02
_ikke_ scottj: git push <remote> feature13:02
← teran left13:02
→ joelroa joined13:02
moritz scottj: git push -u <yourremote> <branchname>13:02
_ikke_ where remote is the name of the remote for your fork13:02
creating tracking information for feature branches is not really useful imo13:02
because they're usually short-lived13:02
rjc_ → rjc13:03
→ teran_ joined13:03
scottj _ikke_: moritz: thanks13:03
moritz merged a feature branch yesterday that started in December13:03
_ikke_ usually13:03
and it's still short-lived relative to other branches13:03
slax0r long ass feature13:04
← jaequery_ left13:04
→ IrishPrime joined13:04
← nnyk_ left13:05
← fr33 left13:05
Keridos → Keridos_off13:05
→ vtunka joined13:06
← xsbeats_ left13:06
samsamm777 is away: Gone away for now13:06
← filter left13:07
omarek grumbel_: thank you.13:07
← joelroa left13:07
← plitzenberger left13:07
← ghoti left13:07
→ Gavrisimo joined13:08
→ ghoti joined13:08
scottj so is the above workflow I outlined the one you guys recommend for new contributing to projects? I like it because when I clone initially I'm often not planning on contributing, so this allows me to see if I can make the changes correctly (and often give up) before having to bother forking on github. when I add my remote, should I always make it origin or just use my username?13:09
→ boblee joined13:09
Vampire0_ → Vampire013:10
slax0r that's up to you13:10
moritz scottj: I usually do it the same as you, for the same reasons. And my remote name is usually my github user name13:10
→ AndreasLutro joined13:11
← Roots47 left13:11
← Juzzika left13:11
AndreasLutro anyone know of a way to make `git tag -l` sort versions correctly? 0.1.10 is appearing before 0.1.213:11
→ Kayra joined13:12
Vampire0 rawtaz, you're welcome13:12
← Gavrisimo left13:12
rawtaz :)13:12
← yacks left13:12
moritz AndreasLutro: maybe pipe it through | sort -n ?13:13
← ghoti left13:13
→ jaequery joined13:13
AndreasLutro apparently there is a sort -V13:13
that's pretty awesome13:13
osse AndreasLutro: there's a proposed patch to make tag have builtin version sort. Right now you're best bet is git tag | sort -V13:14
AndreasLutro cool13:14
osse but -V is fairly recent and specific to GNU sort (I think)13:14
AndreasLutro would that work as a git alias?13:14
or do I need to make a bash alias/function13:14
← skorgon left13:14
← Raging_Hog left13:14
→ ghoti joined13:14
osse AndreasLutro: git config alias.tagsort '!git tag | sort -V'13:14
AndreasLutro: a Git alias starting with '!' will execute as an external command13:15
AndreasLutro osse: awesome, thanks :)13:15
add -n to that tag alias and that's one damn sweet alias13:17
← reskp left13:17
→ nick108 joined13:17
← intellix left13:18
→ skorgon joined13:18
← jaequery left13:18
→ Nickeeh joined13:18
← ghoti left13:19
osse hmm, do you need -n when you use -V ? o_O13:20
← Balliad left13:20
AndreasLutro no13:20
-n just shows the tag message13:20
amoe When switching branches, git moves unstaged changes in tracked files to the new branch if they do not conflict. Is there any way to get git to complain and force you to commit the changes instead?13:20
→ ghoti joined13:20
osse ahh13:20
→ ben_alman joined13:21
← conan left13:21
→ robarelli joined13:22
→ xsbeats joined13:22
→ paulweb515 joined13:22
→ tplaner joined13:22
← tplaner left13:22
→ tplaner joined13:22
osse AndreasLutro: might want to add | less -FX too :)13:23
but that's a preference thing13:23
→ Balliad joined13:23
← skorgon left13:24
→ skorgon joined13:24
← ben_alman left13:24
→ bluesm joined13:25
← ghoti left13:25
→ joelroa joined13:26
→ zivester joined13:26
grumbel_ amoe: you'll probably have to write a small script that does that yourself (fail if WD not clear, otherwise checkout branch) and call that, maybe through a git alias13:26
← robarelli left13:26
→ modocache joined13:26
→ ghoti joined13:26
AndreasLutro osse: that's super awesome :D13:26
→ AAADS40 joined13:27
osse AndreasLutro: hmmmmmmmmm... since the pager is doing its thing now maybe sort -r would be appropriate13:27
^_^13:27
→ Silmarilion joined13:27
AndreasLutro -rV ?13:27
makes sense13:28
though...13:28
← marcjs left13:28
← paulweb515 left13:28
AndreasLutro not sure, but you've given me plenty to play around with :D13:28
osse hmm, that was certainly not my intetion. Go outside and play! Fresh air!13:29
amoe grumbel_: thanks, will look into it :)13:29
AndreasLutro after work13:29
;)13:29
osse play in the sandbox and the swing set thingy13:29
← skorgon left13:30
← joelroa left13:30
→ conan joined13:31
→ skorgon joined13:31
← ghoti left13:31
← shpoont left13:31
osse AndreasLutro: FYI the patch to git-tag itself has made it to the "proposed updates" branch so it'll be in Git eventually13:32
→ ghoti joined13:32
AndreasLutro gotcha13:32
but I like learning to do stuff like this regardless13:32
→ dougsland joined13:33
osse me too13:33
← Balliad left13:33
→ Dudi joined13:33
→ reskp joined13:34
← CodeShark left13:34
→ Not_Whatever joined13:34
→ CodeShark joined13:34
→ Balliad joined13:34
→ mourest joined13:35
← Guest559 left13:35
→ Juzzika joined13:36
← skorgon left13:37
← ghoti left13:37
→ skorgon joined13:37
samsamm777 is back.13:38
→ Leoneof joined13:38
→ yacks joined13:38
→ ghoti joined13:38
→ luxgeek joined13:39
← sohail left13:39
→ dort joined13:39
→ polyzen joined13:39
← aarapov left13:40
← ewet left13:41
→ paulweb515 joined13:42
← ghoti left13:43
← skorgon left13:43
→ ghoti joined13:44
→ smashwilson joined13:44
→ sdouglas joined13:44
← felipewm left13:45
→ daito_ joined13:45
→ marcosc joined13:48
← ghoti left13:48
→ Guest559 joined13:49
→ OliverJAsh joined13:49
← OliverJAsh left13:49
← sdouglas left13:49
→ ghoti joined13:49
← eletuchy left13:50
marcosc Hi, I'm on a Mac and I'm wondering how do I tell git to not change the line endings from files that were created on Windows?13:50
→ ojacobson joined13:50
→ scelis joined13:50
_ikke_ git config --global core.autocrlf input13:51
osse the default is for it not to, I think13:51
marcosc _ikke_: thanks!13:51
→ awx joined13:51
_ikke_ marcosc: read also !crlf13:51
gitinfo marcosc: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/13:51
→ phanimahesh joined13:52
gitinfo set mode: +v13:52
← daito_ left13:52
← Guest559 left13:53
→ m0viefreak joined13:53
← beautifulmind left13:53
→ tmcmahon joined13:54
→ angelleye joined13:54
→ jiriki- joined13:54
← jiriki- left13:55
← ghoti left13:55
→ sdouglas joined13:55
→ jiriki joined13:55
→ ghoti joined13:55
angelleye I'm on Windows. Say I have a repo with a master branch, and I create a new branch called feature1. In feature1 I create some folders, files, etc. I commit everything, but it's not done yet, so I don't merge anything yet. Then I checkout master, but when it switches I end up with error that it can't delete directories, and it leaves behind any new folders I had created in the feature1 branch.13:56
→ mizu_no_oto joined13:56
moritz angelleye: what is the exact error message?13:56
→ saurabh joined13:57
angelleye mortiz: let me see if I can re-create it real quick and see...13:57
← tmcmahon left13:57
saurabh → Guest9856513:57
grumbel_ angelleye: the directory might be open by some process (such as the shell where you do your git commands); windows is a bit picky abount deleting folders that are working directories of a life process13:58
← omarek left13:58
angelleye Yeah, I t hink it's a permissions issue13:58
But is there no way around that? everybody just deals with it..??13:58
moritz people just use different operating systems :-)13:59
→ noxd joined13:59
→ buffal0 joined13:59
angelleye Still not the majority13:59
moritz of git users? I wouldn't be so sure13:59
← vtunka left14:00
← Anticom left14:00
osse angelleye: is this on a network drive, by any chance?14:00
angelleye osse: no14:00
← Kayra left14:00
← ghoti left14:00
← jsilver_ left14:01
→ jsilver joined14:01
→ ghoti joined14:01
angelleye Just about to see if I can reproduce this...14:01
_ikke_ Not perchance using git submodules?14:02
angelleye Ha, well, of course. I setup a little demo to try and reproduce and it's not happening here.14:02
grumbel_ angelleye: I'm using git on windows frequently and never had that issue, so it's probably not broken by default14:02
angelleye So yeah, I've got something unique going on.14:02
→ NCS_One joined14:03
moritz I guess it depends on the programs you use to work with the files in the git repo14:03
ska-fan I have an option set in ~/.gitconfig. How do I disable it for one command on the command line?14:03
moritz and whether they keep file handles open14:03
→ nnyk_ joined14:03
angelleye Yeah, must be something hanging on to it. I'll figure it out. Thanks.14:04
grumbel_ angelleye: probably yes; note the exact error message next time, that should help14:04
→ tham joined14:04
← angelleye left14:04
← rob_w left14:04
→ Mitchbones joined14:04
← IrishPrime left14:04
→ Diemuzi joined14:04
gitinfo set mode: +v14:04
← simesy left14:05
→ sohail joined14:05
← nilg left14:06
→ nilg` joined14:06
← MattStra_ left14:07
→ intellix joined14:07
← lolmaus_ left14:08
→ Gavrisimo joined14:08
→ lolmaus joined14:08
→ mnml joined14:09
→ rob_w joined14:10
→ ntio joined14:10
→ enigmus joined14:10
← takamichi left14:11
Naeb → Naeb|Away14:11
← Naeb|Away left14:11
← thegorn left14:11
→ jackneill joined14:12
← mizu_no_oto left14:12
← conan left14:12
← reskp left14:13
← Gavrisimo left14:13
→ takamichi joined14:13
← takamichi left14:13
→ H4D3rach joined14:14
→ reskp joined14:14
→ takamichi joined14:14
← reskp left14:15
← cads left14:15
→ reskp joined14:15
→ mizu_no_oto joined14:15
→ Raging_Hog joined14:16
→ conan joined14:16
→ aarapov joined14:16
← conan left14:17
→ FortySix2 joined14:17
→ tfb joined14:17
← enigmus left14:17
→ IrishPrime joined14:18
→ Dudi_ joined14:19
← avolz left14:20
← H4D3rach left14:20
→ elrolito joined14:20
→ tgkokk joined14:21
→ the_cybersphinx joined14:21
→ Naeb joined14:21
← FortySix2 left14:21
← the_cybersphinx left14:22
→ Gamecubic joined14:22
→ robarelli joined14:22
← Dudi left14:23
→ the_cybersphinx joined14:25
← Silmarilion left14:25
→ yhager joined14:25
← m0ltar left14:26
→ enigmus joined14:26
← dhilipsi_ left14:26
→ FortySix2 joined14:26
← robarelli left14:26
→ joelroa joined14:27
→ AaronMT joined14:27
→ dhilipsiva joined14:27
→ haasn joined14:27
haasn In git, is it possible to copy a single file from another branch? I don't need the commits, just the file as it would be had I checked out that branch14:28
canton7-mac git co branch -- path/to/file14:29
ojacobson 'git checkout <tree-ish> -- <paths>' will stage and check out <paths> from <tree-ish> against the current work tree & head14:29
→ jcvfen joined14:29
← Gamecubic left14:30
→ Gamecubic joined14:31
torsten how should I name brances? no whitespaces?14:31
haasn canton7-mac: thanks. I'm a bit confused; after running this, my path/to/file shows the code I'd expect it to contain - but `git diff` doesn't show any changes. `git commit -p` says “modified: path/to/file” but that's it. How come it doesn't show up as an actual change?14:31
→ m0ltar joined14:31
_ikke_ torsten: correct, no whitespace14:31
← joelroa left14:31
← dhilipsiva left14:32
canton7-mac haasn, 'git diff' shows the difference between the working copy and the last commit14:32
torsten _ikke_: and how do I checkout a branch with whitespaces? "" doesnt work for me14:32
← yhager left14:32
canton7-mac 'git diff --cached' shows the difference between the staged file and the last commit14:32
* 'git diff --cached' shows the difference between the staged file and the working copy14:32
hmm I've got myself in a muddle now14:33
'git diff HEAD' shows everything, anyway14:33
haasn canton7-mac: oh, I understand; because git checkout <branch> -- path/to/file already adds it as in “git add path/to/file”?14:33
→ phantomtiger joined14:33
canton7-mac yeah, --cached is staged -> previous commit14:33
ojacobson canton7-mac: 'git diff' compares staging area and work tree.14:33
'git diff --staged' compares HEAD and staging area14:33
haasn canton7-mac: thanks, that helps14:33
ojacobson 'git diff HEAD' compares HEAD and work tree14:33
→ Dougie187 joined14:34
→ Neozonz|Discx2 joined14:35
Neozonz|Discx2 → Guest2815414:35
→ simesy joined14:35
→ infynyxx joined14:36
→ RaceCondition joined14:36
→ dik_dak joined14:37
← infynyxx left14:37
→ fairuz joined14:39
marcosc _ikke_: I'm still seeing: "warning: CRLF will be replaced by LF in ..."14:39
→ plitzenberger joined14:39
→ infynyxx joined14:40
→ rudisimo joined14:40
_ikke_ marcosc: .gitattribute?14:40
← mizu_no_oto left14:40
→ lmat joined14:40
marcosc _ikke_: I don't have one14:40
_ikke_ marcosc: git config -l14:41
marcosc ah, it's still "core.autocrlf=false"14:41
← RaceCondition left14:42
→ CKyle joined14:43
← Guest98565 left14:43
marcosc _ikke_: I did "git config --local core.autocrlf input"14:43
← simesy left14:44
marcosc and did a reset14:44
but still seeing the affected files14:44
← hkon_ left14:44
→ MattStratton joined14:46
← tplaner left14:47
← ivank left14:48
→ darnir_ joined14:49
← tgkokk left14:49
samsamm777 is away: Gone away for now14:49
← aarapov left14:49
→ daito_ joined14:49
← mrpink left14:50
ojacobson samsamm777: please disable whatever client feature you're using that sends away notices to channels you're in.14:50
← flaguy48 left14:50
→ eletuchy joined14:50
→ yhager joined14:50
→ misterpink joined14:50
ojacobson There are several hundred people here, and exactly none of them care; use /away instead, which makes it available to anyone who _is_ interested via /whois.14:51
→ LuxuryMode joined14:51
← rob_w left14:51
lb1a ojacobson, hm i should make a bot trigger with that phrase :D14:51
ojacobson lb1a: we have one in ##java14:52
lb1a ahh :D14:52
ojacobson http://sackheads.org/~bnaylor/spew/away_msgs.html14:52
(it used to be a somewhat crass rant about "we don't care if ...")14:52
(I miss the crass rant :)14:52
→ RaceCondition joined14:52
bremner we should make a bot trigger that sets mode +q ...14:53
→ JerryT joined14:53
lov ojacobson: please don't turn #git into #java :(14:53
← daito_ left14:54
← m0ltar left14:54
lb1a ojacobson, that's hilarious14:55
← eletuchy left14:55
ojacobson lov: Of course not.14:55
← DoniRS left14:55
→ MattMake_ joined14:55
← MattMaker left14:56
→ jonatasnona joined14:56
→ DoniRS joined14:56
← jonatasnona left14:57
← leakybuckit left14:57
→ thiago joined14:57
→ _elrolito joined14:58
← ifdm_ left14:58
← elrolito left14:59
→ facundor joined14:59
← takamichi left14:59
← ntio left15:00
Guest28154 → Neozonz15:00
← modocache left15:00
← Neozonz left15:00
→ Neozonz joined15:00
→ hyperair joined15:01
→ teran joined15:01
← Dudi_ left15:01
← tfb left15:01
→ Noldorin joined15:01
→ jds joined15:02
→ vtunka joined15:02
→ jaequery joined15:02
← jaequery left15:03
→ flaguy48 joined15:03
← SorenHolm left15:04
← teran_ left15:04
← john2x left15:04
→ mani2399 joined15:04
← mani2399 left15:04
→ gnugnu8 joined15:04
← arjun_ left15:04
← darnir_ left15:05
→ mani2399 joined15:05
← drsykb left15:05
← mani2399 left15:05
← infynyxx left15:05
→ mani2399 joined15:05
→ wongon joined15:06
← mani2399 left15:06
→ tphd joined15:06
→ acharlieh joined15:06
← tphd left15:06
→ mani2399 joined15:06
← Gitzilla left15:06
← mani2399 left15:06
→ Gitzilla joined15:07
→ saikrishna_ joined15:07
BaconOverflow___ → BaconOverflow15:07
cfedde_ → cfedde15:07
→ endiruna joined15:08
→ infynyxx joined15:08
→ m0ltar joined15:09
→ Gavrisimo joined15:09
→ takamichi joined15:09
→ mani2399 joined15:10
→ el3ctron_ joined15:11
→ InvidFlower joined15:11
→ ntio joined15:12
← BeardlessOne left15:12
→ lindenle joined15:13
← Gavrisimo left15:14
lmat marcosc: did you try git clean ?15:14
← sdouglas left15:14
→ ifdm_ joined15:14
→ sdouglas joined15:15
samsamm777 is back.15:15
flazz → flazz_gone15:17
← jcvfen left15:17
← enigmus left15:17
← endiruna left15:17
→ endiruna joined15:17
→ jcvfen joined15:18
→ merica joined15:18
→ cwillu_at_work joined15:18
← yhager left15:19
← sdouglas left15:19
← jcs222 left15:20
← m0ltar left15:21
← dort left15:21
← dc5ala left15:21
→ prophile joined15:22
← papegaaij left15:22
← tureba left15:23
prophile the answer to the question I'm about to ask is liable to be "that's a terrible idea" but is there a mechanism for automatic push on commit?15:23
(this is for essentially keeping a remote backup on a private project)15:24
→ SicoAnimal joined15:24
← SicoWork left15:24
lov that's a terrible idea!15:24
→ tureba joined15:24
← Lemony left15:24
lov you could probably set up a post-commit hook or something15:25
→ Gavrisimo joined15:25
prophile ah yes, of course15:25
thanks lov15:26
→ Lemony joined15:26
→ marcjs joined15:26
→ werlley joined15:27
← DoniRS left15:27
← cff left15:27
→ sdouglas joined15:27
→ joelroa joined15:28
← tureba left15:29
osse make sure to use puah -f so that it works when you commit --amend too :P15:29
→ koell joined15:29
prophile osse: a valid observation, although that defeats the backup idea if I do something monumentally stupid :)15:30
→ ErKa joined15:30
osse correct15:30
← thiago left15:30
osse I wonder if the hook is triggered when rebase is used15:30
Naeb → Naeb|Away15:31
← Naeb|Away left15:31
← kbart left15:31
← jokajak left15:32
→ noisewaterphd_ joined15:32
← joelroa left15:32
← noisewaterphd_ left15:32
→ SicoWork joined15:32
→ thiago joined15:33
→ DoniRS joined15:33
→ ewet joined15:33
← SicoAnimal left15:33
← rchavik_ left15:33
← shruggar left15:33
→ dort joined15:34
→ shruggar joined15:34
← ferreum left15:35
→ axl_ joined15:36
→ kermit joined15:36
← flaguy48 left15:36
← jluc left15:38
→ jluc joined15:38
→ FatDarrel joined15:38
→ mizu_no_oto joined15:38
→ ni__ joined15:39
← dort left15:39
← pikaren left15:39
→ simesy joined15:40
← polyzen left15:41
← genehack left15:41
← Hecter left15:42
→ genehack joined15:42
→ livingstn joined15:42
Nevik it does not defeat the backup15:42
at least not entirely15:42
← Xethron left15:42
Nevik though you might want to add some magic to the remote for practicality15:42
lov ^^15:42
I also assumed that you were using it as a "backup" in the sense of "Oh no, my computer burst into flames while I was working!"15:43
Nevik (force-pushing does not delete anything from the remote, the worst it can do is make stuff unreferenced)15:43
so a post-receive hook which creates backup-refs to any commits that get unreferenced by a push would take care of that15:43
← infynyxx left15:44
prophile Nevik: that makes sense15:44
← simesy left15:44
→ zumba_addict joined15:44
prophile I assume there's no "don't ever prune me" flag in git config?15:45
→ tureba joined15:45
Nevik you mean "dont ever garbage-collect me" ?15:45
→ akitada joined15:45
grawity just have an infinite reflog? :P15:45
Nevik indeed15:45
prophile more or less, although I understand git gc does repacking and other such things in addition to removing unreferenced objects?15:45
grawity: you are very wise15:46
moritz set gc.pruneexpire to something very, very long?15:46
→ zezollo joined15:46
prophile well now I'm just swamped with choices15:46
← FatDarrel left15:46
moritz poor you15:47
→ zackiv31 joined15:47
prophile why can't git be hobbled and incapable of doing anything useful like CVS15:47
moritz :-)15:47
→ sigspec joined15:47
← wasabii left15:48
← lindenle left15:48
→ pikaren joined15:48
zezollo hi folks, i just tried "git <hash>", just looked around (made no changes) and want to come back to the current state. Is "git <last_commit_hash>" enough?15:48
no, it was git checkout <hash>15:48
← saikrishna_ left15:48
grawity you're probably looking for `git checkout master`15:48
← lb1a left15:49
grawity or `git checkout -` for the "previous" state15:49
→ tfb joined15:49
← tureba left15:49
← ntio left15:49
prophile I did not know about `git checkout -`15:49
clearly I need to sit in this channel more often15:49
→ saikrishna_ joined15:49
zezollo `git checkout master` brings me only to the master branch, same state; i'll try git checkout -15:49
grawity what "state" are you looking for, then?15:50
→ tureba joined15:50
prophile zezollo: if you want to remove changes in the working tree, `git reset --hard` and the rather terrifying `git clean -f` may be more what you're looking for15:50
flazz_gone → flazz15:50
→ Silmarilion joined15:50
← lite_ left15:50
← lolmaus left15:50
xender checkout -?15:51
→ lolmaus joined15:51
→ xaq joined15:51
→ lindenle joined15:51
zezollo no, i don't need to remove changes15:51
xender Is '-' something like 'HEAD@{1}'?15:51
→ elrolito joined15:51
← reskp left15:51
← Balliad left15:51
→ eletuchy joined15:51
zezollo i don't jump to another commit with git checkout -15:51
← _elrolito left15:52
→ reskp_ joined15:52
← sigspec left15:52
sonOfRa Is it possible to have 'git merge --log' to include the COMPLETE commit messages in the log, instead of just the first line/subject?15:52
→ ntio joined15:53
→ enigmus joined15:53
← vmiklos left15:53
← tureba left15:54
← ni__ left15:54
zezollo current work is at commit af547b3; i jumped to commit 771ea90 (using git checkout 771ea90) just to check some things (no changes at all) ; now if i 'git checkout af547b3', it jumps back to current state BUT says "You are in 'detached HEAD' state." + explanations: this does not seem the normal state.15:55
how do i come back to the last commit in a normal state, then ?15:55
_ikke_ zezollo: You need to check out the branch instead of the commit15:55
← makubi_ left15:56
← FortySix2 left15:56
sonOfRa We're still using CVS at work, and git cvsimport and friends are working nicely, but I'd like to have the option of including my FULL commit messages into the commit created by git cvsexportcommit, instead of just the summary15:56
→ starfox21 joined15:56
← eletuchy left15:56
_ikke_ I don't think there is an option15:56
→ whowantstolivef2 joined15:57
→ makubi joined15:57
→ sambae joined15:57
← whowantstolivef3 left15:57
→ lithiumjake_ joined15:57
← shingshang left15:57
→ shawndumas joined15:58
← smashwilson left15:58
← ntio left15:58
→ achadwick joined15:58
zezollo _ikke_: if i am still at commit 771ea90 (the old one), if i change to master, then i am still at commit 771ea90. Or do you mean the 'detached HEAD' state just means git is on no branch and I just need to checkout the right branch then ?15:58
→ ntio joined15:58
grawity the latter15:59
→ MyTallest joined15:59
← pikaren left15:59
← mewm left15:59
← axl_ left15:59
← lithiumjake left15:59
starfox21 hey guys, I'm new to git, I have an application on Heroku and I am about to push to it. What is the best way to visualize the commits that are going to get pushed from my local master to the master on Heroku.16:00
← bgerber left16:00
_ikke_ zezollo: correct16:00
→ maestrojed joined16:01
_ikke_ starfox21: usually "git log @{u}.."16:01
zezollo ok, thanks! cool!! i was afraid to be lost in my commits' world :)16:01
grawity git fetch origin && git log --oneline origin/master..master16:01
← roelmonnens left16:01
→ roelmonnens joined16:02
starfox21 _ikke_: what does the @{u} refer to?16:02
← thevishy left16:02
← ifdm_ left16:03
→ torjus joined16:03
← MyTallest left16:03
lov upstream16:03
grawity short for @{upstream}; whatever branch was configured to be the current branch's upstream.16:03
`man gitrevisions`16:03
gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html16:03
starfox21 thanks guys!16:04
→ jerius joined16:04
← sdouglas left16:06
← roelmonnens left16:06
← haasn left16:06
→ sdouglas joined16:06
← tham left16:07
→ pikaren joined16:07
→ xMYTHICx joined16:08
← konadr1 left16:08
→ FortySix2 joined16:10
→ aarapov joined16:10
← Gizburdt left16:10
→ jokajak joined16:10
→ angelleye joined16:10
← sdouglas left16:11
→ testoas joined16:11
← xsbeats left16:11
→ cads joined16:11
→ aberrant joined16:11
← lavong left16:11
← cbreak_ left16:12
← xaq left16:13
→ goTAN joined16:13
→ jaequery joined16:13
← phanimahesh left16:13
angelleye I'm in a local repo that when I do git branch -r, it displays 3 remote branches, 1 of which was deleted from the remote already. If I do a git fetch I get nothing, but if I try to do a git push origin --delete branchname then it tells me it can't find it so it can't delete, which makes sense, but I don't know how to get rid of it from this local repo..??16:14
← leeN left16:14
→ bambams_ joined16:14
grawity git fetch --prune16:14
← jargon left16:14
→ asakura0 joined16:15
canton7-mac there's also a config option to enable that by default iirc16:15
angelleye grawity: beautiful, thank you16:15
← mnml left16:15
canton7-mac fetch.prune, yeah16:15
→ nszceta joined16:15
← pduin left16:15
→ diegoviola joined16:15
angelleye canton7-mac: i'll check that out, too, thanks16:15
→ axl_ joined16:15
← hyperair left16:15
testoas Hello I have some trouble with git. A team member added some files, committed and pushed it. Now I do a PULL. The new files come to me, so all seems to be well. But all this new files are not known by git. When I tried to commit my changed files, the files of the other team member on my space seems to be new for git and I should add and commit them16:16
. Why??? I dont want to touch the files, because I have nothing done to it.16:16
grawity you could also delete those remote-tracking branches manually with `git branch -r -d` or `git update-ref -d`16:16
← vince_prignano left16:16
→ tureba joined16:16
angelleye prune did the trick16:17
← takamichi left16:17
bambams_ testoas: Can you pastebin your `git status'?16:17
← deciph3r left16:17
→ takamichi joined16:17
← angelleye left16:17
→ rq60 joined16:18
→ whowantstolivef1 joined16:18
→ ifdm_ joined16:18
→ robarelli joined16:18
→ sdouglas joined16:18
→ vmiklos joined16:18
← LuxuryMode left16:19
testoas no not now. but all the files marked as "new file: nameOfFile.txt"16:19
← lindenle left16:19
→ blackmesa joined16:19
→ Kayra joined16:19
← whowantstolivef2 left16:20
→ tyreld joined16:20
testoas the big problem is: sometimes it happens to someone of the team, but we cant reproduce this.16:20
osse testoas: where did the team member push to?16:20
bambams_ testoas: PEBKAC. Unless you have discovered a very obscure error. But unless you can show us exactly what's happening it's hard to help.16:20
← sdouglas left16:20
bambams_ s/error/bug/16:20
testoas push to our central-repo on a network share, we dont have a server yet16:20
goTAN so I am working with a remote repository and I am changing stuff and my friend does and I know that we have to merge at some point but I don't want to merge now but I still want to have both changes on the server (where the remote repo is) so how do I do that? making a new branch?16:21
← tureba left16:21
osse testoas: maybe he commited them to a different branch than the one you're on?16:21
← iokill left16:21
bambams_ goTAN: Yes, you can put your changes in a new branch. Remotely, locally, or both.16:22
→ Dudi joined16:22
← foredoomed left16:23
→ tureba joined16:23
testoas no both works on the same branch.16:23
← teran left16:23
bambams_ goTAN: The simplest way would be to set git push $remote master:$feature16:23
goTAN ok so I need to do it the way my friend still can push origin/master16:23
← arvind_khadri left16:23
bambams_ s/set //16:23
testoas if he would add the files to a different branch I would expect not to see the new files in my branch until merging16:24
← NCS_One left16:24
→ teran joined16:24
← enigmus left16:24
goTAN testoas: I want to create a new branch he should work on the main one16:24
bambams_ goTAN: E.g., git push origin master:space-robot16:24
→ ni__ joined16:24
bambams_ goTAN: If you want to create a new branch locally too you can use checkout -b.16:24
← GT4066 left16:25
goTAN bambams_: the branch should be on the remote (since it get backups)16:25
bambams_ goTAN: After creating your new branch you can also reset master back to origin/master so you don't accidentally merge.16:25
← rath left16:25
bambams_ goTAN: Yes, the push commands I demonstrated would put it on the remote server. The key to giving it a different branch on the server is the colon (:).16:25
goTAN: See the description of refspecs in man git-push.16:26
gitinfo goTAN: the git-push manpage is available at http://jk.gs/git-push.html16:26
goTAN ah so git push origin master:mynewbranch will add a new branch to remote with my current changes16:26
marcosc lmat: tried, didn't seem to help16:26
still getting "warning: CRLF will be replaced by LF" :(16:27
← ThomasLocke left16:27
→ eletuchy joined16:27
bambams_ goTAN: Yes.16:27
testoas osse: no both works on the same branch. if he would add the files to a different branch I would expect not to see the new files in my branch until merging16:27
← dik_dak left16:27
→ conan_ joined16:28
goTAN bambams_: ok thanks alot16:28
→ lite_ joined16:28
→ joelroa joined16:28
lmat marcosc: Oh, I wasn't quite following :) So, you git reset --hard, then git status shows some files ?16:29
marcosc yeah16:29
lmat marcosc: And it seems to you that these files are showing up because of line ending problems ?16:29
marcosc yes, exactly16:29
git status says so16:29
→ starkhalo joined16:29
lmat marcosc: interesting.16:29
marcosc: can you git checkout those files ?16:30
marcosc tried, it makes no difference16:30
osse testoas: when you pull you do actually merge. Still it's weird it says "New file:"16:30
→ deciph3r joined16:30
← deciph3r left16:30
→ deciph3r joined16:30
lmat marcosc: Let me try to reproduce...16:30
thunderbolt_ → thunderbolt16:30
osse testoas: unless of course there were conflicts and the merge isn't done yet. I would read git status carefully16:30
→ francesca joined16:30
lmat marcosc: I have a file and I converted it to crlf line ending (only one)., then git status says16:31
← HelperW left16:31
← nick108 left16:31
← eletuchy left16:31
lmat git status says modified as expected...16:31
git reset --hard; git status; returns nothing.16:32
marcosc: How can I reproduce ?16:32
← lite_ left16:32
→ dik_dak joined16:32
→ cagedwisdom joined16:32
marcosc lmat: hmmm... I'm using the Mozilla Gecko repo... don't know if that helps16:32
← jaequery left16:32
lmat marcosc: Of course, there are some things you can try: git checkout file, rm file; git reset; and others, but I don't know what will work :)16:32
marcosc: I'm not interested in cloning the Mozilla repo ;)16:32
→ infynyxx joined16:32
marcosc heh, lmat... didn't think you would be16:33
:)16:33
← W0rmDr1nk left16:33
← joelroa left16:33
→ ferreum joined16:33
← githogori left16:33
lmat marcosc: perhaps you can mkdir /tmp/something; cd /tmp/something; git init; echo "hey" > hey; git add hey; git commit -a;16:33
marcosc lmat: I'll try to delete the files16:33
samsamm777 is away: Gone away for now16:33
testoas osse: i know. there should not be any merge conflicts when a new file does appear. I dont know why the new files are not known by git and should be re-added or re-commited16:33
lmat samsamm777: don't do that.16:33
← ehmatthes left16:33
testoas osse: weird is the right word :)16:34
marcosc lmat: trying16:34
osse testoas: are they staged for commit? In that case they weren't the source of a conflict16:34
← reskp_ left16:34
→ tomengland joined16:34
← lolmaus left16:34
← gua_ould left16:34
→ NCS_One joined16:34
→ lolmaus joined16:34
marcosc lmat: all works fine there16:35
lmat: now what?16:35
lmat marcosc: :(16:35
marcosc: just flail around in the mozilla repo ^_^16:35
zumba_addict hi folks16:35
marcosc lmat: I'll ask them. They might know how to fix this... hundreds of people contribute to that project16:36
testoas yes they are staged for commit. but when user A added new files, and user B pulled this files I dont understand why user B should commit them too. user B only get the files but dont changed them.16:36
→ reskp joined16:36
samsamm777 is back.16:36
→ infynyxx_ joined16:36
← infynyxx_ left16:36
osse testoas: you are in a merge conflict. But some other files are the source of the problem. Read git status carefully16:36
← FortySix2 left16:37
lmat samsamm777: stop doing that :)16:37
osse testoas: pull does two things: fetch and merge. You are merging. The pull as a whole isn't done yet.16:37
→ infynyxx_ joined16:37
← infynyxx_ left16:37
ojacobson samsamm77: http://sackheads.org/~bnaylor/spew/away_msgs.html16:37
this is not a request; if you insist on telling all several-hundred of us when you go away and come back, I will happily remove you from the channel to save others the additional natter.16:37
→ infynyxx_ joined16:37
← infynyxx_ left16:37
← reskp left16:37
testoas osse: ok I will do that. but why the new files marked as "new file" when the conflict is another file?16:38
→ infynyxx_ joined16:38
← infynyxx_ left16:38
← paddy left16:38
→ jogos joined16:38
← infynyxx left16:38
→ infynyxx_ joined16:39
← vmiklos left16:39
← tomengland left16:39
→ vmiklos joined16:39
← plitzenberger left16:39
→ rbartos joined16:39
← xMYTHICx left16:40
testoas osse: thanks. tomorrow I ask the user for his broken repo and check git status a twice. then I can post it here too if I cant fix it.16:40
← infynyxx_ left16:40
← goTAN left16:40
← ghostlines left16:42
→ jaequery joined16:42
← lolmaus left16:42
← testoas left16:42
← xlinkz0 left16:42
→ ecvon joined16:43
← mossplix left16:43
→ endra joined16:43
ralf-x sigh. ok so I need some help16:43
→ lolmaus joined16:43
← Raging_Hog left16:44
ralf-x I have master and a topic branch. I merged a couple of changes from the topic branch to master a while back but now I need to merge the entire topic branch to master16:44
→ sachin06j joined16:44
grawity git checkout master; git merge topic16:44
ralf-x it's only wanting to merge from the point I merged16:45
the problem is when I did those ad-hoc merges, I ripped out whatever I didn't want16:45
wongon → atfbe16:45
ralf-x so git thinks that stuff is merged or whatever, and so it is ignoring anything prior to that point on the topic branch16:45
(yes, in hindsight apparently that was retarded of me to do, but this is where I am now)16:46
→ infynyxx joined16:46
endra I want to create a copy of my repo's branch but only contain commits from a specific date and forward (past year or so). Any way to do that?16:46
← jaequery left16:46
tshirtman if you ripped parts of the commits out, they aren't the same commits anymore, so git can't think they are merged, he will likely find conflicts, though16:46
← noxd left16:46
tshirtman ralf-x: ↗16:47
endra tshirtman: .. that's a good arrow. never seen it before :P16:47
← robarelli left16:47
tshirtman :)16:47
ralf-x tshirtman: well, by 'ripped out' I did a 'git merge --no-commit', reverted/checked out files I didn't want to merge, and committed the merge16:47
← tobeplugged left16:48
atrus endra: i believe you're describing a "shallow" checkout. it's possible, but has some reasonably serious limitations.16:48
tshirtman hm, so the commit is in, but then after you did a partial revert?16:48
→ FortySix2 joined16:48
tshirtman never used --no-commit16:48
→ xMYTHICx joined16:48
ralf-x tshirtman: I believe that is correct, yes16:48
← conan_ left16:48
← vurma left16:48
← shinnya left16:48
tshirtman ok, from what i read, the reverts are done in the merge commit, so yeah, git will think the commit is merged16:49
endra atrus: git clone with --depth? I'll read up on it16:49
→ W0rmDr1nk joined16:49
ralf-x tshirtman: it's something like this: http://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git16:49
(logically)16:50
tshirtman i would go for rebase -i, i guess, if you don't care of the branch changing16:50
→ mossplix joined16:50
tshirtman s/of/about/16:50
← mizu_no_oto left16:51
← Spyro left16:51
tshirtman or you revert the merge commits before trying the merge again16:51
ralf-x hmmm16:51
→ paddy joined16:51
→ SocalNick joined16:51
tshirtman that will do for an ugly history imho, but no force-push16:51
← recycle left16:51
→ joelm joined16:51
→ alakra joined16:51
→ recycle joined16:51
ralf-x reverting the merge commit(s) might be easiest... the commit contents itself were not very significant16:52
← recycle left16:52
ralf-x but obviously master has moved forward since that point16:52
(since that merge)16:52
→ bwreilly joined16:52
tshirtman rebase the branch on master?16:52
← ecvon left16:52
ralf-x I'm sadly one of those people scared of rebase. Any thoughts on more specifically what I'd need to do?16:53
→ mizu_no_oto joined16:53
ralf-x also, would rebasing it onto master screw up any already published history?16:53
tshirtman thing-like-a-git.net is what cured my fear of rebase :)16:53
think*16:53
← Misan left16:54
osse ralf-x: it will screw up the history of what you rebase16:54
ralf-x osse: ok16:54
→ arvind_khadri joined16:54
tshirtman if the branch is public too, yeah, rebasing it will make a changed history appear publictly, which is frowned upon16:54
osse depends on what you mean by "published" though. If you've only pushed it to a backup repo no one else is supposed to fetch from then it's fair game, imo16:55
← W0rmDr1nk left16:55
tshirtman tends to be liberal with this, though, depends on the number of people following the project closely enough to be disturbed by it16:55
→ skyflash joined16:56
ralf-x I assume removing the commit that the old merge happened in would have a similar impact on history16:56
→ chrisshattuck joined16:56
tshirtman yes16:56
→ robarelli joined16:57
ralf-x bleh.16:57
← Macaveli left16:57
ralf-x I'm on a small team so it's possible I could do so16:57
but it won't be just me it's impacting16:57
what is the impact of republishing history/changing history?16:58
osse ralf-x: if it's a small team then let everyone know beforehand at it will probably be fine16:58
← xMYTHICx left16:58
← oodavid left16:58
→ enigmus joined16:58
← n-st left16:58
← arand left16:58
← NCS_One left16:58
ralf-x osse: well, sadly I'm the most knowledgable in the team regarding git. So what am I letting them know? :D16:58
tshirtman people fetching from your repos will see a forced update, and they'll have to either reset (for branches they didn't change) or rebase (for branches they did changes)16:58
osse ralf-x: the impact is that if people have created local branches based on the branch(es) you rewrite then they have to use reset or rebase in ways they otherwise wouldn't have16:58
← bicyclette left16:58
ralf-x hmm ok16:59
← tfb left16:59
ralf-x so in this case, really it would just be 'master' that's impacted right?16:59
so if they simply stopped working on master for a couple hours while I fix things, it could be seamless?16:59
osse I guess so16:59
ralf-x or would any branches from master also be impacted?16:59
osse depends on how far back the history is touched17:00
ralf-x right ok17:00
← infynyxx left17:00
ralf-x so if I dork with history from a month ago, any branches from a week ago may well be impacted17:00
osse ralf-x: yep.17:00
tshirtman if you have all their commits before doing your rebase, and they don't push anything, they'll just have to reset17:00
ralf-x (assuming there is a common parent)17:00
yeah ok17:00
→ infynyxx joined17:00
osse ralf-x: but it's possible to rebase them and it'll possibly be ok17:00
ralf-x tshirtman: ah ok gotcha17:01
← jatt left17:01
← craigp left17:01
← mani2399 left17:02
→ pfg joined17:02
ralf-x tshirtman: I can probably navigate that with the team. What would they have to do to reset specifically?17:03
just a 'git reset' ?17:03
or I assume a 'git pull; git reset' or something17:03
tshirtman git reset origin/master17:03
ralf-x ok17:03
→ Spyro joined17:03
← jceb left17:04
tshirtman before that, it's better if they do "git fetch" rather than "git pull"17:04
ralf-x *nod* yeah17:04
← jogos left17:04
osse if they do pull then all the rebase work is lost17:04
ralf-x oh yeah? hmm ok17:04
I may have them just axe their local repositories17:05
tshirtman lol17:05
← infynyxx left17:05
→ githogori joined17:05
tshirtman it's very rarely needed, but i guess it's some ritual git newcomers like to do :)17:05
ralf-x well...17:05
→ githogori_ joined17:05
osse ralf-x: if they pull then they will merge the rebased history with the original.17:05
and all of them will do it seperately. Aka. a mess17:06
→ rbartos_ joined17:06
ralf-x they are not very sophisticated17:06
so yeah...17:06
→ hyperair joined17:06
ralf-x osse: ok yeah didn't think of it like that. Makes sense.17:06
← ni__ left17:06
tshirtman there are a lot of good git doc these days, a little reading can go a long way :)17:07
← saikrishna_ left17:07
← rbartos left17:07
ralf-x tshirtman: that would suggest they are willing to read docs :)17:07
← RaceCondition left17:07
ralf-x that's a meatspace problem17:07
tshirtman i know people like this, they are my prefered people to work with :X17:07
← jnavila left17:07
ralf-x LOL17:07
← CheckDavid left17:08
lov reading is for nerds17:08
YOLO17:08
← gain left17:08
lov force pushes all his commits17:08
Nevik lov: you forgot the hashtag there17:08
← endiruna left17:08
lov oh, sorry17:08
#reading is for #nerds #YOLO17:08
Nevik gotta do it right, man :P17:08
that's better17:08
← Gonzo89 left17:09
→ xsbeats joined17:09
← ArSn left17:10
← InvidFlower left17:11
→ ZoF joined17:12
→ rm_work joined17:12
→ imachuchu joined17:13
rm_work what's the technical term for a branch that hasn't yet been merged into anything? I feel like it'd be "dangling branch" or something, but that sounds weird17:13
osse rm_work: just 'branch'.17:13
rm_work context: I'm trying to track down branches that we've failed to merge into master and forgotten about17:13
osse rm_work: git branch --no-merged master17:13
rm_work our repo has a TON of branches, trying to figure out if we've lost track of some17:13
ah, kk thanks osse17:13
← blinkdesign left17:14
← mishok13 left17:14
→ blinkdes_ joined17:15
→ jceb joined17:15
← harobed left17:16
← alorence left17:16
→ reskp joined17:16
← endra left17:17
← mossplix left17:17
→ rainmanjam joined17:17
→ lite_ joined17:17
← ntio left17:17
← Juzzika left17:18
← SocalNick left17:18
→ not_a_guest joined17:18
← intellix left17:19
→ Davespice joined17:19
→ ntio joined17:19
Davespice hi folks, can anyone help me with using svn2git?17:19
have managed to get it to run, and it goes through the svn repo logging every commit but when it finishes it seems that nothing has happened, git status shows nothing, cheers in advance o/17:19
← blinkdes_ left17:20
→ SocalNick joined17:20
tshirtman does "git log" show something?17:20
jast Davespice: 'git status' shows mainly uncommitted changes. try 'git log --all'17:20
→ Gizburdt joined17:20
Davespice hi jast, thanks I'll try that in a second17:20
→ Manny joined17:20
Davespice funny thing was that it doesn't look like it's actually pulling the revisions from svn17:21
→ ehmatthes joined17:21
← axsuul left17:21
→ pc joined17:21
cillybabe → cilly17:21
→ dmarkham joined17:22
→ Jason_D joined17:23
tshirtman well, he did that when he went through them in the first place, no? now you have a git repos, all the commits are local17:23
Davespice hmm, git log only shows the README.md file that I added to the target git repo17:23
← Dudi left17:24
thiago Davespice: git log should show the changes17:24
tshirtman doesn't know svn2git though17:24
chuckharmston_ → chuckharmston17:24
thiago Davespice: git fast-import doesn't actually check out the commits as it proceeds. Your repository has no working dir.17:24
jast well you already have stuff in your current branch. did you expect svn2git to overwrite it, or magically combine the two? try with --all17:24
thiago Davespice: which svn2git, btw?17:25
→ whiskers75 joined17:25
whiskers75 → Guest7029717:25
Davespice um, its this one; https://github.com/nirvdrum/svn2git17:25
→ jaequery joined17:25
← arietis left17:25
Davespice I'll give the order in which I did things17:25
← arif-ali left17:25
thiago ah, I don't know that one17:26
I can't help you17:26
I thought you meant this one: https://gitorious.org/svn2git17:26
Davespice first created a github repo, made a local folder, added the remote repo origin, created README.md with some default text locally using nano and did a commit / push17:26
jast sorry, I gotta go17:27
Davespice maybe I should try that one17:27
→ goTAN joined17:27
→ LuxuryMode joined17:27
→ axsuul joined17:28
← pc left17:28
→ eletuchy joined17:28
→ zkc joined17:28
← _tpavel left17:28
← revyd left17:29
← Druide_ left17:29
← buffal0 left17:29
→ endiruna joined17:29
→ joelroa joined17:29
→ craigp joined17:29
← cilly left17:30
→ cilly joined17:30
← canton7-mac left17:31
→ Nicholas_Rishel joined17:32
← eletuchy left17:33
← mikecmpbll left17:34
← joelroa left17:34
← axsuul left17:34
← shruggar left17:35
→ hochmeister joined17:35
→ dreiss joined17:35
← hochmeister left17:36
← rbartos_ left17:36
← Nicholas_Rishel left17:36
← merica left17:37
← kermit left17:38
→ Nicholas_Rishel joined17:39
→ recycle joined17:39
← torjus left17:40
→ torjus joined17:40
← Neozonz left17:40
→ esc joined17:41
← esc left17:41
→ esc joined17:41
→ Shusshu joined17:41
← mizu_no_oto left17:41
← Shusshu left17:41
→ simesy joined17:41
→ Exio4 joined17:42
→ hochmeister joined17:43
torsten I need a good git tutorial17:43
_ikke_ !book17:43
gitinfo 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 !parable17:43
_ikke_ !video17:43
gitinfo [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)17:43
← becks__ left17:43
→ Rastus_Vernon joined17:44
torsten thx17:44
← Gizburdt left17:44
← torjus left17:44
→ Gizburdt joined17:44
← Manny left17:45
jluc → shamp17:45
→ hahuang65 joined17:45
← simesy left17:45
← goTAN left17:45
← Kayra left17:45
→ oodavid joined17:45
← pikaren left17:46
→ rbartos joined17:46
samsamm777 is away: Gone away for now17:46
→ ni__ joined17:46
← sjmikem left17:46
← jceb left17:46
not_a_guest what's the best way to get the sha of the latest commit from a project?17:47
`git log | head -n 1` is the closest i can get17:47
is there a file I can read it from?17:47
← HeN_ left17:47
not_a_guest looked through .git directory, but don't see anything17:47
→ lindenle joined17:48
← lindenle left17:48
thiago not_a_guest: git rev-parse HEAD17:48
→ lindenle joined17:48
→ recycle_ joined17:48
not_a_guest thiago: nice. is there a way to do this if I don't have git installed on the system?17:48
→ sluther joined17:48
thiago yeah, you just have to install git first17:48
:-)17:49
not_a_guest hmm. where is rev-parse getting its info frm?17:49
thiago read the .git/HEAD file. If it says ref:, find that file17:49
if the file doesn't exist, read .git/packed-refs17:49
← Gizburdt left17:49
not_a_guest oh cool17:49
→ mani2399 joined17:49
← hahuang65 left17:50
← mani2399 left17:50
zumba_addict hi folks, how can we produce a list of branches that have been merged to master?17:50
not_a_guest I thought I explored all that already, but nope. Thanks thiago ! :)17:50
thiago zumba_addict: git branch --merged master17:50
zumba_addict cool17:50
← rbartos left17:50
← recycle left17:50
zumba_addict where should I execute it?17:50
should I be in master?17:50
osse zumba_addict: doesn't matter17:50
thiago zumba_addict: it doesn't depend on directory or on currently-checked out branch17:50
zumba_addict cool17:50
→ pwnz0r joined17:51
→ hochmeis_ joined17:51
← hochmeister left17:52
→ nepochal joined17:52
← sambae left17:52
samsamm777 is back.17:52
← JosephFerano left17:52
← mlechner left17:53
→ Neozonz joined17:53
Neozonz → Guest6421417:53
← icarus left17:54
→ icarus joined17:54
→ rbartos joined17:54
→ ben_alman joined17:54
ChanServ set mode: +o17:55
ojacobson set mode: +b17:55
← achadwick left17:55
ojacobson kicked samsamm777 (Please contact me to discuss your auto-away script.)17:55
ojacobson set mode: -o17:55
→ ScottE joined17:55
osse oh snap17:55
→ arietis joined17:55
← ayaz left17:56
ralf-x ok so I am going to attempt to remove these halfassed merges I did from 'topic' to 'mater'17:56
← Guest64214 left17:56
ralf-x *master17:57
when I am doing 'rebase -i', I see the 2 times I did this17:57
← ErKa left17:57
← cjsarette left17:57
thiago ralf-x: the rebasing should linearise17:57
ralf-x the text in that message suggests if I remove the lines for those 2 commits that they will be deleted. Does it really mean "it will be deleted from THIS branch"?17:57
→ kermit joined17:57
ralf-x because I want the actual commit to still exist in 'topic'17:58
just not in 'master'17:58
thiago correct17:58
ralf-x ok17:58
→ Zifre joined17:58
ralf-x just wanted to be sure17:58
osse ralf-x: the branch you're rebasing *onto* is never changed.17:58
← recycle_ left17:58
← welly left17:59
ralf-x osse: I'm not using --onto... I'm doing this from master: git rebase -i <commit I belive to be where 'topic' was created>17:59
tshirtman and commits are not deleted, they are still around in the base, even if no branch point to them, for a long time, git reflog is very useful to find them again if you need to17:59
← ben_alman left17:59
→ joelroa joined17:59
← reskp left17:59
ralf-x osse: just to remove these 2 halfass merges I did. After that I'll be merging 'topic' to 'master' per normal18:00
osse ralf-x: then it is 'master' you are rebasing.18:00
tshirtman when you do "git rebase -i x" you rebase current branch onto x, x is not changed18:00
osse 'topic' will be left alone18:00
→ fr33 joined18:00
ralf-x osse: yeah I guess I'm rebasing master onto master eh?18:00
→ kukks|2 joined18:01
→ tobeplugged joined18:01
tshirtman master = the last commit of master, that would be a noop, you rebase onto an ancestor of this commit18:01
osse ralf-x: no, onto topic18:01
← WaReZ left18:01
ralf-x uhm18:02
well that's not what I want to do :)18:02
→ reskp joined18:02
ralf-x I have 2 merge commits from 'topic' to 'master' that I wish to delete18:02
→ mizu_no_oto joined18:03
osse http://sprunge.us/GGbD18:03
note that in this example master is identical before and after18:03
→ FatDarrel joined18:03
ralf-x ok... yes I see that18:03
osse the same with be the case with your 'topic'18:04
→ SocalNick_ joined18:04
← Diemuzi left18:04
← SocalNick left18:04
SocalNick_ → SocalNick18:04
← Advocation_ left18:04
→ shruggar joined18:05
→ cjsarette joined18:06
ralf-x osse: it effectively re-states the 'topic' commits as if the common anscestor is H instead of D?18:06
← FortySix2 left18:07
osse ralf-x: exactly18:07
← oodavid left18:07
osse ralf-x: now, if instead of doing 'git rebase master' one does 'git rebase <sha of commit D>' that would obviously be a be a no-op. But in the case of rebase -i Git will allow it18:08
ralf-x well remember, I did a 'git checkout master; git merge --no-commit topic; (git revert/checkout as needed); git commit' 2x18:08
→ recycle joined18:08
ralf-x oh yeah? ok maybe that's what I was missing18:08
← cads left18:08
osse eveyrthing would be simpler if you could pastebin the output of !lol and then try to explain what you want the result to look like18:09
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all18:09
torsten how do I go between commits?18:10
osse or maybe just git log --oneline --graph --decorate topic master18:10
torsten: git checkout18:10
ralf-x osse: lol that would be handy18:10
→ UserError joined18:10
← zacts left18:11
← rbartos left18:11
← robbyoconnor left18:11
UserError How do I get a list of all the files and directory/sub tree? I think i'm using git ls-files wrong18:11
→ Neozonz|Disc joined18:12
ralf-x osse: so with those 2 merges in mind, you are suggesting what exactly?18:12
← Neozonz|Disc left18:12
→ Neozonz|Disc joined18:12
wagle_ → wagle18:12
→ buffal0 joined18:12
ralf-x git checkout master; git rebase -i <fork point>; delete the 2 goofy merges?18:12
osse ralf-x: I don't want to suggest anything because I'm not familiar enough with what you want to do18:12
→ rbartos joined18:13
ralf-x osse: fair enough18:13
osse ralf-x: my guess is that rebase will drop them automatically18:13
that's what usually happens18:13
← cjsarette left18:13
thiago if you rebase over the merged commits18:13
osse at least when you specify 'topic' instead of 'fork point'18:13
thiago if you rebase over something not already including those merges, rebase will preserve them18:13
osse since you're rewriting anyway that is probably the easiest18:13
thiago: makes sense.18:13
kukks|2 → kukks18:14
osse ralf-x: then my suggestion is 'git rebase topic'. No -i and no fork point18:14
← kukks left18:14
→ kukks joined18:14
← Asenar left18:14
ralf-x osse: with 'master' as my currently checked out branch?18:14
osse and I would suggest you actually do it and see what happens. You can reverse it without trouble18:14
ralf-x or 'topic'18:14
osse ralf-x: yes18:14
ralf-x ok18:14
osse master18:14
→ macmartine joined18:15
← Guest70297 left18:15
ralf-x yeah I have a scratch clone that I'm doing this on just to be safe18:15
← yacks left18:15
→ whiskers75_ joined18:15
← axl_ left18:16
macmartine For some reason when I 'git pull origin new_refactor', when I'm already in my local 'new_refactor' branch, I'm getting a merge commit with the message 'Merge branch 'new_refactor' of github.com:myapp/web-app into new_refactor'. Any ideas why?18:16
→ Freeman42 joined18:16
milki macmartine: !pull418:17
gitinfo macmartine: [!fetchfour] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).18:17
→ axsuul joined18:17
→ RaceCondition joined18:18
canton7 macmartine, yeah, you merged in the branch 'new_refactor' from the remote 'origin', rather than the remote-tracking branch 'origin/master'18:18
← francesca left18:18
canton7 (in fetch4, the remote-tracking branches aren't updated, so it can't have merged in origin/master)18:18
→ hobodave joined18:19
← SocalNick left18:19
→ SocalNick joined18:19
macmartine k, thanks18:20
← axsuul left18:20
← SocalNick left18:20
ojacobson !detached !reattach18:20
gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach18:20
Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue18:20
← zkc left18:20
← Davespice left18:21
→ goTAN joined18:21
→ bgerber joined18:22
← diegoviola left18:22
← akitada left18:22
→ axsuul joined18:22
→ Prazanna joined18:22
← whiskers75_ left18:22
→ whiskers75_ joined18:22
← ojacobson left18:22
whiskers75_ → whiskers7518:22
← whiskers75 left18:23
→ ncthom91 joined18:23
goTAN ok, I just commited new changes into master. To push those changes to my repo in a new branch I do git push origin:mynewbranch correct?18:23
osse goTAN: no. git push origin master:mynewbranch18:23
→ whiskers75 joined18:23
goTAN and then someone else can pull from this branch18:23
oh18:23
→ doener joined18:23
whiskers75 → Guest3785318:23
→ kesha joined18:24
← Guest37853 left18:24
→ Guest37853 joined18:24
goTAN ok, thanks18:24
→ Sicp joined18:24
← Sicp left18:24
→ Sicp joined18:24
→ ArcTanSusan joined18:25
← ghoti left18:25
goTAN ok it seemed to work18:26
← pwnz0r left18:26
Guest37853 → whiskers7518:26
← whiskers75 left18:27
→ whiskers75 joined18:27
→ eletuchy joined18:28
torsten how do I checkout another commit by comment? (git checkout 46XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXef works)18:29
thiago torsten: what do you mean?18:29
osse torsten: git checkout ':/some string that matches'18:29
Sicp I remember there being a command that allows me to commit and add at the same time18:30
← ArcTanSusan left18:30
Sicp I cannot seem to find it online18:30
thiago Sicp: it's git commit.18:30
torsten ah ':/' too, thx18:30
thiago Sicp: it doesn't work for currently-untracked files18:30
Sicp git commit -m "asldjasd" filename18:30
?18:30
yes I know18:30
→ Exancillatus joined18:30
Sicp let's try18:30
→ ErKa joined18:31
→ hahuang65 joined18:31
← rbartos left18:31
Sicp works18:31
→ ghoti_ joined18:31
Sicp well, what about one that would show me a diff of the target file as well?18:31
← axsuul left18:32
→ jogos joined18:32
Sicp nah, nonsense18:32
osse Sicp: commit -v18:32
→ infynyxx joined18:32
→ zacts joined18:32
→ WaReZ joined18:33
← eletuchy left18:33
← goTAN left18:33
→ mikecmpbll joined18:34
→ overZoF joined18:34
→ noxd joined18:34
Sicp it opens nano on the file and pastes output of git status below my commit-message-to-be18:34
→ codeFiend joined18:34
Sicp followed by the diff18:35
PLejeck- → nuck18:35
Sicp https://www.dropbox.com/s/6by3nz1aesne1jb/Screenshot%202014-03-05%2020.35.27.png18:36
looks so awkward18:36
→ SocalNick joined18:36
Sicp ah, I didn't read, sorry18:36
lines with # will be ignored18:36
→ yhager joined18:36
Sicp of course, comments18:36
osse hmm, why didn't it open "full screen" in the terminal ?18:36
Sicp it did, but I scrolled up18:36
→ axsuul joined18:36
← enigmus left18:36
osse oh18:36
Sicp yea this is vim not nano18:37
← ghoti_ left18:37
← Exancillatus left18:37
→ Exancillatus joined18:37
← ZoF left18:38
Sicp I thought I saw a diff at the bottom there, but there is no diff18:38
→ rednaks joined18:38
Sicp meh! there is.18:38
← dreiss left18:38
Sicp sorry18:38
→ angelleye joined18:38
→ ghoti joined18:38
angelleye So, I just pushed a commit to my remote and tagged it, and then I realized there's a config file in there that I didn't want to be included. What's the best course of action?18:38
lov !rewrite18:39
gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum18:39
osse angelleye: amend the commit, retag it, then push -f fast as hell18:39
masak angelleye: create another, better tag?18:39
← MacWinner left18:39
ralf-x haha18:39
lov if it's not sensitive, just git rm it, commit, push, change the tag, and move on.18:39
masak "please disregard the first tag, it sucks"18:39
lov ^^18:39
Sicp I think push force is better18:40
→ Thra11 joined18:40
→ dreiss joined18:41
→ becks__ joined18:41
← Thra11 left18:41
Sicp since you are stripping something that means nothing to no one, so having no record of it is preferable18:41
ldiamond but you'd be rewriting public history18:41
→ simesy joined18:42
Sicp Git works for you18:42
you don't work for Git18:42
ldiamond But the people who work for you will get confused.18:42
Sicp can't be forced to do something just because "that's how Git works"18:42
osse just do it quick and no one will notice!18:42
Sicp how?18:42
ldiamond it's not because "that's how git work"18:42
← _Vi left18:42
Sicp there is no record of it happening18:42
osse it's better to ask for forgiveness tyhan permission!18:42
→ aard_ joined18:42
← WormDrink left18:42
→ Beliq joined18:42
ldiamond it's because "git gives you the ability to verify the integrity of your repo"18:42
Sicp --force is there for a reason, I think18:43
ldiamond yes18:43
but not this reason18:43
if there was a password in there, I'd say rewrite and --force18:43
Sicp I know too little, from this point on18:43
osse only a sith deals in absolutes18:43
ldiamond --force if nobody fetched it yet... sure18:43
← ghoti left18:43
→ Thra11 joined18:43
ldiamond but only if you can know that18:43
Sicp ahhh18:43
← whiskers75 left18:44
macmartine milki, canton7 : I tried just 'git pull' and still got the merge commit18:44
ldiamond otherwise, that guy who based work on it (or girl...) will be confused, and may very well end up merging that config back again18:44
→ ghoti joined18:44
ldiamond don't trust people.18:44
angelleye ok, I'm having a little trouble following everybody...18:44
I'm the only one really using this thing so far anyway, so this isn't a huge deal18:45
ldiamond angelleye, create a new commit where you remove the config. Tag the new commit.18:45
angelleye I deleted it locally and did a git commit --amend18:45
ldiamond if there's nobody else even looking at it18:45
sure, --force18:45
angelleye now when I git status it says Your branch and origin/mater have diverged, and have 1 and 1 different commit each, respectively18:45
ldiamond exactly18:45
angelleye so...not sure what the next step is..??18:46
← simesy left18:46
ldiamond If you assume I went ahead and cloned your repository18:46
I'd be working on your previous commit, which you're about to remove18:46
← armyriad left18:46
Sicp ^^18:46
angelleye I don't think I need to worry about that right now, just need to know the next step to get out of this situation i'm in18:46
ldiamond that would cause confusion and potentially someone may reintroduce that config you just removed18:46
Sicp you just cost the company $100,000 angelleye18:46
ldiamond Know that.18:46
← Exancillatus left18:46
← dreiss left18:47
ldiamond However, if it's your personal repo18:47
and nobody cloned or fetched that commit.18:47
then do a git push --force18:47
that tells the server "I know what I'm doing, kthxbye"18:47
angelleye ok, I did that18:47
Sicp that's it18:48
ldiamond now your remote should be in sync with your new amended commit18:48
angelleye looks like it. thanks18:48
man, just started with Git a few weeks ago and just when I think I've got it I go and do something like this18:48
ldiamond Remember that you shouldn't do that if people based work on commits you're about to remove from the history. That's all18:48
angelleye ok, thanks18:48
→ jceb joined18:49
ldiamond Git is nice for that. You can do almost any mistake you want, there's a way to get it fixed.18:49
← tvw left18:49
← ghoti left18:49
→ joemcgill joined18:49
angelleye So did this mess with my tag?18:49
← joemcgill left18:49
angelleye Do I need to retag now or is the tag I set still good?18:50
ldiamond you previously had a tag that referred to a commit that doesn't exist anymore18:50
if you do 'git tag', do you see your tag?18:50
→ ghoti joined18:50
angelleye yes, I still see the tags I would expect, including that latest one18:50
← axsuul left18:51
← kermit left18:51
← Gamecubic left18:51
← kriks left18:51
← kukks left18:51
angelleye On GitHub when I click into the tag it does show 1 commit to master since this tag18:52
→ Gamecubic joined18:52
→ mewm joined18:52
osse angelleye: githubs web thing might have some cache stuff18:52
so I wouldn't worry if that gets it wrong for a couple of minutes18:52
→ someperson joined18:52
ldiamond angelleye, your tag still exists18:52
do 'git show <tagname>'18:53
it will tell you what the SHA1 id is18:53
someperson if i have git-new-workdir, how do i make it so i can call it like: "git new workdir"18:53
→ ZoF joined18:53
osse someperson: you cannot. but you can do git new-workdir18:53
someperson: if git-new-workdir is found somewhere in PATH18:53
ldiamond it should points to your old commit.18:53
← ni__ left18:53
osse oh, I thought he had already created a new tag. my bad.18:54
→ ben_alman joined18:54
angelleye hmmm...so yeah, if I download the zip attached to that last tag it still has the config file in it18:54
ldiamond angelleye, you will have to delete that old tag (unless you want to keep it obviously).18:54
then you can tag the new commit18:54
← nszceta left18:54
→ torjus joined18:54
angelleye can I delete it so it can be reused?18:54
or do I need to skip a version now?18:55
ldiamond git tag -d <TAGNAME>18:55
-d == delete18:55
you can use --delete too, same thing18:55
angelleye ok, so I did that...18:55
now locally I only see the previous tags18:55
ldiamond now you can create your tag on the new commit18:56
← overZoF left18:56
angelleye so the tag I just deleted was v1.0.218:56
← sachin06j left18:56
angelleye but that stil shows up on GitHub18:56
→ draftqin joined18:56
angelleye do I need to delete it there first, too?18:56
ldiamond well you only deleted locally18:56
→ budrose joined18:56
angelleye right, so I'm not sure how to hanbdlet he remote side18:56
ldiamond create your new tag18:56
osse angelleye: push -f after creating the new one18:56
← draftqin left18:56
osse just like with the branch18:56
angelleye ok, can I name it v1.0.2 again?18:56
ldiamond when you push18:56
sure, if that's what you want the name to be18:57
Not sure you'll need -f this time though18:57
I don't see why github would refuse deleting tags18:57
likely 'git push <remote> --tags' will suffice18:57
← nanotech left18:57
ldiamond otherwise do -f18:57
→ WormDrink joined18:57
← WormDrink left18:58
→ WormDrink joined18:58
osse ldiamond: well, you ask github to overwrite an existing ref.18:58
I would expect --force to be needed :p18:58
← ben_alman left18:58
→ Cache_Money joined18:58
angelleye doesn't seem to be liking git push origin --tags18:58
rejected18:58
ldiamond osse, you can delete branch without -f.18:58
→ subhojit777 joined18:58
ldiamond then use -f18:59
← Cache_Money left18:59
← Zifre left18:59
← jfield left18:59
osse ldiamond: ahh, true18:59
→ nanotech joined18:59
← torjus left18:59
angelleye so git push origin origin --tags -f ??18:59
→ postovaloff joined18:59
ldiamond sure18:59
→ FortySix2 joined18:59
osse angelleye: I assume the double origin was a typo18:59
ldiamond yea i missed that.18:59
angelleye yes19:00
it looks like that did it19:00
← macmartine left19:00
osse now suddenly my comment about github's web cache becomes relevant \o/19:00
← nkr left19:00
← bgerber left19:00
→ hassen joined19:01
→ ivan` joined19:01
→ sachin06j joined19:01
angelleye thanks guys19:01
← zacts left19:01
→ jlewis joined19:01
angelleye not exactly sure i understand everything that just happened, but i think i'm back to where i wnat to be19:01
→ jfield joined19:02
← thiago left19:02
→ n-st joined19:02
→ oodavid joined19:03
← starfox21 left19:03
← yhager left19:03
→ JosephFerano joined19:04
→ SHyx0rmZ joined19:04
← sachin06j left19:05
→ kermit joined19:05
→ cjsarette joined19:05
→ gr4ck joined19:05
gr4ck hi19:05
gitinfo gr4ck: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.19:05
← Nicholas_Rishel left19:05
← angelleye left19:06
masak gr4ck: hi! I'd like to manually welcome you to #git :)19:06
← teran left19:06
gr4ck thx19:06
← doener left19:07
← vmiklos left19:07
→ nadirvardar joined19:07
← reskp left19:07
→ vmiklos joined19:07
ralf-x so that I'm clear: when you rebase, you're duplicating commits. meaning commit 'abcd12' is copied and almost identical to the new commit '123456'19:09
gr4ck i want to dev a project with two "main" branches, one for linux, second for win, and i want to commit parallel to both branches.. how i have to work on?19:09
← jogos left19:10
→ InvidFlower joined19:11
aberrant hi all19:11
→ ggggggg joined19:11
aberrant silly question: I'm on a branch other than master ('licensing'). Do I need to specify "licensing" in my "git push origin" or will it somehow know?19:11
← ggggggg left19:11
← Gamecubic left19:12
Rhonda aberrant: If that branch is set to tracking an origin's branch, you don't need to specify it.19:12
aberrant Rhonda: how do I tell / set that?19:13
Rhonda Just try it, git will tell you. :)19:13
← nadirvardar left19:13
hiredman_ → hiredman19:13
aberrant yeah, ok, it's not :)19:13
I had to specify the branch19:13
Rhonda Only for the first time though.19:13
→ joemcgill joined19:13
→ bgerber joined19:13
aberrant oh.19:13
Rhonda That will get noted in your .git/config, just look at the file now.19:13
→ axsuul joined19:14
aberrant cool.19:14
← joemcgill left19:14
aberrant no19:14
Rhonda You'll see that the newly pushed branch is mentioned in there, and thus git knows that your local branch licensing is tracking the origin's branch licensing.19:14
aberrant nothing changed in .git/config19:14
→ nadirvardar joined19:14
← mikecmpbll left19:14
osse ralf-x: yes19:14
Rhonda hmm, not? I thought that would get autmatically added on first push. Try to pull, maybe that adds it?19:14
aberrant git pull origin licensing?19:15
→ kriks joined19:15
→ axl_ joined19:15
aberrant nope, config unchanged19:15
oh well, it's in my remote repo, so that's good19:15
osse ralf-x: but the old commits are no longer referenced, you won't see them in the git log output and so it's open season for the garbage collector. Hence the effect is that they are moved, even though that's not *really* what happens19:16
aberrant ok, I've just done a git merge of this branch to master. Do I then do a git push origin master to get it up to the remote repo?19:17
ralf-x osse: hmm ok good points. Gotcha19:17
← arnihr left19:17
aberrant or do I have to add/commit first?19:17
osse aberrant: if the merge was successful then you can push19:17
aberrant osse: the merge was successful19:18
← jaequery left19:18
← RaceCondition left19:18
aberrant hm19:18
need to check the remote. one sec.19:18
→ Kayra joined19:18
← tobeplugged left19:19
← axsuul left19:19
→ armyriad joined19:19
aberrant ok, seems to have worked. Thank you all :)19:19
← Silmarilion left19:20
← Kayra left19:20
→ RaceCondition joined19:20
→ Kayra_ joined19:21
← nadirvardar left19:21
→ jaequery joined19:22
→ saorge_ joined19:22
→ dansmith_btc joined19:22
→ Diemuzi joined19:22
gitinfo set mode: +v19:22
→ nadirvardar joined19:23
→ sq-one joined19:23
← oodavid left19:23
gr4ck sry, where is the noob channel of git?19:23
→ dreiss joined19:23
osse gr4ck: this is it19:23
gr4ck osse: thx19:24
osse gr4ck: if I were you I would have only one branch. Having two in parallel and committing to both will be more hassle than it's worth imho19:24
← saorge left19:25
→ jogos joined19:25
osse gr4ck: but sure it's possible. commit to one branch, then use git cherry-pick to duplicate it on the other branch19:25
prophile osse: I thought you were talking about a git analogy for having a noob channel there19:26
"having two in parallel and committing to both will be more hassle than it's worth"19:26
dansmith_btc Hi, when I open up firefox git repo with gitk, it ends up eating all my RAM. Could anyone suggest a gui tool which will only show the last 100 commits or so?19:26
osse prophile: haha19:26
prophile: my opinion remains the same :p19:26
ralf-x dansmith_btc: I use sourcetree. it seems decent.19:26
→ nilg joined19:28
dansmith_btc ralf-x, I'm on LInux, sourcetree is win/mac19:28
gr4ck osse: thx19:28
ralf-x dansmith_btc: ah my bad19:29
← joehh left19:29
→ mikecmpbll joined19:29
→ eletuchy joined19:29
canton7 dansmith_btc, http://git-scm.com/download/gui/mac19:30
→ Advocation joined19:31
canton7 tower, I hear, is very good19:31
or there's the command0line tig, or git !lol19:31
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all19:31
← Sicp left19:31
dansmith_btc oops, just realized gitk -n 100 is what I need. thanks anyway19:31
→ oodavid joined19:32
→ ncthom91_ joined19:32
→ bwreilly_ joined19:33
← eletuchy left19:33
→ enigmus joined19:34
→ Macaveli joined19:34
← jogos left19:34
← oodavid left19:35
← bwreilly left19:35
← slobo left19:35
→ slobo joined19:35
← ncthom91 left19:35
→ gr4ck_ joined19:37
← postovaloff left19:37
→ pbrobst joined19:38
→ Gamecubic joined19:38
→ yhager joined19:38
← gr4ck left19:39
← codeFiend left19:40
← enigmus left19:40
← nnyk_ left19:40
→ thiago joined19:41
→ RogerWS joined19:41
← neal__ left19:41
→ unknwn- joined19:41
← northfurr left19:42
← RogerWS_ left19:42
→ nick108 joined19:43
→ neal__ joined19:43
→ nicedice joined19:43
← mourest left19:44
← jaequery left19:45
← Kayra_ left19:45
→ Havvy joined19:46
← ncthom91_ left19:46
← craigp left19:47
← ehmatthes left19:47
→ LeMike joined19:48
Havvy I've got a private branch that I've committed to, merged upstream, and recommitted to. I want to rebase my commits in this branch into one single commit without losing the commits that were merged in.19:48
→ cloud|nix joined19:48
Havvy How can I do this?19:48
→ jogos joined19:48
→ nutron joined19:48
→ CheckDavid joined19:49
moritz Havvy: simply rebase, and then squash your commits19:49
Havvy: the rebase flattens out the merge commit too19:49
→ ben_alman joined19:49
→ veebers joined19:49
Havvy Won't squash squash the commits into the commit above them, which in this case, is somebody else's commit?19:50
→ FortySix_ joined19:51
← Neozonz|Disc left19:51
← subhojit777 left19:52
← phantomtiger left19:52
← LeMike left19:52
→ starfox21 joined19:52
moritz Havvy: first you rebase. That puts all of your own commits into a row at the end19:52
Havvy: and then in a second step you git rebase -i to squash them19:52
Havvy Just do `git rebase %branchname%` ?19:52
← FortySix2 left19:53
← hamster left19:53
moritz well, on the branch, do 'git rebase master' (or whatever the branch is named that you branched off from)19:53
← marcosc left19:53
moritz though come to think of it, there's a simpler solution19:54
git checkout yourbranch19:54
git reset --soft master19:54
git commit # done!19:54
← armyriad left19:54
moritz or maybe that's not optimal...19:55
moritz is a bit confused right now19:55
moritz be sure to !backup first :-)19:55
gitinfo Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups19:55
→ Kayra joined19:55
→ zacts joined19:56
← CKyle left19:56
→ rbartos joined19:57
→ Exancillatus joined19:57
← Gavrisimo left19:57
→ paulweb5151 joined19:57
← paulweb515 left19:57
← arietis left19:58
← nick108 left19:58
→ nick108 joined19:59
← matteo left20:00
Havvy moritz: Ah, git reset --soft %branch% works wonderfully.20:00
← bgerber left20:00
← paulweb5151 left20:01
← rbartos left20:02
← yhager left20:02
← mizu_no_oto left20:03
← raccoon_ left20:03
→ rbartos joined20:03
→ raccoon_ joined20:03
← joelroa left20:04
→ yhager joined20:04
ralf-x well dammit20:04
→ pantsman joined20:04
→ endra joined20:04
ralf-x so I'm attempting to re-run everything from 'topic' to 'other_topic'20:04
they both have hte same branch point20:05
seems like I'm having some issues trying to get the rebase to run correctly though20:05
← Exancillatus left20:06
→ flaguy48 joined20:07
→ Xethron joined20:07
← Xethron left20:07
→ Xethron joined20:07
→ Near joined20:07
→ Trudko joined20:07
ralf-x I *think* I want to rebase 'topic' onto 'other_topic', but maybe my terminology is backwards20:08
→ SorenHolm joined20:08
Near I created an experimental branch for my personal project and it turns out I want to completely replace the master branch with the experimental one. How should I go about this?20:08
← Advocation left20:08
→ Exancillatus joined20:09
← budrose left20:09
→ paulweb515 joined20:10
osse Near: git checkout master; git reset -hard experimental20:10
Eugene Near - `git checkout master; git reset --hard experimental` will20:10
Shit, beaten.20:10
osse Eugene: nah. I'm disqualified. Missing a dash20:10
ChanServ set mode: +o20:10
Eugene kicked osse (FAILURE IS NOT AN OPTION)20:10
Near Eugene: lol20:11
→ osse joined20:11
Eugene changed the topic to: Welcome to #git, the place for git help and artery-clogging cheeseburgers | Current stable version: 1.9.0 | Start here: http://jk.gs/git | Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice | git-sweep: It's brooms, all the way down.20:11
ralf-x lol20:11
Eugene set mode: -o20:11
→ Nicholas_Rishel joined20:11
Eugene Bonus: if you don't want to switch branches, man git-update-ref20:11
gitinfo the git-update-ref manpage is available at http://jk.gs/git-update-ref.html20:11
osse They don't take me by surprise anymore :p20:11
the beatings20:12
dzho wait, what? There are cheeseburgers?20:12
Near also, wouldn't this do?: git checkout experimental ; git merge -s ours master ; git checkout master ; git merge experimental ?20:12
← pfg left20:12
Eugene Not the same thing, no20:12
It will do it without forcing a non-ff update, which is benefical20:12
← rbartos left20:12
→ Dreamer3 joined20:12
← ewet left20:13
← cjsarette left20:13
Near Eugene: so I should just do what you told me?20:13
osse Near: the -s ours thing only applies in case of conflicts. You'll still end up with a mix of master and experimental20:13
→ AVDeen__ joined20:13
Eugene But the stuff that's happened on master since exp diverged will remain there. You said "prersonal project", so I'm guessing that's OK.20:13
← jceb left20:13
Eugene osse - that's -Xours; -s ours is different ;-)20:13
osse oh20:13
Near Eugene: alright, a simple replacement, so your stuff would do.20:13
→ tvw joined20:13
osse I'll just leave and rejoin. Save you the paperwork20:13
Eugene Indeed.20:13
← SocalNick left20:13
Eugene Near - the choice comes to: do you care about the master's history at all? Or you just want to do it and move forward.20:14
Also, this is a great time to stop using the word !master. Call it stable instead!20:14
gitinfo [!master_branch] 'master' is the default name for the first branch commited by git, and it is in no way special. You can just delete it, and use more meaningful names such as 'dev' 'stable' 'unstable' 'bug/001' etc. If this is a bare repo, you will want to change the default branch(`git symbolic-ref HEAD refs/heads/somebranch`) first.20:14
→ rbartos joined20:14
Near Eugene: I wouldn't even care if master went to hell20:14
← BiggFREE left20:15
Eugene git branch stable; git branch -D master; !beer20:15
gitinfo Beer! It's what's for dinner!20:15
← vtunka left20:15
Near Eugene: that's not really safe is it?20:15
^^20:15
Eugene If you plan on driving, no. But stay home or catch a cab.20:15
← xsbeats left20:16
Near Eugene: hehe, well it would be illegal for me anyways.20:16
← axl_ left20:17
→ torjus joined20:17
→ maroloccio joined20:18
→ pfg joined20:18
→ bgerber joined20:18
← Near left20:18
← aberrant left20:18
osse to drive or drink?20:18
Eugene !branch_delete applies here, but yeah, totally safe, if you no longer care about the word master(and you shouldn't)20:18
gitinfo Deleting a branch is easy. `git branch -d branchname` (or -D). However, this will NOT delete the branch upstream, that requires `git push --delete origin branchname`. However, this will NOT delete remote tracking branches. EACH USER must `git remote prune origin`, but if any users have local branches, they must likewise run `git branch -d branchname` (or -D)20:18
Eugene osse - first the drinking, then the driving. Two separate operations.20:18
← lite_ left20:19
← paulweb515 left20:19
osse I was just trying to determine his age :p20:19
→ lite_ joined20:19
→ dort joined20:19
Eugene Pointless endeavour - everybody on the internet is a 40-year old fat man in their mother's basement. This is a know nfact.20:20
osse damn. busted.20:20
_ikke_ Eugene: How do you know me?20:20
→ simesy joined20:21
_ikke_ Near has left anyway, for the ones who didn't notice20:21
osse Damn Near killed her!20:21
→ aMoniker joined20:22
_ikke_ Killed who?20:22
Eugene urmom20:22
osse _ikke_: you're fiancee20:22
your20:22
← [aviraldg] left20:22
← shawndumas left20:22
← lite_ left20:22
aMoniker Is there a way to use git so that permissions/ownership are kept intact? I'm trying setgitperms.perl but it's not working with git pull20:22
← starfox21 left20:23
→ aberrant joined20:23
→ ghostlines joined20:23
_ikke_ aMoniker: Git only knows 755 and 64420:23
osse aMoniker: no, except for the executable bit20:23
→ gimpygoo joined20:23
← tvw left20:23
aMoniker gross20:23
grawity aMoniker: intact when you clone the repo elsewhere?20:23
_ikke_ and non of the ownerships20:23
bremner you can add various hacks to hooks, like the one you found20:23
aMoniker grawity: intact when I pull in new changes20:23
grawity aMoniker: or intact when you chown a file and `git pull` updates it20:23
aMoniker bremner: not working though20:23
Eugene aMoniker - !etckeeper20:23
gitinfo aMoniker: etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://kitenet.net/~joey/code/etckeeper/20:23
aMoniker grawity: exactly20:23
_ikke_ git is not meant as a !deploy tool20:24
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html20:24
Eugene aMoniker - or !xy ;-)20:24
gitinfo aMoniker: Woah, slow down for a bit. Are you sure that you need to jump to that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...20:24
osse aMoniker: what if you pull an update and a file belongs to a user not present on your system?20:24
→ merica joined20:24
→ cjsarette joined20:24
← kriks left20:24
← Xethron left20:24
aMoniker osse: it'd be nice if I could set the ownership to a default20:24
← rbartos left20:25
← WormDrink left20:25
← simesy left20:25
→ Neozonz joined20:26
← Neozonz left20:26
→ Neozonz joined20:26
Eugene That's a job for your OS'20:26
grawity regarding that – on Unix systems, ownership can be changed only by root20:26
→ Xethron joined20:27
← Xethron left20:27
→ Xethron joined20:27
osse alias git='sudo git '20:27
→ WormDrink joined20:27
grawity so git can only try a bit harder to update the file "in place", but...20:27
Eugene You can use the g+s bit(on directories) under a unix-like system to force all files/folders created to have their group set to that of the parent(unstead of your current gid)20:27
osse how can I lose20:27
← mellernoia left20:27
Eugene See also man git init --shared20:27
gitinfo the git-init manpage is available at http://jk.gs/git-init.html20:27
_ikke_ osse: Don't forget to move your config to rot20:27
root20:27
← WormDrink left20:27
→ WormDrink joined20:27
osse _ikke_: shit yeah. I need my fancy prompt as r00t20:28
_ikke_ osse: Not prompt20:28
osse: user identity20:28
osse oh, I thought you meant move ALL the configz20:28
_ikke_ no, the git specific ones20:28
osse like .${SHELL##*/}rc20:28
_ikke_ because when you execute git as root, it looks for /root/.gitconfig20:29
cbreak running git as root? Now that's a braindead idea.20:29
_ikke_ cbreak: totally agree20:29
cbreak what's next? Running wine (with internet explorer) as root? :)20:30
← Hounddog left20:30
→ cfoch joined20:30
_ikke_ cbreak: Why not20:30
aMoniker why is running git as root a bad idea?20:30
→ eletuchy joined20:30
→ joelrobichaud joined20:30
_ikke_ aMoniker: principle of least privilege20:30
bambams_ Running anything unnecessarily as root is a bad idea.20:30
→ xaq joined20:30
cbreak because git is not security software. I would not trust it enough to be root safe20:30
→ joelroa joined20:31
aMoniker oh ok, not something specific to git then20:31
_ikke_ nope, just general common sense20:31
UserError This is why windows is bad for the world20:31
cbreak in unix, permissions often come from the user.20:31
← someperson left20:31
_ikke_ UserError: Used to be anyway20:31
cbreak so if you run as root, most stuff you run inherits your root permissions20:31
UserError i think some people are also used to sudo too much, and don't understand the difference between that and su -c20:32
cbreak there are exceptions of course, such as OS X, where you can employ MAC with sandboxing20:32
or secure linux or bsd jails, and similar things20:32
but normally, root is really really not limited.20:32
← bwreilly_ left20:33
← xaq left20:33
→ xaq_ joined20:33
UserError So hey i was trying to write stdout of git ls-tree --full-tree -r HEAD or something related to a file to show the tree and files20:33
bambams_ IMO, if you have an unrestricted sudoers then your system is broken. :P20:33
UserError is there something more useful or correct looking20:33
for git20:33
_ikke_ UserError: What is wrong with that?20:33
← Xethron left20:33
← ben_alman left20:34
→ Xethron joined20:34
← Xethron left20:34
→ Xethron joined20:34
UserError it looks horrible written to a file as output20:34
bambams_ !xy perhaps?20:34
gitinfo Woah, slow down for a bit. Are you sure that you need to jump to that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...20:34
UserError not XY20:34
← WormDrink left20:34
→ bwreilly joined20:34
← eletuchy left20:34
_ikke_ What output do you need / expect?20:34
UserError a traditional tree style output20:34
← rethus left20:35
→ armyriad joined20:35
UserError ---DIR20:35
→ ojacobson joined20:35
→ EvilDMP joined20:35
UserError \_______File20:35
→ WormDrink joined20:35
cbreak UserError: haha20:35
UserError :\20:35
cbreak that's pretty much unparseable20:35
EvilDMP is it possible to remove a commit from the history? (supposing that it can be done cleanly)20:35
UserError it was an example20:35
_ikke_ EvilDMP: Yes, it is possible20:36
cbreak UserError: ls-tree is much easier to parse.20:36
→ ben_alman_ joined20:36
_ikke_ EvilDMP: But it has implications20:36
bambams_ EvilDMP: Yes, but that is a !rewrite.20:36
gitinfo EvilDMP: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum20:36
← Chryyz left20:36
_ikke_ EvilDMP: Is that commit already pushed somewhere else?20:36
EvilDMP in this case, rewriting's ok20:36
_ikke_: no20:36
bambams_ EvilDMP: Easiest way is with rebase --interactive.20:36
_ikke_ EvilDMP: did you make merges afterwards?20:37
→ xaq joined20:37
EvilDMP oh, and I can remove instead of squashing or whatever?20:37
_ikke_ EvilDMP: it can even be done in one command20:37
bambams_ EvilDMP: Yes, if you delete the line that commit will effectively be deleted.20:37
← xaq_ left20:37
_ikke_ git rebase <commit> --onto <commit>^20:37
EvilDMP I will try that thanks20:37
cbreak I'd not mix --onto with history rewriting20:38
_ikke_ cbreak: The effect is the same20:38
← joelroa left20:38
_ikke_ You rebase the children of the commit onto its parent20:39
→ beyondcreed joined20:40
← gr4ck_ left20:40
aMoniker git-deploy looks nice... has anyone used that?20:40
_ikke_ nope20:40
aMoniker (that can attest to its niceness)20:40
← Xethron left20:40
bambams_ aMoniker: Have you already ruled out gitolite? :-/20:40
aMoniker bambams_: no, I haven't looked into it20:41
_ikke_ gitolite has nothing to do with deployments20:41
bambams_ Or are you actually deploying a Web site or something?20:41
← Trudko left20:41
← AVDeen__ left20:41
aMoniker bambams_: deploying a site20:41
bambams_ Ah, nevermind.20:41
_ikke_ gitolite is only repository authorization20:41
aMoniker oh ok20:41
_ikke_ and it does it well20:42
aMoniker I just need to come up with a tool that allows me to pull into a repo on the prod server, then deploy into the live directory, keeping permissions/ownership intact20:42
plus I'll need to sync changes made in the live directory, like uploads/ftp changes and such20:42
_ikke_ aMoniker: A good system just sets the correct permissions20:42
kadoban aMoniker: rsync?20:42
← Beliq left20:42
aMoniker kadoban: that might be part of it20:42
_ikke_ aMoniker: I usually just symlink themn20:42
aMoniker _ikke_: yeah, I'll keep track of those and have them updated20:43
→ axl_ joined20:43
← FortySix_ left20:43
aMoniker looks like git-deploy can automate that20:43
→ jab416171 joined20:43
_ikke_ aMoniker: Yeah, but you shouldn't rely on the permissions on the current live dir, but you should explicitly set them20:43
← xaq left20:43
aMoniker _ikke_: I agree, that's what I mean20:44
_ikke_ ok20:44
→ xaq joined20:44
aMoniker could keep the config file for setting permissions in the repo too :)20:44
_ikke_ The system I use (capistrano), creates release dirs, and then switches a symlink on the newly creates dir20:44
That way, a rollback is just a symlink away20:44
bambams_ Mmmm.20:45
aMoniker that's nice20:45
easy to get up and running?20:45
_ikke_ I have no experience with capistrano 3 yet20:45
← jackneill left20:45
→ reskp joined20:45
ben_alman_ → ben_alman20:45
_ikke_ It's ruby20:45
(I use it while I hardly know any ruby)20:46
ben_alman → ben_alman_20:46
ben_alman_ → ben_alman20:46
→ FortySix2 joined20:46
→ SocalNick joined20:46
aMoniker I've used ruby for vagrant/chef20:46
enough for configs20:47
_ikke_ Then capistrano shouldn't be a problem20:47
← ferreum left20:47
aMoniker ok, I'll give it a shot, thans20:47
*thanks20:47
← arvind_khadri left20:48
← nilg left20:49
→ paulweb515 joined20:49
→ phantomtiger joined20:49
→ thegorn joined20:50
← thegorn left20:50
EvilDMP well, here's my git log: https://dpaste.de/hXvU and here's how GitHub shows the pull request that will result: https://github.com/evildmp/pip/compare/newdevelop?expand=120:51
what I'd like is to make a pull request that gives the impression I know what I am doing20:51
how should I tidy that up before sending the pull request?20:51
I don't want it to look as though there were a monkey at the keyboard20:52
ralf-x lol20:52
← aberrant left20:52
→ Gizburdt joined20:52
grawity git rebase -i origin/develop..20:52
← phantomtiger left20:52
grawity !hamburger20:52
gitinfo [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect20:52
grawity !perfect20:52
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.20:52
→ VinceThePrince joined20:53
→ thegorn joined20:53
EvilDMP grawity: perfection's some way away, it's just that since I'm on the Internet I feel there's no need for everyone to think I'm a dog20:53
← VinceThePrince left20:54
jast the linked articles try to answer your question anyway :)20:54
← DoniRS left20:54
→ rethus joined20:54
→ ncthom91 joined20:54
EvilDMP jast: reading now20:54
← Macaveli left20:55
→ diegoviola joined20:56
→ alvaro_o joined20:57
→ phantomtiger joined20:57
→ nnyk_ joined20:57
← koell left20:57
← jogos left20:58
→ arif-ali joined20:59
→ joelroa joined20:59
← nnyk_ left20:59
← arif-ali left20:59
← hoschi left21:00
→ arvind_khadri joined21:00
→ HicksD joined21:00
→ arif-ali joined21:00
← mewm left21:01
Eugene jast - anything more I could do to repro that issue?21:01
← ErKa left21:01
← timewa1ker left21:01
← Nicholas_Rishel left21:01
HicksD What's usually the cause of a failed git subtree merge when the error is: "fatal: entry not found in tree <long sha1>"21:02
→ gain joined21:02
→ lindenle_ joined21:02
← marthinal left21:02
HicksD I've checked the git log and the last subtree merge entry lists a commit sha1 that still exists in the remote repo I've fetched and trying to subtree merge in21:02
← joelroa left21:04
MattMake_ → MattMaker21:04
← bluesm left21:05
→ Pullphinger joined21:06
→ tpollard joined21:06
→ tvw joined21:07
← Gizburdt left21:08
← lindenle_ left21:08
← SorenHolm left21:10
← facundor left21:10
→ ws2k3__ joined21:10
← InvidFlower left21:11
imachuchu HicksD: I have no idea and have no basis for my suggestion other then paranoia, but you might want to run a git fsck just in case21:12
→ shawndumas joined21:12
→ jogos joined21:12
HicksD hmm that lists 4 dangling commits21:13
→ nilg joined21:13
← IrishPrime left21:13
→ ncthom91_ joined21:13
→ Gizburdt joined21:14
→ enigmus joined21:14
← armyriad left21:14
→ polyzen joined21:14
← aarapov left21:15
← Kicer86 left21:15
← FortySix2 left21:15
→ phuh joined21:16
→ FortySix2 joined21:16
← nyuszika7h left21:16
← ncthom91 left21:17
HicksD Just tried it again but dropped the trailing slash on the prefix and the merge succeeds.21:17
Pretty sure I used a / last time, but perhaps it's a memory failure :)21:18
→ rbartos joined21:18
→ remiros joined21:18
→ jaequery joined21:18
imachuchu HicksD: dangling commits are fine, and glad everything worked out21:19
HicksD what has confused me a little is that the other two subtrees updated with the trailing slash e.g --prefix=foo/21:20
← maroloccio left21:21
← Exancillatus left21:22
← ws2k3__ left21:23
← jogos left21:23
← kesha left21:24
← hassen left21:25
← jsilver left21:26
→ petey joined21:26
← ncthom91_ left21:26
→ ws2k3__ joined21:26
→ jsilver joined21:26
← RaceCondition left21:27
→ AaronMT_ joined21:27
← einonm left21:27
→ marthinal joined21:27
→ einonm joined21:28
→ rednaks_ joined21:29
← AaronMT left21:29
→ teran joined21:29
← sluther left21:30
→ eletuchy joined21:31
← rednaks left21:31
← infynyxx left21:31
← torjus left21:31
→ nnyk_ joined21:32
→ hobodave_ joined21:32
→ torjus joined21:32
← marthinal left21:32
← hobodave left21:32
→ northfurr joined21:33
← northfurr left21:33
→ northfurr joined21:33
→ harobed joined21:34
← harobed left21:34
→ harobed joined21:35
← harobed left21:35
← eletuchy left21:35
→ harobed joined21:36
FatDarrel hey21:36
← harobed left21:36
→ harobed joined21:37
← harobed left21:37
← torjus left21:37
→ jogos joined21:37
FatDarrel So i asked this question yesterday but I haven't figured it out as of yet I have changes in CentOS 6.0 branch and I want to migrate them to the Fedora branch21:37
→ harobed joined21:37
← harobed left21:38
→ ncthom91 joined21:38
← ncthom91 left21:38
jizanthapus what's the point of a --no-ff merge policy?21:38
← Zaknefain left21:38
→ harobed joined21:38
HicksD Making sure feature branches still look like feature branches post merge back when a ff merge would have also been possible.21:38
grawity making sure all feature merges have a descriptive commit message21:39
→ ncthom91 joined21:39
→ Zaknefain joined21:39
← ncthom91 left21:39
→ BtbN joined21:39
→ ncthom91 joined21:40
← ncthom91 left21:40
← sq-one left21:40
→ ncthom91 joined21:40
jizanthapus HicksD, grawity makes sense, thanks21:41
← FatDarrel left21:41
→ robbyoconnor joined21:41
← ghostlines left21:41
→ Mitchbon_ joined21:42
← arif-ali left21:42
→ sonOfRa joined21:42
← cloud|nix left21:42
← Mitchbones left21:43
← Zaknefain left21:43
→ Zaknefain joined21:43
→ GT4066 joined21:46
← werlley left21:47
← Pullphinger left21:48
← Zaknefain left21:48
← nnyk_ left21:48
→ guzzlefry joined21:48
← Gizburdt left21:48
← nadirvardar left21:48
→ nnyk_ joined21:49
guzzlefry How can I checkout all changed and tracked files in a directory?21:49
jast Eugene: to make sure there's no whitespace issue or similar anywhere, try inserting a bit of tracing code before the error, e.g.: print STDERR "|".join('|', keys %{$BotIrc::cfg->{channel}})."|\n|$channel|\n";21:49
→ Gizburdt joined21:49
jast guzzlefry: what do you mean by 'checkout'?21:49
← prophile left21:49
guzzlefry I'm basically trying to undo all changes in a directory besides files that aren't already tracked.21:49
jast by common definitions, they're already checked out if you're seeing them in your filesystem :)21:49
guzzlefry ah yeah sorry, wrong term. :P21:50
jast hang on while I resolve your double negation... ;)21:50
→ AVDeen__ joined21:50
grawity git checkout -f`21:50
jast either that, or git reset --hard. both undo all uncommitted changes to all tracked files.21:50
→ woollyams joined21:50
guzzlefry git reset --hard always scares me. :P21:51
jast special case: if you started tracking a previously untracked file, they'll get rid of that, too21:51
← jogos left21:51
jast checkout -f looks less scary, perhaps, but does pretty much the same thing :)21:51
guzzlefry ah21:51
→ srji_ joined21:51
→ infynyxx joined21:52
← remiros left21:52
zumba_addict how do you decide on cleaning remote branches?21:52
← unknwn- left21:52
← srji left21:52
← Jason_D left21:53
→ Exancillatus joined21:53
jast you mean when to? once they've been merged and/or are completely unlikely to ever be worked on again21:53
zumba_addict is it ok to delete all the our remote feature branch since we'll still have them locally?21:53
yes, merged21:53
← infynyxx left21:54
jast there is no one and only right way21:54
← jaequery left21:54
zumba_addict so am I right that once we delete the remote branch, our local shouldn't be affected unless I execute git pull21:55
endra any simple way to have a branch moved into its own repository and anything before that branch would be made into a single commit? Basically, as if the first commit of that branch (and everything before it) into the first commit of the new repository21:55
I've tried rebase but lots of issues going on with it21:55
← buffal0 left21:56
← endiruna left21:56
jast zumba_addict: in fact even if you pull, that won't delete branches21:57
← Exancillatus left21:57
zumba_addict i mean, delete remote branch first21:58
← becks__ left21:58
zumba_addict then do a git pull21:58
jast pull fetches and merges changes. it does *not* delete your local branch just because the remote disappeared21:58
zumba_addict i was thinking of keeping my local copy of the feature branch so I can see what I did21:58
← LuxuryMode left21:58
← awx left21:59
→ awx joined21:59
→ jaequery joined21:59
→ simesy joined21:59
zumba_addict is that possible, delete remote branch but not local?21:59
← rbartos left21:59
jast yes. deletions don't propagate unless you apply more force21:59
PerlJam zumba_addict: why wouldn't it be possible?21:59
← ncthom91 left21:59
zumba_addict because I haven't tried it yet21:59
jast in fact, not even the !remote_tracking_branch is deleted when you pull/fetch21:59
gitinfo Remote-tracking branches (branches which start with e.g. 'origin/') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'21:59
→ sdouglas joined22:00
→ ncthom91 joined22:00
← ncthom91 left22:00
jast hmm, that could use a bit more detail22:00
→ joelroa joined22:00
← enigmus left22:00
jast .trigger_edit remote_tracking_branch Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'22:01
zumba_addict i don't think we can create a new branch that's already been deleted remotely22:01
gitinfo jast: Okay.22:01
→ ncthom91 joined22:01
jast the important bit here is that, in addition to the normal local branches shown by 'git branch', git also has a complete mirror of the remote in what's called remote-tracking branches22:01
→ sukima joined22:01
→ codezomb joined22:02
zumba_addict k22:02
sukima Is there a way to add a commit with no changes (no code changes but has a message)?22:02
jast git *never* deletes your local branches unless you explicitly ask it to, and it doesn't even delete RTBs if they disappear in the remote repo, unless you run a prune command22:02
zumba_addict maybe if I give an example, I'll be able to understand it more22:02
jast sukima: --allow-empty when commotting22:02
or committing22:02
up to you ;)22:02
← osse left22:02
zumba_addict so I'm on master and I ran git checkout -b test-branch then I updated some files then I did a git push origin test-branch22:02
PerlJam sukima: that's the second or thrid time I've seen someone ask that. I find the concept to be really weird.22:03
→ rbartos joined22:03
sukima Thanks jast22:03
← sdouglas left22:03
→ arkanes joined22:03
zumba_addict now, I want to delete the remote test-branch because it's been merged. However, I want to keep my local copy because I may need to remember the code I wrote22:03
→ sdouglas joined22:04
jast zumba_addict: sure. git push --delete origin test-branch. remote branch gone, local branch stays.22:04
sukima It is weird. My boss is using commit messages to move the integrated bug tracking tickets from inprogress to done and he is doiing it my appending to a garbage file which adds noise to the diffs.22:04
zumba_addict cool jast22:04
what happens if i do git push origin test-branch? is it going to be created?22:04
jast yep22:04
zumba_addict got it22:04
← joelroa left22:04
← Ericx2x left22:04
arkanes is there any way to get git to merge a commit even if the commit is part of a branches history already?22:04
← Noldorin left22:04
arkanes or some way to convince it to just kinda forget that some merges happened22:05
jast no22:05
→ jogos joined22:05
arkanes :\22:05
→ MetalMatze joined22:05
jast merges can't be undone... at least not without altering history22:05
Hello71 sukima: git commit --allow-empty22:05
sukima PerlJam: Also it culd be usefull if you have a deploy that's triggered on a git commit hook and you want to rerun it without making silly changes to source files. (like on project that added random quotes from Mr. T to the README just to trigger a rebuild)22:05
arkanes I merged a feature branch into trunk and pushed it when it shouldn't have been done22:05
jast you can cherry-pick previously merged commits to apply their effects again22:06
→ xsbeats joined22:06
arkanes then I reverted the changes, but now I need to merge the feature branch in for real22:06
← xaq left22:06
arkanes there's like 1000 commits involved, is there any way I can automate cherry picking them?22:06
jast sukima: sounds more like a limitation in the deployment system if it *forces* you to push something in order to deploy22:06
arkanes: cherry-pick supports commit ranges22:06
← ojacobson left22:06
arkanes oh handy22:06
Hello71 or you could rebase22:07
sukima jast: you are correct!22:07
PerlJam sukima: crazy22:07
jast you may be interested in -n to hold off on committing each individual picked commit22:07
zumba_addict jast: what would be the param if I want to delete local branch?22:07
arkanes I'll give that a try, thanks22:07
jast zumba_addict: there's a separate command for that, git branch -d <name>22:08
→ W0rmDr1nk joined22:08
flazz → flazz_gone22:08
zumba_addict got it22:08
jast (which will only work if the branch is merged into whatever is currently checked out, use -D to force)22:08
zumba_addict looks like that was done to be saved from accidental commands22:09
← cfoch left22:09
jast yep22:09
zumba_addict cool!22:09
→ thevishy joined22:09
← thevishy left22:09
← elrolito left22:10
→ mnunberg joined22:10
→ elrolito joined22:10
→ thevishy joined22:10
zumba_addict thanks jast, i'm taking off now22:10
:)22:10
mnunberg hrm, how can i force git to give me a prompt on an http 403/401?22:10
for some reason the version of git i have on this centos6 host does not prompt me, but some other versions do22:11
→ Mission-Critical joined22:11
jast there's nothing to prompt for on a 40322:11
→ Exancillatus joined22:11
Hello71 well, strictly speaking it depends on the http auth22:11
→ overZoF joined22:11
mnunberg normal github stuff22:11
Hello71 you can have both with or without Authentication22:11
*WWW-22:11
but 403 requesting auth is wrong22:12
mnunberg hrm, i'm not sure where it's coming from22:12
Hello71 curl.22:12
jast it's probably sufficient to include a username in the URL22:12
mnunberg just upgraded it. still nada22:12
jast e.g. https://jast@github.com/...22:12
mnunberg yeah22:12
let me try that22:12
(gnome-ssh-askpass:11121): Gtk-WARNING **: cannot open display:22:12
(what happened to text prompts)22:13
Hello71 is curl even installed?22:13
jast text prompts are so 186322:13
mnunberg yep22:13
→ Not_Whatever2 joined22:13
→ ZaeDrake joined22:13
mnunberg oh dear. error: cannot run /usr/libexec/openssh/gnome-ssh-askpass: No such file or directory22:13
jast your setup may be slightly broken22:14
mnunberg hrm, maybe. i believe this is a fairly "Pristine" system"22:14
jast I don't even know where it takes that from22:14
← sohail left22:14
Hello71 the askpass setting.22:14
← robbyoconnor left22:14
← ZoF left22:14
← AVDeen__ left22:14
mnunberg [mnunberg@cen-1917 lcbpackage]$ env|grep ASK22:15
SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass22:15
oh heythere22:15
← elrolito left22:15
→ kwallace2 joined22:15
← ncthom91 left22:16
← jogos left22:16
← cannonball left22:16
mnunberg oh there, it works22:16
thanks folks. it only took me an entire hour to figure out how to enter a password. how we've made great strides in technology22:17
→ enigmus joined22:17
← Not_Whatever2 left22:17
← sukima left22:18
← thevishy left22:18
← Diemuzi left22:19
→ mkantor joined22:20
zumba_addict is this reliable, git branch -r | wc -l22:22
← Kayra left22:22
→ [aviraldg] joined22:22
mkantor how do i refer to a specific commit in a remote? i want to do something like `git diff upstream/87b5c43` but can't figure out how to specify the commit (and my google-fu is failing me)22:22
← pfg left22:22
← [aviraldg] left22:23
→ [aviraldg] joined22:23
→ sohail joined22:23
kadoban mkantor: git doesn't care where the commit is from. git diff 87b5c43, perhaps after fetching22:24
→ garietyxxx joined22:25
garietyxxx Why is it called a "pull request" and not a "merge request"?22:25
← dort left22:25
→ Umschwung joined22:25
Mission-Critical → MissionCritical22:25
mkantor kadoban: that's what i thought, but it's not giving me expected results. probably user error though, thanks!22:26
kadoban garietyxxx: because a pull is a fetch + a merge, which is what you're generally requesting be done?22:26
← AaronMT_ left22:26
→ osse joined22:26
kadoban mkantor: it's possible i'm wrong somehow, but i think it should work22:26
← ZaeDrake left22:27
← TheFuzzball left22:27
← rbartos left22:27
← rudisimo left22:28
→ buffal0 joined22:28
→ rbartos joined22:28
← reskp left22:29
← nnyk_ left22:29
mkantor kadoban: `git show 87b5c43` does show what i'd expect, i think my confusion is actually because `git diff 87b5c43` is showing `git diff 87b5c43 HEAD` instead of diffing against my working tree22:30
← Gizburdt left22:30
→ Kayra joined22:30
kadoban mkantor: ohhh, hmm. there must be a switch to do that maybe22:30
→ jogos joined22:30
← Exancillatus left22:30
jrn garietyxxx: you mean the github kind or the kind you make with 'git request-pull'?22:31
kadoban mkantor: err, but i thought that against the working tree was the default actually, that's weird...22:31
→ eletuchy joined22:32
jrn garietyxxx: the former is named after the latter22:32
luminous hello! can you drop/remove the history associated with a set of files, along with the files from the repo?22:32
← Umschwung left22:32
grawity only if you rewrite the entire history using `git filter-branch`22:32
mkantor kadoban: it's strange because `git diff HEAD` and `git diff current-branch` show what i'd expect (and this is how i usually use diff), but it seems that when i specify any branch besides the one i'm on it suddenly uses HEAD as the source instead of the working tree22:32
luminous grawity: ok, how would that work?22:32
jrn luminous: if you don't mind rewriting history (see 'RECOVERING FROM UPSTREAM REBASE' in man git-rebase) then sure22:32
gitinfo luminous: the git-rebase manpage is available at http://jk.gs/git-rebase.html22:32
grawity so that's usually done only if the files are huge, or if they have sensitive data22:32
kadoban luminous: by rewriting history, yes. you usually want to avoid that though, unless that file should really really not have ever been in there, because of security concerns or the like22:32
luminous awesome, thanks for the info!22:33
→ HelloShitty joined22:33
xender luminous: man git-filter-branch22:33
gitinfo luminous: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html22:33
garietyxxx kadoban: okay, that makes sense. But when I think of pull-requesting, it's usually a separate branch, and needs to be merged into master manually.22:33
luminous kadoban: yes, I hear that. I'm looking to do something like that as part of creating a new repo as a clone of an old one22:33
← zezollo left22:33
luminous great! thank you :)22:34
grawity generally, the whole point of Git is to keep history, so if you delete a file now, it still keeps history of the file that /has been there/22:34
luminous yep22:34
kadoban mkantor: yeah, i can't really understand why those would be different...they seem to be the same to me, but i might just not be testing the right thing22:34
jrn the way I (ab)use it, the point of git is to tell stories ;-)22:35
xender grawity: Yeah, unless you commit some generated [binary] code or passwords ;>22:35
← Mitchbon_ left22:35
→ Mitchbones joined22:35
→ Chryyz joined22:35
← eletuchy left22:36
← scelis left22:36
← garietyxxx left22:38
→ Zaknefain joined22:38
→ CKyle joined22:38
← jogos left22:39
← sdouglas left22:39
→ werlley joined22:39
→ armyriad joined22:40
→ fatalhalt joined22:41
← nick108 left22:41
→ Element9 joined22:42
← Neozonz left22:42
← JerryT left22:42
mkantor kadoban: yep, it works as expected here too from a test repo… discovered it was pebkac: it turns out this repo has multiple copies of the same file and i was editing the wrong one :rollseyes:22:42
thanks for humoring me anyway!22:42
→ DurtyD joined22:42
Element9 i am trying to clone a repo through ssh and I am getting the error: "DENIED by fallthru"22:42
← Zaknefain left22:43
← zumba_addict left22:43
kadoban mkantor: ahh, glad you figured it out at least. always fun when reality ceases to make sense :)22:43
Element9 i haven't seen that before. what should I recheck?22:43
→ JerryT joined22:43
kadoban Element9: is there more to the error?22:44
Element9: and is this using gitolite or something like that, or just plain ol' ssh?22:45
Element9 i don't know what's on server side. I am using msysgit on Windows. i haven't had this problem with other repos22:46
← kermit left22:46
Element9 let me pastebin the whole error message22:46
← FortySix2 left22:46
→ ZoF joined22:46
kadoban Element9: it sounds to me like gitolite on the server, and you're not supplying the correct key...which i don't actually know how you're supposed to do that one windows personally22:46
but it's possible that other things i don't know about give errors that sound like that22:47
→ chessguy joined22:47
→ kermit joined22:47
← Havvy left22:47
← kirin` left22:48
→ kinboster joined22:48
→ joelroa joined22:49
→ kirin` joined22:49
→ francesca joined22:49
← qinbo left22:50
← overZoF left22:50
Element9 here's the whole message: http://pastebin.com/CmVtd21722:51
← johntitor2036 left22:51
→ TheFuzzball joined22:51
← Gamecubic left22:51
Element9 i removed the actual address of the server22:51
kadoban: yes, that's what i got with googling too22:51
→ johntitor2036 joined22:52
← JerryT left22:52
kadoban Element9: yeah, it sounds like you're not supplying the credentials that the server requires. you'll very likely have to talk to them22:52
Element9: usually you give them your pubkey, and they set it up so you have read access, or whatever access they want you to have22:53
→ FortySix2 joined22:53
Element9 kadoban: yes, that's exactly what we did22:53
→ jogos joined22:53
← rbartos left22:54
Element9 i just didn't want to ask if the problem is on server until i made sure that the problem isn't on my side :)22:54
← fairuz left22:54
Element9 kadoban: thanks a lot for the help22:54
→ overZoF joined22:54
Element9 much appreciated22:54
kadoban Element9: it sounds like it's on their side. you're welcome, good luck figuring it out22:54
→ TheFuzzb_ joined22:56
← jaequery left22:56
← TheFuzzball left22:56
TheFuzzb_ → TheFuzzball22:57
← tvw left22:57
→ JerryT joined22:57
→ nlogn joined22:57
→ cfoch joined22:57
← JerryT left22:57
→ jaequery joined22:58
→ ncthom91 joined22:58
← ZoF left22:58
← pantsman left23:00
← xsbeats left23:00
← aard_ left23:00
→ Oog joined23:01
Oog i did git fetch --all and saw that it pulled from each remote23:02
does git keep a copy of what each remote has?23:02
← hobodave_ left23:02
cbreak yes.23:02
xender Oog: That's what tracking branches are for23:02
cbreak Oog: git branch -a shows them23:03
(and all local ones too)23:03
Oog tracking branches?23:03
→ dagnachew joined23:03
Oog basically i need to reset everything origin master23:04
cbreak branches that track what the remotes are up to23:04
Oog so i did git fetch --all\23:04
→ Gamecubic joined23:04
Oog oh23:04
← CKyle left23:04
cbreak origin/master is origin's master at the time of your last normal fetch23:04
Oog yeah i then did git reset --hard origin/master23:05
← DurtyD left23:05
Oog i just want to make sure fetching from my other remotes doesnt mess them up some how23:05
i have a beta and production remotes that go to heroku23:05
i only push to them never upll23:05
cbreak Oog: those should also show up in git branch -r23:05
→ reskp joined23:06
← Olipro left23:06
Oog i even see branches that were delted23:06
← el3ctron_ left23:06
cbreak you can remove those with git fetch --prune23:07
← simesy left23:07
← pierre1_ left23:07
→ torjus joined23:07
← reskp left23:07
Oog it all looks good push worked23:07
ok thanks23:07
← aMoniker left23:08
← jogos left23:08
→ pfg joined23:08
← jerius left23:08
→ reskp joined23:09
→ jcs222 joined23:09
→ dancat joined23:09
→ shruggar_ joined23:10
← shruggar left23:10
← Element9 left23:11
← torjus left23:12
→ elrolito joined23:12
→ diegovio1 joined23:12
← elrolito left23:12
← Oog left23:12
← shamp left23:12
← Freeman42 left23:12
← W0rmDr1nk left23:12
→ robbyoconnor joined23:12
diegoviola → Guest8985923:13
← Kayra left23:13
diegovio1 → diegoviola23:13
← jaequery left23:13
← Guest89859 left23:14
→ ciampix joined23:14
← codezomb left23:17
→ Olipro joined23:18
← [aviraldg] left23:19
guzzlefry Is there a common method for turning a directory in a git repo into a submodule?23:22
→ jogos joined23:23
→ Noldorin joined23:23
Hello71 !xy?23:24
gitinfo Woah, slow down for a bit. Are you sure that you need to jump to that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...23:24
tshirtman lol, nice alias23:24
→ jaequery joined23:25
← DrShoggoth left23:25
Vampire0 kewl23:25
→ Juzzika joined23:26
guzzlefry Was thta for me?23:26
that*23:26
→ cads joined23:27
Vampire0 kewl is a phonetic writing of cool and referred to the alias as tshirtman did. :-)23:28
← reskp left23:28
Vampire0 The alias however was meant for you guzzlefry, yes23:28
← petey left23:29
→ scarabx joined23:29
→ reskp joined23:29
→ ErKa joined23:30
← livingstn left23:30
guzzlefry Well, I have a third party application that has custom modules inside a modules/ directory. I figure the best way to handle deployment and such is to track the third party files in the main repo, and then have each custom application module as a submodule.23:30
→ hobodave joined23:30
← robbyoconnor left23:30
→ sluther joined23:31
← arkanes left23:32
→ Zaknefain joined23:32
→ eletuchy joined23:32
→ dort joined23:33
← reskp left23:33
joshu_ how do you specify in gitignore to ignore not a directory but the contents of the directory?23:35
← dancat left23:36
← jogos left23:36
← Zaknefain left23:36
kadoban joshu_: dir/* ?23:36
joshu_ kadoban oh i was doing dir/23:37
← eletuchy left23:37
joshu_ but that ignored the dir + contents23:37
kadoban joshu_: i think they're pretty much the same thing though, since git doesn't care about directories, only files...so i'm not entirely sure there's a difference at all23:37
→ RaceCondition joined23:38
→ JerryT joined23:38
→ rbartos joined23:38
→ tomengland joined23:39
joshu_ so how do you commit a directory but ignore the files or does the directory need to have a file for the directory to be committed/23:39
← mkantor left23:39
← TheFuzzball left23:40
kadoban joshu_: ya, it needs to have a file in it23:40
joshu_ ah23:40
because i have a ssh-keys dir that my project requires but I don't want to upload the keys inside when I push to github23:41
kadoban you can commit a file called .empty in it, or have the executable just create that directory if it doesn't exist23:42
→ unixpro1970 joined23:42
← unixpro1970 left23:42
joshu_ ok is .empty an acceptable way or is it a bad practice?23:43
← tomengland left23:43
→ bond joined23:44
kadoban joshu_: it's all you can really do if you need git to create that directory on clone23:44
← harobed left23:44
guzzlefry joshu_: probably not a big deal.23:44
joshu_ ok just getting started with git github so don't want to do anything that's frowned upon ;)23:44
kadoban joshu_: i tend to thing that just creating the directory in the executable for the project is a better idea, but it depends if that's feasible23:44
think*23:45
→ tomek joined23:45
← fr33 left23:46
→ LittleFool joined23:46
guzzlefry So, creating submodules, is there an easy, straight-forward way?23:46
→ AaronMT joined23:46
← endra left23:47
← phantomtiger left23:47
joshu_ kadoban yeah I'll go ahead and do that. thanks for your help23:47
kadoban 'welcome23:47
→ infynyxx joined23:47
← sgambino left23:48
← Gamecubic left23:48
→ jaf2k joined23:50
→ robbyoconnor joined23:50
← acharlieh left23:50
→ jogos joined23:50
→ Kayra joined23:52
→ tnzr joined23:52
← MetalMatze left23:52
← Thra11 left23:53
tnzr hi guys.. dumb question: I have 2 git repos repo1 and repo2 and I'd like to combine them into one repo by having repo2 be a subdirectory in the root of repo1, and still be able to preserve repo2's history23:53
I found a stack overflow article that suggested using filter-branch to rewrite the names of everything in repo2, but I'm not sure how to use it23:54
← UserError left23:54
→ acharlieh joined23:55
← acharlieh left23:55
← axl_ left23:56
← ngladitz left23:56
→ Gamecubic joined23:56
← Dougie187 left23:58
← shawndumas left23:58
→ reskp joined23:59

Logs Search ←Prev date Next date→ Channels Documentation