IRCloggy #git 2012-03-24

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.

2012-03-24

EugeneKay !vcsh00:00
gitinfo https://github.com/RichiH/vcsh -- version control shell - manage dotfiles using git's fake bare repos to put more than one working directory into $HOME00:00
← Jay_Levitt left00:00
kevlarman WHYYYYYYYYY :(00:00
← eno left00:02
→ rue joined00:02
bencahill EugeneKay: yes, this looks very nice, thanks :)00:02
EugeneKay "Because fuck you, that's why."00:02
← Chaser_ left00:03
→ sudoquai joined00:03
← marthinal left00:04
→ eno joined00:04
johnkpaul → johnkpaul-afk00:04
← lastk_- left00:04
→ lastk joined00:05
lastk hi guys, I have this on my git status: http://d.pr/4pEo but I cant checkout the files, stash or even change the branch, some idea please?00:05
milki whast the error?00:06
→ diogogmt joined00:06
← scientes left00:07
← TLGreg left00:08
← enmand left00:08
← timoxley left00:08
EugeneKay Could you please !repro using a proper pastebin? I loathe the idea of allowing JS just to see a few lines of terminal ;-)00:08
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript of your terminal session. This will help immensely with troubleshooting.00:08
← tatsuya_o left00:09
← Big_Brother left00:09
→ tatsuya_o joined00:09
→ jason237 joined00:09
← nenjordi left00:10
← lastk left00:10
milki or run away00:10
thats fine too00:10
ask and run!00:10
← eno left00:11
→ lastk_ joined00:11
bencahill EugeneKay: hmm, can you help me set that up? I'm following the instructions under 4.1.2 of it's readme, but I'm confused00:11
→ Dave^|| joined00:12
EugeneKay bencahill - no clue; never used it.00:12
bencahill EugeneKay: ok00:12
← lastk_ left00:12
bremner bencahill: are you talking about vcsh?00:12
bencahill bremner: yes00:13
→ eno joined00:13
← SmokeyD left00:13
bremner I can try... What specifically is confusing you?00:13
← BashCoder left00:13
→ lastk joined00:13
lastk hi guys, my git status is that: http://d.pr/4pEo , it is after a pull without change the master, but now I cant stash, checkout these files or even change the branch, some idea?00:13
← metalfan_ left00:13
bencahill bremner: thanks...under 4.1.2 of the readme on this page: https://github.com/RichiH/vcsh00:13
bremner ok00:14
bencahill bremner: fourth step is vim .mrconfig ... I don't have a such file, am I supposed to create what's inside the single-quotes on the line above?00:14
← Davey left00:14
bencahill bremner: or am I supposed to just touch it?00:14
← master-lincoln left00:14
bencahill s/create/create it/00:14
← Dave^| left00:15
→ scottschulthess joined00:15
→ lyddonb joined00:15
bremner bencahill: my .mrconfig looks like: http://paste.debian.net/160815/00:15
bencahill: you don't strictly _need_ to use mr with vcsh00:15
bencahill bremner: what's the advantage to it?00:16
SethRobertson Presumably you could use gitslave as well :-)00:16
bremner bencahill: you can update all of your repos with one command; if you follow RichiH's suggestions, you will have a lot of repos00:16
bencahill bremner: I'll probably just have three in ~: dotfiles, binfiles, and vimconfig (or something along those lines)00:17
bremner ok, then maybe you don't need mr.00:17
→ nrichards joined00:17
← alesan left00:17
→ BashCoder joined00:18
bencahill bremner: mr is just to be able to do things to multiple repos at one time?00:18
bremner right00:18
bencahill 'k00:18
← linusoleander left00:19
→ unomystEz joined00:20
unomystEz I just committed my project on my desktop, how can I replicate it over to my laptop so I can work on the laptop version until I get back to my desktop?00:21
← eno left00:21
→ dreiss joined00:22
→ eno joined00:22
← eno left00:22
→ eno joined00:22
← Destos left00:23
← rue left00:23
← Goplat left00:24
deltree_ well, if you haven't figured it out by now, it didn't quite work out of the box00:24
it is being finicky about the web.config00:24
bencahill bremner: oh, so if I don't use mr, I don't have to do any configuration at all, right?00:26
bremner: I just init multiple repos with whatever files I want, not worrying about anything00:27
sweet ;)00:27
← maletor left00:27
← wilmoore left00:27
→ guampa|2 joined00:28
← guampa left00:28
guampa|2 → guampa00:28
bencahill bremner: here's another question though: I currently have my dotfiles set up (just a little bit) on github as origin00:28
→ mattfoo| joined00:29
bencahill bremner: ...how can I transition this to a vcsh repo?00:29
(still very new to the whole git world)00:29
→ mattfoo^ joined00:29
← eno left00:29
← mattfoo left00:29
← mattfoo- left00:30
→ eno joined00:31
← eno left00:31
→ eno joined00:31
pasky i wish git would support automatic fastforward when pushing to a checked out copy :(00:31
bremner yeah, mercurial can do that, git sucks00:32
(just kidding)00:32
kevlarman pasky: don't push to non-bare repositories00:32
bencahill lol00:32
← subh__ left00:32
← lyddonb left00:32
pasky kevlarman: why?00:32
← shibayu36 left00:32
kevlarman pasky: see faq non-bare00:32
gitinfo pasky: Pushing to non-bare repositories is discouraged; more details available at http://jk.gs/gitfaq#non-bare00:32
→ shibayu36 joined00:33
kevlarman basically git can't guarantee it won't destroy local changes00:33
so it refuses to try00:33
pasky kevlarman: yes, so what's wrong with it if git refuses to do it in case it's unsafe?00:33
(btw that link is broken)00:33
bencahill worked here00:34
pasky not here :(00:34
kevlarman pasky: it's always unsafe, so git refuses00:34
bencahill pasky: it requires that your browser supports redirects :P00:34
→ axl_ joined00:34
jast here's the expanded link: https://git.wiki.kernel.org/articles/g/i/t/GitFaq_ebc3.html#non-bare00:35
← localhost left00:35
pasky bencahill: hmm interesting, elinks actually doesn't seem to preserve the #fragment on redirect00:35
jast I believe preserving the fragment isn't required by the RFC, but most user agents do it anyway00:35
pasky kevlarman: why would pushing to a branch that is not checked out be unsafe?00:36
bencahill pasky: ah I see...not usual to see that (# on a redirect)00:36
← axl_ left00:36
bencahill pasky: e.g. stackoverflow answer links are like so.com/a/xxxxxx, redirecting to so.com/bla/whatev/xxxxxx#xxxxxx00:36
or smth like that00:36
← jason237 left00:36
kevlarman pasky: you can push into branches that aren't checked out00:37
pasky kevlarman: but you just said "don't push to non-bare repositories"00:37
kevlarman pasky: because you generally don't know what is and isn't checked out00:37
pasky but git will check that for me00:37
→ localhost joined00:38
pasky anyway, why not take the next logical step and allow push to branches that are checked out but can be fastforwarded easily?00:38
shruggar … only things within refs/heads/ can be checked out. Simple solution: don't push to refs/heads00:38
pasky but that misses the whole point of pushing to a non-bare repo in the first place since it's not convenient anymore00:38
← airborn left00:38
jast the whole point of it, according to git, is that you shouldn't do it00:39
shruggar I disagree! :)00:39
jast and if you really want to, you install the hook the FAQ talks about00:39
shruggar with pasky's point, that is00:39
← shruggar left00:39
pasky jast: that hook does something rather crazy like automated git stash00:40
i don't feel *quite* that liberal :)00:40
→ Davey joined00:40
← agile left00:40
jast feel free to edit it, then :)00:41
pasky i'm just wondering if there's a reason why git shouldn't do this on its own00:41
← HG` left00:42
← dreiss left00:43
jast I think that'd make the conditions under which push goes through or refuses even more confusing00:43
→ Eridius_ joined00:43
← Eridius left00:43
Eridius_ → Eridius00:43
jast and the main problem is that it's hard for git to tell whether someone isn't currently editing the files in the working tree00:43
deltree_ k, didn't work out of the box, but that's because my app pool was set to .net 2.0, this uses .net 4.0, for those of you who want to help others who ask, it looks good so far00:43
jast if that's the case, there are likely to be clashes where someone unwittingly overwrites changes unexpectedly added by git00:44
bremner deltree_: what does it need .net for, do you know?00:44
jast you're kind of making the assumption that the non-bare repository won't be edited in00:44
pasky jast: yes that's one problem that occured to me00:44
deltree_ bremner: this is a web application that is written in c#00:44
← sudoquai left00:44
jast yay c# :)00:44
bremner oh, so not git per se00:45
deltree_ it wraps around the git bash interface00:45
jast well at least it's not java00:45
→ Makoryu joined00:45
pasky but i think it is a fair tradeoff, still something worth supporting by just a flip of config switch00:45
deltree_ basically, you're making bash calls through a website00:45
pasky i'll whip up a patch when i get a free moment00:45
← eno left00:45
jast do that... I'm kind of interested in seeing the responses00:45
pasky :))00:45
jast I'm betting that someone will say "that just clutters things since we already have the deny option"00:46
pasky well having this as another value of the deny option really makes the most sense I think00:47
jast then it just contradicts the option name00:47
← SegFaultAX|work left00:48
pasky oh yeah we were never very good with picking names for stuff00:49
the value could be called "unlessFastforward" but it's not the prettiest I admit00:49
→ austinbv joined00:49
jast a reasonable name might be receive.updateCurrentBranch00:50
← Davey left00:50
jast and while we're at it, the other deny* should be flipped, too00:50
nobody likes double negatives00:50
← PsiliPharm left00:51
→ scvrory joined00:51
→ leobin joined00:51
← Spockz left00:52
scvrory is there a way to add all submodules from a .gitmodules file?00:52
jast do you mean: git submodule update --init00:52
→ jason237 joined00:52
← lausi left00:52
← lastk left00:52
→ lausi joined00:52
→ PsiliPharm joined00:53
← dougsland left00:54
→ eno joined00:55
← eno left00:55
→ eno joined00:55
→ fisted joined00:56
← leobin left00:56
scvrory jast: no, the submodules were never added to the repository, the .gitmodules is from a different repo00:56
← scottschulthess left00:56
→ agile joined00:57
← eletuchy left00:57
← philips left00:58
← ldlework left00:59
→ philips joined01:01
→ Spockz joined01:02
← agile left01:02
→ agile joined01:02
← BashCoder left01:03
scvrory this worked for me but i wish there was a better way.. https://gist.github.com/138456601:04
← subbyyy left01:04
→ iocor joined01:04
← mklappstuhl left01:04
→ n1x joined01:05
→ worz joined01:07
→ Davey joined01:08
→ archdori joined01:08
← monty` left01:09
→ Goplat joined01:10
← n1x left01:10
← eno left01:11
→ eno joined01:12
← eno left01:12
→ eno joined01:12
← ColKurtz left01:13
← soulcake left01:14
→ posciak joined01:15
← eno left01:17
→ scottschulthess joined01:17
← francisfish left01:17
→ subbyyy joined01:17
posciak hi, when I apply patches with git am and the patch fails, it's different from cherrypick in that it does not leave files unmerged so I could merge them manually and say git am --resolved. Or am I missing somethign? How should this be used?01:17
→ eno joined01:18
→ lyddonb joined01:18
→ mklappstuhl joined01:18
← oojacoboo left01:18
→ rue joined01:20
→ leobin joined01:21
← Makoryu left01:21
→ maletor joined01:22
_aeris_ → _aeris_|away01:23
← apok left01:23
← rue left01:24
← brokenshakles left01:25
← sh4rm4 left01:27
← Araxia left01:27
→ BashCoder joined01:27
← worz left01:27
→ sh4rm4 joined01:27
→ codeM0nK3Y joined01:27
← teotwaki left01:27
← Yuuhi`` left01:28
← jason237 left01:28
← mklappstuhl left01:29
← BashCoder left01:30
← eno left01:30
→ newbie999|3 joined01:31
← proq left01:32
→ eno joined01:32
← eno left01:32
→ eno joined01:32
← newbie999 left01:33
→ nikuyoshi joined01:34
bencahill bremner: hey, I'm still having a little trouble...does it matter where I run the vcsh commands from?01:34
← scottschulthess left01:34
← rasmusth left01:35
← nikuyoshi left01:35
← XayOn left01:35
→ nikuyoshi joined01:35
← cannonball left01:35
→ XayOn joined01:36
→ scottschulthess joined01:36
bencahill it seems like I can run them wherever I want to...but I'd always want to run with the same 'profile' in the same dir...otherwise I'd have duplicates, or stuff moving around01:38
← eno left01:38
bencahill but how can I get specific .gitignores?01:38
I've done vcsh init binfiles01:38
← maletor left01:39
bencahill but adding ~/.gitignore.d/binfiles doesn't seem to do anything to vcsh run binfiles git status01:39
:-/01:39
can anyone help with vcsh?01:39
→ maletor joined01:39
→ eno joined01:40
← scottschulthess left01:40
← nikuyoshi left01:40
← maletor left01:41
← satyanash left01:42
← codeM0nK3Y left01:43
→ Refried_ joined01:43
← ph^ left01:44
← pragma` left01:44
→ pragma` joined01:44
pragma` → pragma_01:44
← tystr left01:45
→ brokenshakles joined01:45
Refried_ I read a vague blog post that says "Another consequence, at least with Git, is that it can track the movement of things smaller than a file, e.g. a single function being moved from one file to another." -- is this true? and if so, what is it this called so i can read more? (or can you provide a helpful link?)01:45
→ Chib joined01:46
← shibayu36 left01:47
Eridius Refried_: check out the manpage for git-blame. It can show you info on movement of lines/functions01:47
jast Refried_: git uses heuristics in a bunch of things, e.g. merge. movements of code aren't explicitly recorded as such, but a number of operations will detect them if necessary.01:48
Refried_ thanks01:48
→ caseymcg joined01:48
Refried_ jast: hmm *nod*01:48
← leobin left01:48
← diogogmt left01:50
← johnkpaul-afk left01:50
← eno left01:50
← breck left01:50
rotham hey... i just pulled in a remote.. git pull -u origin/master, and realize I need to undo it :| how can I do that?01:52
→ eno joined01:52
← eno left01:52
→ eno joined01:52
← dzonder left01:52
→ zweb joined01:52
→ chris_zweber joined01:53
← chris_zweber left01:56
← maknz left01:56
bencahill does anyone here know about vcsh?01:56
→ maknz joined01:56
Refried_ ok.. blame -C... that's very interesting01:56
jast !vcsh01:57
gitinfo https://github.com/RichiH/vcsh -- version control shell - manage dotfiles using git's fake bare repos to put more than one working directory into $HOME01:57
← alberto56 left01:57
jast oh, that thing01:57
bencahill jast: well yes ofc, I'm just having trouble understanding some things :)01:57
jast was looking more for myself01:57
I don't know anything about it01:57
bencahill hehe01:57
well here's what I want01:57
← tkil left01:58
bencahill I want two separate git repos (synced to github repos), dotfiles and binfiles01:58
← gmarseliss left01:58
bencahill binfiles will contain files in bin/ (but won't have them as in bin/, of course), and dotfiles will contain files in ~01:58
→ project2501b joined01:59
← arietis left01:59
bencahill I suppose I can just make them completely separate, and not worry about submoduling them together :-/01:59
that would probably be easiest, I suppose01:59
← perdo left02:00
bencahill yeah, I'm just making things hard on myself :)02:01
← brokenshakles left02:01
bencahill sweeto: https://github.com/bencahill/binfiles02:02
:)02:02
bencahill has a lot of scripts o.002:03
→ rasmusth joined02:05
← eno left02:05
← matthiaskrgr left02:06
← limoges left02:06
→ matthiaskrgr joined02:06
→ eno joined02:07
← eno left02:07
→ eno joined02:07
← rasmusth left02:10
← btanaka left02:12
→ brokenshakles joined02:13
→ rasmusth joined02:13
→ timoxley joined02:15
→ allaire joined02:16
← guampa left02:17
allaire Hey guys, if I need to pull a remote branch, but know that certain files will conflict, should I do a git fetch, remove these files in the origin branch I just fetched, and then do the merge? Will this do the trick to ignore merging some files02:17
→ Gentlecat joined02:18
← allaire left02:19
→ allaire joined02:19
← akiress left02:20
→ BashCoder joined02:21
← allaire left02:21
← Refried_ left02:21
→ allaire joined02:21
allaire Hey guys, if I need to pull a remote branch, but know that certain files will conflict, should I do a git fetch, remove these files in the origin branch I just fetched, and then do the merge? Will this do the trick to ignore merging some files (sorry if it's a dup. I think my irc client bugged)02:22
scvrory is there an easier way to do this (preferrably without perl..) https://github.com/robertkrimen/git-submodule-load ?02:25
← bencahill left02:25
→ w09x joined02:26
← timoxley left02:27
← iocor left02:28
→ chrisgeorge joined02:30
← eno left02:30
→ Refried_ joined02:31
→ jmoreira81 joined02:32
← spyro left02:32
→ resmo_ joined02:32
→ spyro joined02:32
→ eno joined02:32
← eno left02:32
→ eno joined02:32
← jim left02:32
jmoreira81 anybody have experience setting up gitosis?02:33
kevlarman jmoreira81: !gitosis02:33
gitinfo jmoreira81: gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite02:33
jmoreira81 kevlarman: what's the difference between the two?02:34
← resmo__ left02:34
← Refried_ left02:34
bremner one is supported02:35
→ mister_m joined02:35
jmoreira81 bremner: gotcha.. thanks...02:36
bremner: i had already installed gitosis bymmer!02:36
← redheadphones left02:38
kevlarman jmoreira81: one is no longer supported by its author, the other i asked for the documentation to be clarified on permissions in the config file and by the time i was home from work that day it was02:38
→ breck joined02:38
jmoreira81 kevlarman: cool. i'm reading the doc now...02:39
kevlarman: quick question… i need to set up a repo for a project i'm going to be working on with a friend…. i've only used git for myself being a one developer to keep track of my code but now i'm going to be using as a team so i'm going to need to set up for several developers (prob 2).02:40
i need to understand one thing… i'm going to have a central repo.. does everyone push to the same repo?02:41
is that how it works?02:41
kevlarman yes02:41
jmoreira81 doesnt that cause conflicts?02:41
so every developer needs to pull everytime they work on a feature correct?02:42
← jacof left02:42
→ jacof joined02:42
← eno left02:42
→ eno joined02:43
← eno left02:43
→ eno joined02:43
← austinbv left02:44
← xGambit left02:44
→ xGambit joined02:45
kevlarman jmoreira81: there's no magical way to resolve actual conflicts without human intervention02:45
← allaire left02:45
→ austinbv joined02:46
← Vampire0 left02:46
→ archdori_ joined02:46
← austinbv left02:46
jmoreira81 kevlarman: how does github work if many developers push?02:47
← archdori left02:49
← jameswarren left02:51
→ jameswarren joined02:51
← jameswarren left02:51
← QshelTier left02:52
← kadoban left02:53
← el2ro left02:55
← PsiliPharm left02:55
→ satyanash joined02:55
→ phlipper joined02:57
← breck left02:58
rbrooks_ → rbrooks02:58
→ timoxley joined02:59
→ josefig joined02:59
← josefig left02:59
→ josefig joined02:59
→ PsiliPharm joined02:59
→ dabd joined03:00
← Goplat left03:01
→ Bombe joined03:01
→ redheadphones joined03:03
← dabd left03:04
→ _inc joined03:05
→ dabd joined03:05
→ breck joined03:05
→ nikuyoshi joined03:06
← _inc left03:06
→ kermit joined03:08
← pdtpatr1ck left03:10
← nikuyoshi left03:12
→ alesan joined03:13
← jacof left03:13
→ jacof joined03:13
→ igotnolegs joined03:14
← orafu left03:15
← zweb left03:16
→ nikuyoshi joined03:17
→ johnkpaul-afk joined03:17
johnkpaul-afk → johnkpaul03:18
→ pdtpatr1ck joined03:19
← nikuyoshi left03:19
← Chillance left03:20
← Russell^^ left03:20
→ rue joined03:20
→ nikuyoshi joined03:21
jmoreira81 trying to install gitolite i get the following error http://paste.ubuntu.com/897324/03:23
← rotham left03:23
← nikuyoshi left03:27
sitaram jmoreira81: sounds clear enough; what's the confusion?03:27
→ dr0id joined03:27
← dr0id left03:27
→ dr0id joined03:27
jmoreira81 need to edit my $HOME which i'm doing now...03:28
sitaram jmoreira81: edit $HOME? What does that mean?03:28
→ oojacoboo joined03:28
jmoreira81 sorry.. need to make sure $HOME/bin is on my default path03:29
sitaram jmoreira81: perhaps you should read the last line of that message, which tells you how to do it without making permanent changes03:29
jmoreira81 editing my default path correct?03:29
→ nikuyoshi joined03:29
← Matrixiumn left03:30
sitaram jmoreira81: I can't help you with that. I'm only here to understand why that message is confusing you, when it was designed to be simple and clear, presenting both a permanent and a temporary solution03:30
← jacof left03:30
← rue left03:30
jmoreira81 sitaram: yea.. thanks....03:30
→ Lewoco joined03:30
jmoreira81 sitaram: i guess03:30
sitaram I guess...03:31
jmoreira81: is it that "do that manually" is being interpreted as "do <change bashrc>" instead of "do 'PATH=....'"?03:31
jmoreira81 that's what i did03:32
i did manually03:32
← nikuyoshi left03:32
→ cakehero joined03:34
Lewoco How can I nuke the last two commits 'merged undead' and 'merged trunk' from this repo: http://troll.ws/i/KdNeoj.png03:34
I want there to be no trace that those commits ever happened.03:34
jmoreira81 I like gitolite...03:34
← eno left03:35
Lewoco I've been toying around with rebase, but I can't seem to get it to work right.03:35
jmoreira81 you don't have to create unix users, you do it by cloning, adding the keys an pushing… that's cool.....03:35
← dabd left03:35
variable Lewoco: git rebase -i03:36
delete the two lines03:36
and exit the edit03:36
→ eno joined03:36
← Davey left03:36
variable you need to do something like git rebase -i HEAD~303:36
Lewoco: also, your commit messages rock03:37
→ jalama joined03:40
→ Davey joined03:41
← Davey left03:41
→ Davey joined03:41
← w09x left03:42
Lewoco variable, Ok I tried git rebase -i HEAD~3 and commented out the first two lines. Unfortunately it didn't seem to actually remove those commits. It only changed the rev I've currently got checked out: http://troll.ws/i/PqhSb2.png03:43
→ gabeh joined03:43
→ Evanescence joined03:44
→ yashshah joined03:45
← ology left03:46
← oojacoboo left03:48
→ Destos joined03:49
← Destos left03:49
← codewrangler left03:49
→ w09x joined03:49
← alesan left03:49
← yashshah left03:50
← eno left03:51
← Karmaon left03:53
→ el2ro joined03:53
→ eno joined03:53
← Dave^|| left03:54
← w09x left03:54
← PsiliPharm left03:54
→ gavin_huang joined03:56
← chrisgeorge left03:56
← breck left03:56
← aspotashev left03:57
→ sdferfx joined03:57
← lyddonb left03:58
← species left03:58
sdferfx Suppose I have a file that I have added to .gitignore, but added to the repo with git add -f. Will updates to that file be tracked by git? Do I have to git update-index --assume-unchanged if I want changes ignored or will .gitignore handle that for me now?03:58
→ Malar joined03:59
→ aspotashev joined03:59
Malar how do i clone|mirror all the git repositories hosted on gitweb server?04:00
← Davey left04:01
← johnkpaul left04:02
→ dirkle joined04:02
← garpenlov left04:05
← cakehero left04:06
→ rurufufuss joined04:08
← eno left04:09
RandalSchwartz Malar - why?04:09
← josefig left04:09
variable Lewoco: once nothing points to them use git gc to actually remove them04:10
Malar RandalSchwartz, to make it available locally.04:10
→ eno joined04:11
variable but you need to make sure nothing depends on them04:11
→ batrick joined04:11
variable another option is git reset --hard HEAD~304:11
Lewoco variable, git gc didn't seem to have any effect04:18
jmoreira81 I got this error when cloning.. this is so weird cuz i cloned gitolite-admin just fine04:18
http://paste.ubuntu.com/897357/04:18
Lewoco variable, git reset --hard HEAD~3 seems to just change which commit I have checked out but doesn't remove either of the two commits I'm trying to nuke.04:18
variable Lewoco: it shouldn't, it will only do things when *nothing* points it04:18
Lewoco variable, I guess I still haven't solved my original problem then =/04:19
variable, git rebase -i works great for a series of commits with no merging. It's only this particular example where I have merging going on where I can't get it to work the way I want.04:20
→ bodom joined04:21
← eno left04:22
→ austinbv joined04:22
→ yoklov joined04:23
→ gnufied joined04:25
→ tarkus joined04:27
← Jarred left04:27
→ Jarred joined04:28
→ aspotashev| joined04:28
← aspotashev left04:29
→ Dragooon joined04:29
← mrbrdo left04:30
← timoxley left04:30
→ macrover joined04:31
Lewoco variable, Ok I think I understand what you meant by *nothing*.04:32
← gabeh left04:32
Lewoco variable, I tried deleting refs/remotes/trunk and then refs/remotes/undead and then I was able to get rid of them.04:33
→ eno joined04:34
variable Lewoco: git is essentially one giant DAG04:34
git gc will remove things when there are no edges pointing to a vertice04:35
but to do that you need to make sure nothing cares about a particular commit04:35
(i.e., it takes some surgery)04:35
→ Davey joined04:36
← diegoviola left04:37
Lewoco The local git repo is actually cloned using git-svn. How do I get branches that I create locally to get pushed upstream when I commit back to svn?04:37
← Dragooon left04:40
Malar is there any way to get the list of repositories hosted on a gitweb server?04:40
← iamjarvo left04:42
← eno left04:42
← macrover left04:42
jmoreira81 i'm getting this error when attempting to push http://paste.ubuntu.com/897367/04:43
anyone?04:43
→ eno joined04:44
← matthiaskrgr left04:46
→ breck joined04:49
← kukks left04:55
← eno left04:55
→ eno joined04:57
← brokenshakles left04:57
→ gabeh joined04:58
← Bartzy left04:58
← RobertLaptop left05:00
→ mritz joined05:00
← breck left05:02
← yoklov left05:03
← Mowsh left05:03
→ aashu_dwivedi joined05:05
→ RobertLaptop joined05:06
→ juvenal joined05:08
← eno left05:11
→ brokenshakles joined05:11
← archdori_ left05:12
→ beautifulmind joined05:12
→ eno joined05:12
← unomystEz left05:13
← beautifulmind left05:13
→ beautifulmind joined05:14
→ RobertLaptop_ joined05:15
← RobertLaptop left05:15
← beautifulmind left05:15
← RobertLaptop_ left05:16
→ jason237 joined05:16
→ RobertLaptop joined05:16
sitaram yeah lots of people on the git ml are debating that very message (or were, a couple days ago)05:18
← smw_ left05:18
sitaram try 'git push origin master', although from your previous pastebin I doubt it will work it will at least get you one step ahead05:18
→ Per4u3e joined05:19
← Per4u3e left05:19
aashu_dwivedi join #python05:20
← caseymcg left05:21
→ matthiaskrgr joined05:28
→ wilmoore joined05:28
→ psakrii joined05:32
← project2501b left05:33
→ ajaykools joined05:33
← eno left05:34
← mritz left05:35
→ eno joined05:35
← austinbv left05:40
→ notola joined05:41
← notola left05:41
Malar is curl "gitweb url"|parse the only way to get a list of repositories hosted on a gitweb server?05:41
← neurodrone left05:42
→ austinbv_ joined05:42
→ kerrick joined05:42
← austinbv_ left05:44
→ xiangfu joined05:45
← alexim left05:47
← mister_m left05:48
← eno left05:52
→ eno joined05:54
← scvrory left05:55
→ limoges joined05:57
← Jarred left05:59
← eno left05:59
→ eno joined06:00
← Bass10 left06:02
← ajaykools left06:03
← eno left06:07
→ eno joined06:09
← eno left06:09
→ eno joined06:09
→ xian9fu joined06:11
→ EyesIsServer joined06:13
→ macrover joined06:14
← Davey left06:16
← madewokherd left06:20
← eno left06:20
→ eno joined06:22
→ akiress joined06:22
← friskd left06:23
← gabeh left06:24
← LucasTizma left06:24
→ rue joined06:26
→ garpenlov joined06:27
← aashu_dwivedi left06:27
→ tingo joined06:31
→ mash__ joined06:32
← rue left06:32
← tic left06:34
→ tic joined06:34
← eno left06:34
→ eno joined06:36
→ chaitu joined06:43
→ raatiniemi joined06:43
← chaitu left06:44
→ chaitu joined06:45
← chaitu left06:45
→ chaitu joined06:46
→ wolftankk joined06:46
← chaitu left06:46
→ chaitu joined06:46
← macrover left06:48
← eno left06:51
→ ajaykools joined06:52
→ kwakbab1 joined06:52
→ eno joined06:53
→ kadoban joined06:54
← bgerber left06:54
← mash__ left06:55
← kwakbab1 left06:56
→ bgerber joined06:56
← patrick99e99 left06:57
← xian9fu left07:00
← bgerber left07:02
→ Dragooon joined07:02
← raatiniemi left07:04
← sawgij left07:04
← dr0id left07:05
← eno left07:05
→ eno joined07:07
← bartman left07:07
→ bgerber joined07:08
cmn jmoreira81: it means exactly what it says; see man git config push.default to see what other default actions there are07:09
gitinfo jmoreira81: the git-config manpage is available at http://jk.gs/git-config.html07:09
cmn or tell git what you want to push07:09
→ berserkr joined07:10
← ajaykools left07:11
← lcpfnvcy left07:11
← Noxville left07:12
→ hoonteke joined07:12
→ bartman joined07:13
← eno left07:14
← berserkr left07:14
← tatsuya_o left07:15
→ eno joined07:16
← codeshah left07:16
→ fayaz joined07:16
→ munichlinux joined07:17
→ jacof joined07:21
jacof Should I add, and then commit, when I'm starting a repo for the first time, or just add ?07:22
← eno left07:23
→ AmirBehzad joined07:24
→ ajaykools joined07:25
→ eno joined07:25
← AmirBehzad left07:25
→ thwest joined07:28
← thwest left07:28
← eno left07:29
→ rue joined07:29
← wolftankk left07:30
→ thwest joined07:30
cmn if you want to commit, you should commit07:31
add simply stages07:31
→ jameswarren joined07:32
→ Pupeno_W_ joined07:32
← deltree_ left07:32
→ eno joined07:32
→ wolftankk joined07:33
→ nikuyoshi joined07:33
← rue left07:34
← kerrick left07:34
← Pupeno_W left07:34
Pupeno_W_ → Pupeno_W07:34
← dirkle left07:34
← dvide left07:35
← nikuyoshi left07:37
→ nikuyosh_ joined07:37
← wilmoore left07:37
← hoonteke left07:38
→ mloskot joined07:38
← igotnolegs left07:39
→ LucasTizma joined07:42
→ w09x joined07:43
← LucasTizma left07:43
← nikuyosh_ left07:44
→ f0i joined07:44
← eno left07:44
→ eno joined07:45
→ nikuyoshi joined07:46
← rbrooks left07:51
← eno left07:51
→ ipalaus_ joined07:52
→ TLGreg joined07:53
→ kwakbab joined07:53
→ kwakbab1 joined07:53
← kwakbab1 left07:53
→ eno joined07:53
→ maxy joined07:54
← kwakbab left07:57
→ archdori joined07:58
← w09x left07:58
← f0i left07:58
← joshsmith left07:59
→ joshsmith joined08:00
← joshsmith left08:01
← chaitu left08:02
← wolftankk left08:03
← eno left08:03
→ hackoo joined08:04
→ chaitu joined08:05
← munichlinux left08:06
→ whitman joined08:07
→ zeen joined08:07
zeen hey. i have a git daemon running on my server and a checked out master trunk in a web directory. i want to commit from my local machine and then have the checked out version on the server (not the same directory as the master origin) to auto update. what should i be looking at? i know it's hooks but do i put the hook in my /var/git/repo/.git/hooks/ and have this call the other copy on the server?08:09
← hyperair left08:11
cmn !deploy08:12
gitinfo [!website] Git is not a website deployment tool, but can sometimes play one in sufficiently simple/lax environments with a little help. One example of help is: http://toroid.org/ams/git-website-howto and another approach: https://gist.github.com/171423508:12
zeen cool, thanks08:12
deploy is the word i was looking for but forgot :)08:12
→ eno joined08:13
→ rendar joined08:14
→ hyperair joined08:15
→ rue joined08:15
← ipalaus_ left08:15
← thwest left08:15
← pdtpatr1ck left08:16
→ Dragooon|Away joined08:17
← Dragooon left08:17
Dragooon|Away → Dragooon08:17
→ lasers joined08:17
← nikuyoshi left08:18
→ rotham joined08:19
→ monty` joined08:19
← monty` left08:19
→ monty` joined08:19
→ wilmoore joined08:21
→ mishok13 joined08:21
← eno left08:22
→ dr0id joined08:22
→ shibayu36 joined08:23
← rotham left08:23
→ eno joined08:24
← eno left08:28
→ eno joined08:29
→ linusoleander joined08:30
← wilmoore left08:31
← xGambit left08:31
→ xGambit joined08:31
zeen thanks cmn, works perfectly. it's about time i learnt how to do that08:35
→ Fullmoon joined08:35
← eno left08:36
← hyperair left08:37
→ eno joined08:37
frogonwheels zeen: if you go to http://jk.gs/git (see the chanel topic), there's a link to the gitbot and from there you can get a list of the things it responds to08:37
← eno left08:37
→ eno joined08:37
← subbyyy left08:38
← gnufied left08:40
← arvind_khadri left08:40
← eno left08:43
→ ph^ joined08:44
→ eno joined08:45
→ jmd joined08:47
← ph^ left08:48
jmd I want to squash the last N commits. What's the easiest way to do it?08:49
08:49
wereHamster jmd: git reset --soft HEAD^N; git commit -m "whatevs"08:50
→ martinjlowm joined08:50
← tingo left08:51
jmd wereHamster: fatal: ambiguous argument 'HEAD^2': unknown revision or path not in the working tree.08:52
I presume you mean't HEAD~208:52
s/2/N08:53
→ robotmay joined08:54
← eno left08:54
→ arvind_khadri joined08:54
→ eno joined08:56
→ Vile joined08:56
→ dzonder joined08:58
→ pantsman joined09:00
→ ph^ joined09:01
← lasers left09:02
→ danielss89 joined09:03
→ HG` joined09:04
wereHamster yeah09:04
← eno left09:04
← HG` left09:07
→ eno joined09:07
→ hyperair joined09:10
→ tatsuya_o joined09:10
→ archdori_ joined09:12
← ajaykools left09:13
← hackoo left09:13
→ shruggar joined09:15
→ berserkr joined09:15
→ ipalaus_ joined09:15
← archdori left09:16
← eno left09:16
← berserkr left09:16
→ eno joined09:17
← danielss89 left09:18
→ Dave^| joined09:19
← sdferfx left09:20
← Fullmoon left09:21
← Malar left09:22
→ Zeeshan_M joined09:24
← eno left09:25
→ ajaykools joined09:26
Zeeshan_M Hi all. I am trying to grasp how one works locally and then later pushes changes to a remote git setup. I currently work on a Windows setup saving my projects in c:\dev\sample, and my git repo is in c:\dev\sample\.git.09:26
→ eno joined09:26
← chaitu left09:27
← mst left09:27
Zeeshan_M Once I finish or commit my changes locally to my own git repos, I would like to push my changes live via SSH. I therefore have setup a 'bare' git and use "git push -u origin master" to connect to my remote git repos to save my current file changes.09:27
wereHamster Zeeshan_M: 1) do some work. 2) commit that work. 3) push the commits to the remote repo. 4) ???. 5) profit09:28
Zeeshan_M When I check my remote setup, I do not understand where the files are.09:28
wereHamster: I am lost as to how to do the push stage09:28
wereHamster Zeeshan_M: you just said that you pushed your changes. What else do you want?09:28
Zeeshan_M I cannot 'see' the files I pushed live to my bare git repos. Where are there?09:29
wereHamster why do you want to 'see' them?09:29
Zeeshan_M Let me prefix first how I did the setup so that you can detect the issue.09:29
wereHamster bare repo = repo without a working tree/09:30
Zeeshan_M Oh. Pants.09:30
Okay. Lets now go back a step and pretend I do the following: I create a new local git repos via "git init" on my workstation/Windows.09:32
← eno left09:33
← hyperair left09:33
Zeeshan_M Actually, ignore me for a bit. I shall do the tests first so as not to waste helper time.09:34
→ FreeArtMan joined09:34
→ eno joined09:35
→ IWorld joined09:35
← stringoO left09:35
gitinfo set mode: +v09:36
← robotmay left09:37
→ hyperair joined09:37
← shruggar left09:39
← albel727 left09:40
← eno left09:40
→ albel727 joined09:40
→ eno joined09:41
← harish left09:41
→ f0i joined09:46
← IWorld left09:46
→ dr_lepper joined09:47
← eno left09:48
→ tommyvyo joined09:48
→ gnufied joined09:49
→ eno joined09:49
→ fisted_ joined09:50
→ Shusshu joined09:50
← fisted left09:51
← mishok13 left09:52
→ babilen joined09:55
← hyperair left09:55
← Shusshu left09:55
→ hyperair joined09:55
→ Fullmoon joined09:57
← hyperair left09:59
← eno left09:59
→ master-lincoln joined09:59
→ eno joined10:01
→ yoklov joined10:03
→ hyperair joined10:03
→ falena joined10:05
→ harish joined10:06
← eno left10:06
← ajaykools left10:06
→ eno joined10:06
← yoklov left10:08
→ coredumb joined10:10
← Fullmoon left10:10
← eno left10:11
→ airborn joined10:12
→ eno joined10:12
← linusoleander left10:14
→ minde joined10:14
minde hello, which application/script? was used to create this graph http://awesome.naquadah.org/images/git_stats.png ?10:16
→ mritz joined10:16
← Cheatah- left10:17
→ d0k joined10:18
Zeeshan_M wereHamster: Thank you for your help. I don't know if you clocked on, but by being forced to word my question, I clocked onto what I was doing wrong (effectively a 'cardboard employee' moment).10:19
Have a pleasant day/evening.10:19
afk10:19
→ mewm joined10:19
jmd minde: I dunno, but it looks like the person who did it took all his ideas from this paper:www.cs.unc.edu/~taylorr/.../fourteen_ways_say_nothing_sci_vis.pdf10:19
← eno left10:20
← ipalaus_ left10:21
→ eno joined10:22
← eno left10:22
→ eno joined10:22
← eno left10:28
→ urbanmonk joined10:33
← matthiaskrgr left10:33
→ eno joined10:36
← f0i left10:38
← juvenal left10:40
→ DarkAR joined10:40
← eno left10:42
→ aspotashev|| joined10:44
← aspotashev| left10:44
→ eno joined10:44
← tonesfrommars left10:44
→ Noxville joined10:45
← limoges left10:45
→ lcpfnvcy joined10:49
← eno left10:50
→ iocor joined10:51
→ eno joined10:52
→ fam_ joined10:53
← fam_ left10:53
→ kryl99 joined10:55
→ f0i joined10:56
← jmd left10:57
← dhruvasagar left10:58
← bartman left10:59
← eno left10:59
_aeris_|away → _aeris_10:59
→ eno joined11:01
← arvind_khadri left11:02
→ rotham joined11:05
← michale left11:05
→ martinjlowm-lptp joined11:06
→ bartman joined11:06
→ Quanteek joined11:06
← eno left11:08
→ eno joined11:09
→ leavittx joined11:10
→ callumacrae joined11:10
← monty` left11:11
→ Error404NotFound joined11:11
← Error404NotFound left11:11
→ ipalaus_ joined11:14
← eno left11:16
→ berserkr joined11:17
← xiangfu left11:17
← berserkr left11:18
→ eno joined11:18
→ lasers joined11:20
→ Sigma joined11:21
← eno left11:22
← JackWinter left11:23
→ eno joined11:24
← ph^ left11:24
← rotham left11:24
→ jumoit joined11:24
→ sentinal8473 joined11:27
← eno left11:30
→ eno joined11:31
→ gusnan joined11:33
→ JackWinter joined11:33
← jumoit left11:33
→ legnaleurc joined11:39
→ monty` joined11:40
← monty` left11:40
→ monty` joined11:40
← archdori_ left11:40
→ matthiaskrgr joined11:41
← archivebot left11:41
← eno left11:41
→ monty joined11:41
→ mishok13 joined11:41
→ RichiH joined11:42
→ ph^ joined11:42
← monty` left11:42
→ eno joined11:42
RichiH are there any documents regarding merge-friendly file designs?11:42
← sentinal8473 left11:44
← kevlarman left11:45
← DarkAR left11:45
← bodom left11:46
← f0i left11:46
pasky hmm, there seems to be a lot of less obvious considerations besides the obvious "text, line-oriented"11:47
but i'm not sure if you can really describe any rules easily11:47
→ archdori joined11:48
← eno left11:48
← mishok13 left11:48
→ daube joined11:49
→ eno joined11:49
RichiH pasky: well, it _will_ be text & line-oriented11:49
bremner don't do crazy CVS still keyword embedding11:49
gitinfo set mode: +v11:49
→ Guest69763 joined11:49
bremner err style. still = moonshine producer11:49
← Guest69763 left11:50
RichiH wants to store metadata of files, most likely man=inly ctime at first11:50
RichiH but the format should be extensible, etc11:50
atm, i am considering version header with one tab-separated line per file11:50
daube hi all, starting out with git. is there a really good tutorial which explains not just the commands required, but also what each term means and good VC designs/techniques.11:51
bremner daube: !book11:51
gitinfo daube: There are several good books available about git; 'Pro Git' is probably the best: http://progit.org/book/ but also look at !bottomup !cs !designers !gitt !vcbe and !parable11:51
← tatsuya_o left11:52
→ dnivra joined11:52
RichiH bremner: btw: backport-poke11:52
daube bremner: cheers, much appreciated. Pro Git looks like what i've been searching for. =]11:52
bremner RichiH: yup, I started the build just before I answered you ;)11:53
← psakrii left11:53
→ conntrack joined11:53
→ _iron joined11:53
→ mishok13 joined11:54
← g0th left11:54
→ archivebot joined11:54
← eno left11:55
→ eno joined11:56
← ipalaus_ left11:57
← JEEB left11:59
→ JEEBcz joined11:59
← daube left12:03
← legnaleurc left12:04
→ legnaleurc joined12:05
→ edakiri joined12:05
→ daube joined12:05
→ arvind_khadri joined12:05
← arvind_khadri left12:05
→ arvind_khadri joined12:05
← eno left12:05
→ eno joined12:07
← dr_lepper left12:07
edakiri Is there an equivalent for "--after" (as for Bazaar) for "git mv" ? --Something for handling the case where you have already moved the files?12:08
wereHamster edakiri: git rm --cached <old locatin>; git add <new location>12:10
edakiri thanks, wereHamster12:10
--no wait. mv is equivalent of rm + add in Git? I presumed that the presence of an mv command meant they were no longer equivalent. I saw a post which implied there was additional information maintained from mv, as well.12:12
← eno left12:13
bremner nope12:13
nope = no additional info12:13
→ archdori_ joined12:13
→ ipalaus_ joined12:13
→ eno joined12:14
wereHamster edakiri: git mv is the same as mv + git rm + git add12:14
→ mantic0 joined12:15
← archdori left12:16
RichiH bremner: :)12:16
cbreak edakiri: git doesn't actually track file moves anyway, so no worries12:19
← eno left12:19
→ subbyyy joined12:19
← renier left12:19
← mishok13 left12:20
→ CannedCorn joined12:20
→ Jackneill joined12:21
← subbyyy left12:21
← jbub left12:22
→ subbyyy joined12:22
← MissionCritical left12:23
→ berserkr joined12:25
→ arietis joined12:25
_aeris_ → _aeris_|away12:26
→ eno joined12:27
← eno left12:27
→ eno joined12:27
→ jbub joined12:28
→ churp joined12:30
← daube left12:33
→ shibayu36_ joined12:33
← shibayu36_ left12:34
← mewm left12:34
→ shibayu36_ joined12:35
← eno left12:35
← shibayu36 left12:35
→ shibayu36 joined12:35
← shibayu36 left12:35
→ erichynds joined12:36
← gnufied left12:36
→ eno joined12:37
← mritz left12:38
→ fayaz_ joined12:39
_aeris_|away → _aeris_12:39
← fayaz left12:39
→ thiago joined12:40
→ Per4u3e joined12:40
→ rotham joined12:40
← arvind_khadri left12:41
← kadoban left12:42
→ kadoban_ joined12:42
← berserkr left12:42
rotham hey.. so i reverted a commit, but the staged code doesn't seem to have changed....12:42
is there a way I can change the state of the staging area back to what it was during the commit i reverted to?12:43
cbreak rotham: reverting creates a new commit12:43
← Per4u3e left12:43
cbreak so there won't be a change in the unstaged changes12:43
rotham ah k12:44
← eno left12:44
→ Per4u3e joined12:45
→ neurodrone joined12:46
→ eno joined12:46
← peper left12:47
← Per4u3e left12:47
→ jceb joined12:48
→ scottschulthess joined12:49
→ MissionCritical joined12:49
→ Per4u3e joined12:50
→ krnl joined12:50
← XayOn left12:50
← eno left12:52
→ eno joined12:54
← Per4u3e left12:54
← SeySayux left12:55
→ pfFredd joined12:57
→ SeySayux joined12:57
→ peper joined12:59
← eno left12:59
← subbyyy left12:59
→ dnivra_ joined13:00
← SJS left13:00
→ fr00d joined13:00
fr00d Hello13:00
gitinfo fr00d: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.13:00
→ eno joined13:00
← dnivra left13:00
fr00d I'm trying to get an older version to my actual version in a git branch. Can somebody tell me how to do that?13:01
← Quanteek left13:02
→ austinbv joined13:02
← jceb left13:02
→ xjiujiu joined13:02
wereHamster fr00d: why do you want to do this?13:03
fr00d I did some bad errors in the code and need an older version.13:03
← scottschulthess left13:03
wereHamster fr00d: git checkout <the old version>13:04
← erichynds left13:05
→ daube joined13:05
→ Bass10 joined13:05
← pantsman left13:06
← rotham left13:06
← babilen left13:07
→ rotham joined13:07
← eno left13:09
→ eno joined13:10
← pfFredd left13:10
→ pfFredd joined13:10
→ JohnBat26 joined13:11
fr00d wereHamster: How can I push this older version to my git repository on the server? Should be git push origin restore, right?13:12
wereHamster git push origin HEAD:<a ref name>13:15
or git push origin <commit>:<ref name>13:15
← eno left13:16
→ dr_traktor joined13:16
→ cybersphinx joined13:16
→ rhizo joined13:16
→ eno joined13:16
dr_traktor How can I check whether git uses the proper ssh key when trying to push to an origin?13:17
wereHamster dr_traktor: ssh -vv <the server where you're pushing>13:18
← the_cybersphinx left13:18
← urbanmonk left13:18
← austinbv left13:19
→ khmarbaise joined13:19
→ nicxvan joined13:20
dr_traktor wereHamster, and can you point me to the direction about how to set it up properly?13:21
edakiri dr_traktor: man ssh_config13:21
← eno left13:22
→ codewrangler joined13:22
wereHamster dr_traktor: help.github.com/set-up-git-redirect/13:22
→ eno joined13:23
→ j416 joined13:23
← j416 left13:23
rotham hey.. http://pastebin.com/gWLRnaZ6 what does the <<<<<<< HEAD .... >>>>>>> master syntax mean?13:23
wereHamster rotham: man git-merge -> How Conflicts Are Presented13:23
gitinfo rotham: the git-merge manpage is available at http://jk.gs/git-merge.html13:23
rotham awesome thank you wereHamster13:24
→ ajaykools joined13:25
→ Per4u3e joined13:25
→ austinbv joined13:27
← austinbv left13:29
→ AllieBenson joined13:30
← eno left13:30
→ eno joined13:31
← xjiujiu left13:33
← daube left13:33
← monty left13:34
← Per4u3e left13:35
→ Chillance joined13:35
→ daube joined13:36
→ Per4u3e joined13:37
→ mklappstuhl joined13:38
← eno left13:40
→ xjiujiu joined13:40
← archivebot left13:40
← kpreid left13:40
← Per4u3e left13:40
→ Per4u3e joined13:42
→ archivebot joined13:42
→ eno joined13:42
← eno left13:42
→ eno joined13:42
← julius_ left13:43
← Bass10 left13:44
dr_traktor the server says that 'Authentication succeeded (publickey)' but finnaly the ssh -T command ends with 'Need SSH_ORIGINAL_COMMAND in environment.'13:44
What might be the cause?13:44
→ tatsuya_o joined13:44
wereHamster dr_traktor: are you using gitolite on the server?13:44
← xjiujiu left13:45
→ HG` joined13:46
← eno left13:47
→ Matrixiumn joined13:47
→ eno joined13:47
→ xjiujiu joined13:48
→ tvw joined13:48
← krnl left13:50
dr_traktor wereHamster, I'm using gitosis.13:51
wereHamster dr_traktor: !gitosis13:52
gitinfo dr_traktor: gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite13:52
dr_traktor oh, thanks for the info13:52
← eno left13:53
→ Jay_Levitt joined13:53
← Per4u3e left13:55
← sjhuang left13:55
← daube left13:55
→ madewokherd joined13:55
→ eno joined13:55
→ Per4u3e joined13:57
← ruskie left13:59
→ LongBeach joined13:59
→ lyddonb joined14:01
← eno left14:02
→ eno joined14:04
← lyddonb left14:05
← CannedCorn left14:05
← Per4u3e left14:07
→ Per4u3e joined14:09
← eno left14:10
→ piksi joined14:10
→ eno joined14:11
← lasers left14:11
← tatsuya_o left14:15
← eno left14:16
← jalama left14:16
→ ruskie joined14:17
→ CannedCorn joined14:17
← Per4u3e left14:17
→ Per4u3e joined14:19
→ prolificgnosis joined14:19
← Per4u3e left14:20
→ johnkpaul joined14:21
← CannedCorn left14:23
← xjiujiu left14:24
→ eno joined14:24
← eno left14:24
→ eno joined14:24
→ pantsman joined14:25
← pantsman left14:25
→ pantsman joined14:25
← dwmw2_gone left14:26
→ dwmw2_gone joined14:26
prolificgnosis how do i create a config file?14:26
really, what's the extension14:27
cause I don't have one in my ssh folder14:27
→ xjiujiu joined14:28
→ cjuner joined14:28
m1sc prolificgnosis: "touch ~/.ssh/config" -- http://linux.die.net/man/5/ssh_config14:29
→ t4nkd joined14:30
← eno left14:30
→ eno joined14:32
← eno left14:32
→ eno joined14:32
← mklappstuhl left14:32
→ monty` joined14:32
→ alberto56 joined14:32
← monty` left14:32
→ monty` joined14:32
← phlipper left14:32
← calimocho left14:33
→ sebrock joined14:35
← eno left14:37
→ kaen joined14:37
← kaen left14:37
→ kaen joined14:37
→ eno joined14:38
← eno left14:38
→ eno joined14:38
→ dang joined14:38
← sh4rm4 left14:39
← fir31ight left14:39
← kryl99 left14:41
→ fir31ight joined14:41
→ Whitebird joined14:42
→ zeth2571 joined14:42
→ ology joined14:43
← eno left14:44
← frogonwheels left14:44
→ sh4rm4 joined14:45
← Whitebird left14:45
→ eno joined14:45
→ phlipper joined14:46
→ tiglog joined14:50
→ Mowsh joined14:50
← rhizo left14:50
← tiglog left14:51
→ tiglog joined14:52
← xjiujiu left14:52
→ Goplat joined14:53
← eno left14:53
→ CannedCorn joined14:53
← zeen left14:54
→ zeen` joined14:54
→ eno joined14:55
← eno left14:55
→ eno joined14:55
→ Russell^^ joined14:56
← piksi left14:56
← rasmusth left14:57
← archivebot left14:57
→ gabeh joined15:02
→ MattRichardson joined15:02
← eno left15:03
→ jumoit joined15:03
→ mtkd joined15:04
→ MarcusFeniX joined15:05
→ eno joined15:05
→ iamjarvo joined15:05
rotham hey.. after a conflicted merge, I resolved the issues with git mergetool .. do I just commit it, or is there something else I should do first?15:05
EugeneKay add && commit15:05
← Janette left15:07
→ worz joined15:08
← harish left15:08
→ lusers joined15:08
← worz left15:08
← gabeh left15:08
← johnkpaul left15:09
→ archivebot joined15:09
→ harish joined15:09
→ Bass10 joined15:10
← eno left15:11
→ eno joined15:11
← eno left15:11
→ eno joined15:11
→ archdori joined15:13
→ mischat joined15:13
→ puddy joined15:13
→ djMax joined15:15
→ yoklov joined15:16
→ limoges joined15:16
← archdori_ left15:16
→ cakehero joined15:17
← eno left15:18
→ eno joined15:19
→ mandric joined15:20
→ Destos joined15:21
→ bauruine joined15:21
← nrichards left15:22
← Jay_Levitt left15:24
← hyperair left15:25
← puddy left15:27
← eno left15:27
→ mancino joined15:28
→ mklappstuhl joined15:28
→ hyperair joined15:28
→ eno joined15:29
← mandric left15:29
→ ferdna joined15:29
→ gabeh joined15:29
← mancino left15:30
← ajaykools left15:33
← eno left15:33
← iocor left15:34
→ eno joined15:34
← eno left15:34
→ eno joined15:34
← cinjun left15:38
→ Vampire0 joined15:39
← gabeh left15:41
← eno left15:41
→ setmeaway2 joined15:42
← setmeaway left15:42
→ nikuyoshi joined15:42
→ hiptobecubic joined15:42
→ Bartzy joined15:42
→ species joined15:42
← rurufufuss left15:42
→ eno joined15:43
→ rjgonza joined15:43
→ Xizor joined15:43
→ subbyyy joined15:43
→ xlq joined15:43
→ enmand joined15:43
→ orafu joined15:43
→ LotR joined15:43
→ wanders joined15:43
→ jstemmer joined15:43
→ tightwork joined15:43
→ renan_saddam joined15:43
→ ice799_ joined15:43
→ P-l joined15:43
calvino.freenode.net set mode: +v15:43
← danols_work left15:43
← rjgonza left15:43
→ rjgonza joined15:43
← akiress left15:47
→ fayaz joined15:49
← fayaz_ left15:49
← archivebot left15:49
→ archivebot joined15:50
← eno left15:51
→ jcrotty_ joined15:51
→ eno joined15:52
→ infogulch joined15:52
← archivebot left15:53
→ archivebot joined15:53
gitinfo set mode: +v15:54
jcrotty_ any ideas on this error: git: error while loading shared libraries: libiconv.so.2: cannot open shared object file: No such file or directory15:54
i am on centos615:54
cbreak you lack a dynamic library that the git you compiled requires15:54
← mklappstuhl left15:55
cbreak you should compile a git that does not require this library, or install it15:55
← matthiaskrgr left15:55
← hiptobecubic left15:55
jcrotty_ yeah, i poked around in yum, but can't seem to find libiconv15:56
← eno left15:56
jcrotty_ ok, problem solved15:57
thanks15:57
← archivebot left15:58
← tvw left15:58
→ archivebot joined15:58
← Chib left15:59
→ eno joined16:00
← eno left16:00
→ eno joined16:00
← ruskie left16:00
→ chrisgeorge joined16:03
→ akiress joined16:04
← dr0id left16:05
→ kukks joined16:05
→ alesan joined16:05
← eno left16:06
→ eno joined16:07
← eno left16:07
→ eno joined16:07
→ ruskie joined16:09
← cakehero left16:10
→ mishok13 joined16:11
→ mewm joined16:12
→ tatsuya_o joined16:12
← sitaram left16:12
→ sitaram joined16:12
← sitaram left16:12
→ sitaram joined16:12
← tatsuya_o left16:13
← cjuner left16:13
→ l1nu5r joined16:13
← eno left16:13
← mewm left16:15
→ eno joined16:15
→ solofight joined16:15
← eno left16:15
→ eno joined16:15
→ Q| joined16:15
→ avalarion joined16:16
← Q| left16:16
→ piksi joined16:16
→ cakehero joined16:16
avalarion Hey ho, my Repository does not seem to have anything to commit after "git rm" and "git add -A" ... http://pastebin.com/eC7sRTbQ16:16
→ dreiss joined16:17
solofight people is it safe to say that clone is almost the same - clone would be used in the case of a complete replica when you dont have a repository at all whereas remote would be used when you want to get or put files from or to an already existing repository16:17
??16:17
cloning a repository would also create a entry in the config named remote for the source/origin ?16:18
→ selckin joined16:18
→ babilen joined16:18
← Jackneill left16:19
→ gabeh joined16:19
→ lynda joined16:20
→ mewm joined16:20
← lynda left16:20
→ jceb joined16:20
cmn the same as what?16:21
→ mritz joined16:21
→ subh joined16:22
solofight cmn: clone == remote add + pull ??16:22
← gabeh left16:22
← eno left16:23
xlq It's more like mkdir and git init and remote add and fetch and checkout16:23
cmn almost, it's remote add, git fetch, figure out what the remote HEAD is, git checkout -b <branch> origin/<branch> where <branch> is the remote's default branch16:23
well, yeah, with git init before hand16:23
← selckin left16:23
→ cesc joined16:23
→ eno joined16:24
← FreeArtMan left16:24
→ zeen joined16:24
→ L42y joined16:24
solofight xlq: why fetch + checkout, ,why not pull directly ?16:24
cmn: ^16:25
← zeen` left16:25
cmn because pull is merge16:25
solofight ohh16:25
cmn and there is nothing locally16:25
so there's nothing to merge with16:25
and pull is porcelain anyway16:25
very high-level porcelain16:25
clone can't make use of it16:26
→ arvind_khadri joined16:26
← hyperair left16:26
solofight so it does things except merge right ? whats the issue ?16:26
oh16:26
cmn issue with what?16:28
← dr_traktor left16:28
cmn pull is a merge, and there is no merge possible when you have nothing16:28
and a merge is not what you want anyway16:29
→ dr_lepper joined16:29
← dr_lepper left16:29
→ dr_lepper joined16:29
← pfFredd left16:29
← eno left16:30
→ Jay_Levitt joined16:30
→ hyperair joined16:31
→ pfFredd joined16:31
→ eno joined16:32
← candybar left16:32
nick_h with git-show, is there a way to list the files in a commit, but not show the actual file diffs?16:32
wereHamster nick_h: git diff --name-only <commit>^!16:32
xlq git ls-files --with-tree=<commit>16:33
→ Lulzon joined16:33
cmn git show --name-only16:33
← solofight left16:33
cmn xlq: that would show every file, no?16:34
← Lulzon left16:34
→ Lulzon joined16:34
→ solofight joined16:34
xlq cmn: Yes, it doesn't seem to work.16:34
nick_h thanks, guys. much appreciated. cmn's suggestion is exactly what i'm looking for.16:34
it's strange that the --name-only option isn't listed in the manpage for git-show16:34
← nikuyoshi left16:34
xlq It is16:34
→ candybar joined16:35
nick_h xlq: hm. it's not explained in my manpage. "man git-show | grep name-only" only spits out this:16:35
gitinfo xlq: the git-show manpage is available at http://jk.gs/git-show.html16:35
→ gabeh joined16:35
nick_h For trees, it shows the names (equivalent to git ls-tree with --name-only).16:35
→ gnufied joined16:36
cmn --name-only and friends are diff options16:36
nick_h ah. it wasn't clear to me that git-show accepts diff options16:37
← eno left16:38
→ eno joined16:38
← enmand left16:39
solofight cmn: git pull does a git fetch, checkout and then a merge right ?16:39
xlq I don't think it does a checkout.16:39
cmn no16:39
← limoges left16:40
cmn git pull does git fetch <appropriate remote>; git merge FETCH_HEAD16:40
nick_h solofight: pretty sure it's just a fetch and merge16:40
cmn you can read the source, it's a fairly small screipt16:40
solofight oh16:41
why the checkout ? whats the reason ?16:43
its a new repository anyway right16:43
mkdir, init, remote add, fetch wont do ?16:43
cmn that won't create the default branch16:44
→ duckxx joined16:45
← subh left16:45
→ enmand joined16:45
solofight is creating repo's for experiment - to understand it better16:46
← eno left16:46
→ Jarred joined16:46
→ guampa joined16:47
→ bibinou joined16:47
→ subh joined16:48
→ eno joined16:48
← eno left16:48
→ eno joined16:48
→ Yuuhi joined16:48
← mloskot left16:48
← nicxvan left16:48
← species left16:49
→ mloskot joined16:50
→ alexim joined16:50
→ matthiaskrgr joined16:51
← mloskot left16:51
→ nikuyoshi joined16:51
→ mloskot joined16:51
← gabeh left16:52
→ Drewch joined16:53
→ vicapow joined16:53
→ mloskot_dogwalk joined16:53
→ drizzd joined16:53
← eno left16:55
solofight cmn: mkdir, init, remote add, git pull -u alias master does the job equivalent to clone A ./B16:56
?16:56
→ Per4u3e joined16:56
→ hololight joined16:56
→ es joined16:56
→ shruggar joined16:56
← jumoit left16:57
cmn what's that pull meant to do?16:57
solofight after the pull i did a git branch and it says master*16:57
→ eno joined16:57
← eno left16:57
→ eno joined16:57
← tnzr left16:57
← Per4u3e left16:57
← es left16:57
← mloskot left16:57
cmn so you're in master, that's what git init does16:57
solofight pull - pulls the content, history to this repo B from repo A16:57
cmn but now you don't have any remote-tracking branches or origin/HEAD16:57
→ estevocastro joined16:58
cmn it pulls the one branch you told it to16:58
and master doesn't have the tracking information that clone gives it eithe16:58
there's a reason I wrote it like I did16:58
and you should forget about pull if you want to figure out how things happen16:58
it's very high level and nothing uses it16:58
estevocastro if I have several remote repositories, how do I specify a "default" one (that is, the one that gets used when I push or pull without specifying a particular repo)?16:59
solofight cmn: there definitely is - please dont take me wrong for me questioning it. I am trying to understand it better, i am in a confused state16:59
cmn: ok will try fetch now16:59
cmn man git clone's first paragraph explains what it does17:00
gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html17:00
← matthiaskrgr left17:00
cmn and that's what my commands did17:00
→ xsbeats joined17:01
← segher left17:01
→ mklappstuhl joined17:01
jast estevocastro: it's done per branch (though push doesn't default to that behaviour; you can set push.default to 'upstream' to change that). basically to tell a branch which reote branch it should be associated with, use something like git branch --set-upstream yourbranch origin/yourbranch17:01
hmm, speaking of...17:02
→ segher joined17:02
← eno left17:03
jast .trigger_edit set_upstream To tell git which remote branch to use in pull (and push if you set push.default to upstream) for a given branch foo, use something like: git branch --set-upstream foo origin/foo17:03
gitinfo jast: Okay.17:03
→ Karmaon joined17:03
← gnufied left17:04
← phnom left17:04
← hololight left17:04
→ Darxus joined17:05
→ eno joined17:05
← eno left17:05
→ eno joined17:05
Darxus Does git really not have the ability to automatically retry when a clone fails?17:05
→ scottschulthess joined17:05
FauxFaux It really does not.17:06
while ! git clone foo; do done17:06
Darxus Hmm, thanks.17:06
solofight cmn: when i do git checkout -b master origin/master it says fatal: updating path is incompatible with switching branches17:07
after a remote add and git fetch i did the above ^17:07
← jceb left17:07
charon Darxus: https://bundler.caurea.org/ might help you17:08
→ jceb joined17:08
→ psoo joined17:09
← shruggar left17:09
FauxFaux charon: Hah, implementing that was on my todo list. Ding!17:09
Darxus charon: Thanks, my problem is with qt5's init-repository script, it clones a bunch of repos, and often one of them fails, which makes doing that in another script unpleasant. When it takes about an hour to download everything.17:09
← eno left17:10
wereHamster FauxFaux: you didn't know that existed? It's been around for ages :)17:10
→ eno joined17:10
← eno left17:10
→ eno joined17:10
solofight when i tell bitbucket that i already have a git repository which i want to import after creating a new repository it asks me to add remote and then git push -u origin master. Is that safe ?17:10
FauxFaux Things being on the todo lsit doesn't imply I've done any work or research on them at all. :)17:11
→ project2501b joined17:11
FauxFaux Needs a !bundler. /me -> dinner.17:12
→ johnkpaul joined17:13
← solofight left17:13
← jceb left17:14
← mishok13 left17:14
→ FreeArtMan joined17:14
estevocastro thanks jast!17:14
← CannedCorn left17:14
← FreeArtMan left17:15
charon FauxFaux: well as you can see in http://article.gmane.org/gmane.comp.version-control.git/181380 you're only half a year late ;-)17:18
though i wonder how much that hurts wereHamster bandwidth-wise17:18
→ CannedCorn joined17:20
← CannedCorn left17:20
→ Quanteek joined17:20
← xsbeats left17:21
← agile left17:22
→ agile joined17:22
← angelsl left17:23
← Jay_Levitt left17:24
→ Jay_Levitt joined17:24
← scottschulthess left17:24
← musee left17:26
→ musee joined17:27
→ ceej joined17:28
→ deltree_ joined17:29
← HG` left17:33
→ ceej_ joined17:34
← ceej left17:34
ceej_ → ceej17:34
→ pdtpatr1ck joined17:35
→ aspotashev joined17:36
← l1nu5r left17:37
← aspotashev|| left17:37
← Drewch left17:37
mloskot_dogwalk → mloskot17:40
→ mister_m joined17:41
← mischat left17:42
wereHamster charon: not at all. You see a counter how many bundles I have. The service is hardly ever being used.17:43
← airborn left17:44
← ceej left17:44
← xGambit left17:44
→ xGambit joined17:45
→ airborn joined17:46
→ rbrooks joined17:47
→ zpao|detached joined17:48
← zpao|detached left17:49
← ipalaus_ left17:51
→ ceej joined17:51
→ mishok13 joined17:51
→ abstrakt joined17:52
← project2501b left17:52
← gavin_huang left17:54
← akiress left17:56
→ w09x joined17:56
→ Drewch joined17:57
← bibinou left17:58
← Destos left17:58
← alberto56 left17:59
← mloskot left18:01
← subh left18:02
← duckxx left18:02
→ ericmuyser joined18:04
→ subh joined18:04
→ tolland joined18:05
→ akiress joined18:05
→ mloskot joined18:06
← mloskot left18:06
→ mloskot joined18:06
← BruceZu-CNBJ left18:06
→ BruceZu-home joined18:07
← BruceZu-home left18:08
→ aspotashev| joined18:09
← aspotashev left18:10
← Bartzy left18:11
→ project2501b joined18:13
← project2501b left18:13
← nikuyoshi left18:13
← EricInBNE left18:13
→ notjohn joined18:13
→ nikuyoshi joined18:14
→ archdori_ joined18:14
← jcrotty_ left18:15
→ jcrotty_ joined18:15
FauxFaux charon: Some of us get far, far more bandwidth than we can use by paying for ram.18:15
→ notola joined18:16
← notola left18:16
← jcrotty_ left18:17
→ Davey joined18:17
← Davey left18:17
→ Davey joined18:17
← archdori left18:18
← nikuyoshi left18:18
→ project2501b joined18:18
← vicapow left18:19
→ francky joined18:20
← L42y left18:20
← francky left18:22
→ francky joined18:22
← agile left18:22
→ mischat joined18:23
← Russell^^ left18:23
→ Russell^^ joined18:23
← w09x left18:23
← francky left18:24
→ francky joined18:24
→ Bartzy joined18:24
→ josefig_ joined18:24
← Russell^^ left18:26
← josefig_ left18:26
→ Russell^^ joined18:26
→ j3ffko joined18:27
→ eijk joined18:28
← Element9 left18:28
← j3ffko left18:29
→ jalama joined18:30
← dreiss left18:31
→ Vooloo joined18:31
← BlaDe^ left18:32
Vooloo is there a way to force the filesystem only to write files to disk that come from git? so it is read only if a ssh user or apache tries to write to disk18:32
← hyperair left18:32
FauxFaux Make a different user own the files, and give g+r.18:33
→ XayOn joined18:33
cmn it sounds like you want git-shell or gitolite18:34
→ gumnos joined18:34
← deltree_ left18:34
← jalama left18:35
→ L42y joined18:35
→ scottschulthess joined18:35
→ hyperair joined18:36
← Jay_Levitt left18:36
→ johnkpau_ joined18:36
← johnkpaul left18:36
← Bartzy left18:38
← kadoban_ left18:39
→ iocor joined18:39
→ ajaykools joined18:40
→ agile joined18:40
→ ipalaus_ joined18:40
→ mxweas_ joined18:41
→ wilmoore joined18:42
← zeen left18:42
← dang left18:44
→ dotnull joined18:49
← AllieBenson left18:49
→ ISF joined18:50
← hyperair left18:51
→ hyperair joined18:54
→ Bartzy joined18:55
← psoo left18:55
johnkpau_ → johnkpaul18:56
← imMute left18:56
→ therod joined18:56
→ imMute joined18:57
← thiago left18:59
← mklappstuhl left19:00
← Bartzy left19:00
← gumnos left19:01
→ dvide joined19:02
← tolland left19:03
→ avtobiff joined19:03
→ phnom joined19:05
← scottschulthess left19:11
→ psoo joined19:14
→ danielss89 joined19:15
← yac left19:15
← subh left19:16
→ d3xter joined19:16
d3xter hey guys19:17
how can i remove unused commits?19:17
← agile left19:18
→ Bartzy joined19:18
xlq git prune19:18
→ thiago joined19:18
wereHamster d3xter: are you running low on disk space?19:18
← danielss89 left19:19
d3xter wereHamster: no, just want them to go away :)19:20
→ stringoO joined19:20
variable If I know a commit had a certain hash19:21
and I did git svn rebase19:21
is there a way to figure out which branch that commit was in19:21
%git branch --contains=3b4f7b77abc6a0fadb3a15ebd7e8e8d47504784219:21
doesn't show it19:21
git reflog shows the commit, but not the branch19:22
→ varnie joined19:22
varnie Hi.19:22
gitinfo varnie: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.19:22
← francky left19:23
varnie I have a fork. I made few changes (which I pushed) and now I want to pull all updates from the upstream branch. the problem is that it seems I changed some file (and commited it already) and I have the collision with the upstream changes. what should I do?19:24
← therod left19:24
→ therod joined19:24
offby1 varnie: resolve the conflict.19:25
varnie here is the description of the warning I have: "fatal: You have not concluded your merge (MERGE_HEAD exists)."19:27
← airborn left19:27
varnie and it says that I need to commit my changes before I can merge, but "git status" doesn't show me any changes.19:28
offby1 it doesn't?19:29
that's pretty odd19:29
!repro19:30
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript of your terminal session. This will help immensely with troubleshooting.19:30
← d3xter left19:30
→ HG` joined19:31
← pfFredd left19:31
varnie I already used "git mergetool" and now it doesn't see any files which need merging.19:32
→ agile joined19:32
varnie maybe it can help.19:32
variable any idea of how I could go from sha -> branch on a commit which has already been rebased ?19:32
offby1 can you please paste the transcript? I can't help without it19:32
← psoo left19:33
offby1 variable: are you asking ... which branch contains the changes that this commit introduced?19:33
variable: if so, !gka might help19:33
gitinfo variable: For a better way to view the reflog, try: gka() { gitk --all $(git log -g --format="%h" -50) "$@"; }; gka19:33
varnie here it is: https://gist.github.com/218706419:34
variable offby1: it opens up a confusing looking gui19:34
and yes, that is exactly what I'm asking for though19:35
offby1 variable: gitk is indeed confusing at first but I find it indispensible19:35
variable offby1: how do I use it to find this commit?19:36
gitk is slooooooow ;(19:36
offby1 varnie: unfortunately your "transcript" omits the most useful information: the _output_ from those commands19:36
→ cespare joined19:36
→ hex`` joined19:36
offby1 variable: start it again, and pass your mystery SHA1 as an argument to it19:37
hex`` how do I restore a snapshot?19:37
← ceej left19:37
← falena left19:37
offby1 variable: that will highlight the commit.19:37
hopefully you will then see another commit with the same log message "nearby"19:37
variable: you could also "git log --grep='the log message' --all"19:37
hex`` how do I get an old commit version back?19:38
offby1 hex``: "git branch restored SHA-U-WANT"19:38
variable offby1: oh, so you can' actually do what I want? You have to kind of sort of guess?19:38
* can't19:38
→ aspotashev|| joined19:38
← ericmuyser left19:38
← aspotashev| left19:38
← Dragooon left19:38
variable I mean, that is fine, I thought there might be a tool to do so though19:39
offby1 variable: I'm not sure if there's a slick way. I myself would stumble around like this until I found it :)19:39
variable offby1: haha okay.19:39
I was hoping for some kind of git branch --contains like thing19:39
but mkay19:39
offby1 pity there are no other git whizzes aroudn19:39
around19:39
hex`` offby1 it doesn't seem to get the files back19:39
offby1 variable: if the commit you're talking about is unreferenced, I suspect there's no easy way.19:39
hex``: !repro19:39
gitinfo hex``: Please paste (using https://gist.github.com/ or similar) a transcript of your terminal session. This will help immensely with troubleshooting.19:39
variable offby1: understood. I wasn't able to find another commit, so I'll just checkout; branch again; and redo the rebase19:40
I wish this sort of thing was stored somewhere19:40
→ ericmuyser joined19:42
← mischat left19:47
→ dvalfrid joined19:47
← mloskot left19:48
← xlq left19:48
→ Jay_Levitt joined19:49
→ savid joined19:50
savid Is there a way to run git using sudo so that it still uses my regular user's pubkey? That is, I want to access the git server using my normal user, but I want to write to directories with sudo.19:51
→ blacktulip joined19:51
← Quanteek left19:51
→ ysawej joined19:53
← ysawej left19:53
offby1 savid: probably some environment variable: maybe GIT_SSH="ssh -i /path/to/your/.ssh/id_rsa" git pull19:53
something like that19:53
→ limoges joined19:53
savid hmm. except that won't work with agent forwarding :-)19:54
at least, I don't think it will19:54
I could be wrong19:54
→ kevlarman joined19:54
cbreak ssh-add19:54
FauxFaux sudo probably intentionally kills any environment variables that you wan.19:55
cbreak besides, why would you want to use sudo to clone?19:55
savid hmm. maybe itwill be easier to just sudo chown first :-P19:55
cbreak cloning would be one of the operations with git that I'd never run with sudo19:56
→ subh joined19:56
→ majuscule joined19:56
savid cbreak, yeah, you're probably right.19:56
cbreak anything that communicates should not run with elevated privileges, more maybe with lowered ones19:56
← xGambit left19:57
← scroat left19:57
majuscule I've checkout out a commit and am not currently on a branch. I ran `git reset --soft HEAD^` to go to the last commit (and keep my changes), and then ran `git diff` to try to take a look at the diff, but it says I cannot as i am not on a branch. How can I work around this19:57
I can just git diff hash..hash but i want to be left there and able to edit the files19:58
project2501b hey guys: so, in order to rename a remote reference, you should rm it and then add the edited one, correct? or just edit the config file19:58
→ xGambit joined19:58
cbreak majuscule: git diff should work19:58
but honestly, just make a branch19:58
git checkout -b branchname19:58
→ caseymcg joined19:59
cbreak project2501a: did you read man git-remote19:59
gitinfo project2501a: the git-remote manpage is available at http://jk.gs/git-remote.html19:59
→ junrue67 joined19:59
project2501b cbreak: rtfming as we speak19:59
→ dermoth_ joined19:59
project2501b cbreak: thank you. i need to rtfm more, pull the trigger slower ;)20:00
→ pimperle joined20:00
cbreak well, it's on line 3 of the synopsis20:00
project2501b yeah, i saw it20:00
pimperle I acidentally pushed a commit containing a private API key to a repository. Is there a way to change a line of code and propagate the change backwards a couple of commits?20:01
→ tonesfrommars joined20:01
project2501b pimperle: git reset20:01
or git rebase. what ever catches your fancy20:02
← dermoth|home left20:02
pimperle i've read the documentation of git reset and rebase a couple of times, but still didn't get all of it20:02
i'll have a look though and see, how to do what i need20:02
using reset i can remove the commits in question, right?20:03
offby1 !fixup20:03
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions. For hints type !fixup_hints in IRC. Remember: if you have pushed already, there are only a few things you can do without !rewriting_public_history (type that for more info)20:03
← HG` left20:03
pimperle offby1: thanks20:03
project2501b pashn anhr malakia o8wmouneos20:04
offby1 say wot20:05
→ fayimora joined20:05
→ boo11 joined20:05
→ mandric joined20:05
← boo11 left20:06
→ tqmz joined20:06
project2501b offby1: it's all greek to you ;)20:06
→ oojacoboo joined20:06
← kevlarman left20:06
offby1 oh indeed20:08
→ saidi joined20:12
→ s0ber_ joined20:13
→ rrn joined20:13
→ gabeh joined20:13
← monty` left20:13
← s0ber left20:15
s0ber_ → s0ber20:15
← enmand left20:16
→ luthander_ joined20:16
← babilen left20:17
← mgpcoe left20:24
→ mloskot joined20:25
← mloskot left20:25
→ mloskot joined20:25
← junrue67 left20:26
← fayimora left20:27
→ berserkr joined20:27
← ajaykools left20:27
← chronos left20:28
← hyperair left20:28
← philips left20:29
→ alberto56 joined20:31
→ dset joined20:32
→ philips joined20:32
← SegFaultAX left20:33
← mxweas_ left20:33
djMax how do I get the date of a commit?20:35
cmn man git log --format20:36
gitinfo the git-log manpage is available at http://jk.gs/git-log.html20:36
← gabeh left20:36
cmn it's %ad I believe20:36
→ sq-one joined20:37
← varnie left20:38
→ monty` joined20:38
← monty` left20:38
→ monty` joined20:38
← L42y left20:39
→ gabeh_ joined20:39
← alberto56 left20:39
→ hyperair joined20:39
→ L42y joined20:40
→ alberto56 joined20:40
← subbyyy left20:41
→ FernandoBasso joined20:41
→ mgpcoe joined20:41
pimperle offby1, project2501b: I could repair it, thanks a lot for the hints20:43
i used git filter-branch20:43
and a sed script as filter command20:43
← Goplat left20:45
← gabeh_ left20:46
→ codeM0nK3Y joined20:47
→ gabeh joined20:47
← hyperair left20:47
→ gabeh_ joined20:49
→ varnie joined20:49
← gabeh left20:49
gabeh_ → gabeh20:49
→ hyperair joined20:50
← cantoma left20:51
← varnie left20:51
← berserkr left20:52
← akiress left20:53
← tarkus left20:54
← archivebot left20:54
→ archivebot joined20:54
→ sentinal8473 joined20:54
→ ysawej joined20:54
← sentinal8473 left20:56
← piksi left20:57
← Matrixiumn left20:58
← ysawej left20:59
← dset left20:59
← dotnull left21:01
→ akiress joined21:01
→ urbanmonk joined21:04
djMax Is there an odd "base date" for git dates? I get a date from nodegit for a commit but if I add it to the unix epoch it's in 197021:06
cbreak the base date is epoch21:07
FauxFaux git dates are stored as unix timestamps. git cat-file commit HEAD21:07
cbreak I prefer git cat-file -p HEAD21:08
djMax *1000 fixes it.21:08
Trying to write a node.js script to walk git for a specific file, there's a module but seems like the command line might be easier.21:08
← drizzd left21:09
← saidi left21:09
→ TomyLobo joined21:09
TomyLobo hi21:09
gitinfo TomyLobo: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.21:09
TomyLobo is there something like git pull -r, except the foreign changes end up on top?21:10
FauxFaux djMax: google git-scripts git-find-blob.21:10
TomyLobo would be particularly useful for rebasing github pull requests21:10
FauxFaux TomyLobo: fetch and cherry-pick tghem.21:10
TomyLobo yeah... that's hard to teach though ^^21:11
FauxFaux The functionality you want is direct rewriting of public history, which is unpopular here.21:11
TomyLobo public but unpopular history21:12
cbreak djMax why not use git cat-file?21:12
you can also use git ls-tree to get a parsed list of files from a tree if you want21:12
TomyLobo: no21:13
→ cantoma joined21:13
cbreak TomyLobo: just rebase yourself21:13
FauxFaux See!21:13
cbreak who cares how hard to teach it is21:13
→ Malar joined21:13
TomyLobo so i guess i'll be handing out scripts :)21:14
cbreak if you want to teach that then you're a moron anyway. And for a moron, everything's hard21:14
djMax trying to grok that syntax - sha then path?21:14
jast hey now, what happened to civility :P21:14
FauxFaux People who want their coworkers to acually use stuff instead of just argh?21:14
→ archdori joined21:14
cbreak djMax: ref:path/to/file21:14
Malar → ogm21:15
TomyLobo cbreak may i ask why you call me a moron?21:15
cbreak because you want to tell people to rewrite public history21:15
they'll never be able to push again after that21:15
TomyLobo cbreak do you even know github?21:15
cbreak sure I know him. He's a nice guy.21:15
FauxFaux cbreak: The public history is a patch queue, not a real branch.21:15
jast the problem with putting the foreign changes on top is that it alters the IDs of the commits involved21:16
you can't simply push that back to the upstream repository, everything will break horribly21:16
and even if you don't, having two versions of those commits in different repositories will just make everything more confusing and error-prone21:16
TomyLobo ^21:19
cbreak FauxFaux: so?21:19
TomyLobo it's a one-shot thing21:19
people send in patches21:19
we merge them in21:19
cbreak and what's wrong with using git merge?21:19
FauxFaux cbreak: So they were never going to push to it anyway.21:19
cbreak (--squash if you want)21:19
TomyLobo how is git merge --squash not "rewriting public history"?21:19
cbreak or cherry-pick if you want to copy the commit without its history21:19
it's not rewriting any history21:19
TomyLobo how is cherry-pick not "rewriting public history"?21:19
cbreak it's also not rewriting any history21:19
← archdori_ left21:19
cbreak both create new history21:19
TomyLobo that's synonymous21:19
rewrite = write anew21:19
sorry, but your way argumenting seems rather religious to me21:19
cbreak how is it religious?21:19
just try it and you'll see what you'll get yourself into21:19
TomyLobo you say i'm a moron (heathen) for not wanting to merge instead of rebase public history21:19
← tqmz left21:19
TomyLobo even though that particular piece of public history is never seen by anyone but the creator and me21:20
i've been doing this for months now without a problem, cbreak21:20
cbreak good for you21:21
maybe no one ever tried to use your or the original history at the same time21:21
TomyLobo the point is: no one ever will21:21
→ felgru joined21:21
TomyLobo did i mention we have a central repo workflow?21:22
FauxFaux TomyLobo: HOW DARE YOU!!LL!L21:22
TomyLobo zomg21:22
cbreak you didn't mention anything about the workflow21:22
TomyLobo so you knew nothing about my workflow and still criticised it?21:22
djMax does git show have some sort of built in "more"?21:23
cbreak I knew you want to rewrite public history21:23
TomyLobo djMax no, less :)21:23
cbreak and I criticized that21:23
cmn djMax: more meaning what?21:23
FauxFaux djMax: It'll run your pager, yes.21:23
cbreak djMax: it's called a pager21:24
djMax: read man git21:24
gitinfo djMax: the git manpage is available at http://jk.gs/git.html21:24
cbreak it describes the --no-pager flag if you want21:24
and the -p flag :)21:24
djMax --no-pager, perfect. thx.21:25
TomyLobo djMax note that it says if you pipe it somewhere, the pager is automatically deactivated21:25
if you planned that21:26
→ tw__ joined21:26
← meLon left21:27
djMax not sure if running it from node qualifies as a pipe21:27
cbreak node?21:28
→ meLon joined21:28
← meLon left21:28
→ meLon joined21:28
djMax node.js. like running it from perl21:28
cbreak git probably tries to detect if an interactive terminal is used21:28
← Internet13 left21:28
jast yeah, should be fine21:28
anyway, good night21:28
cbreak just specify that you don't want a pager if you can afford the bytes in the command line... :)21:29
night21:29
← kaen left21:29
→ mischat joined21:29
← Davey left21:30
← caseymcg left21:30
← infogulch left21:31
← mister_m left21:33
→ Internet13 joined21:34
→ mister_m joined21:34
← Internet13 left21:34
← estevocastro left21:35
→ boombatower joined21:35
← tw__ left21:36
← djMax left21:37
← hyperair left21:41
→ Internet13 joined21:41
← khmarbaise left21:42
← gabeh left21:44
→ hyperair joined21:44
_aeris_ → _aeris_|away21:46
← JohnBat26 left21:46
← mishok13 left21:47
→ T-Gunn joined21:48
T-Gunn i am setting up git on a windows 2008 vps so multiple developers can work on a website and not overwrite each others work.. we decided against tfs because of resource requirements and reviews on their source control system. is it possible to have a post commit script copy over the most up to date copy from the repository after each push?21:49
or is this accomplished by cloning it to web facing directory?21:50
← cesc left21:50
→ gabeh joined21:51
cmn !deploy21:51
gitinfo [!website] Git is not a website deployment tool, but can sometimes play one in sufficiently simple/lax environments with a little help. One example of help is: http://toroid.org/ams/git-website-howto and another approach: https://gist.github.com/171423521:51
→ andygrossman joined21:52
T-Gunn this is development environment not the real thing21:52
→ kerrick joined21:53
← Sigma left21:53
→ babilen joined21:53
cmn no difference21:54
you still need to deploy a website21:54
← alberto56 left21:55
T-Gunn ok21:56
ill check out that site21:56
thank you21:56
← alesan left21:57
T-Gunn this is on a linux os.. im using windows 2008..21:57
cmn it's on a unixy environment, which you have21:58
'cos otherwise git doesn't work21:58
→ alberto56 joined21:59
→ vandemar joined21:59
cmn or use your favourite windows-friendly deployment system21:59
→ Destos joined21:59
bremner front-page!22:00
→ dreiss joined22:00
← ISF left22:00
cbreak can't you just switch to a unix server?22:00
that'll be cheaper, probably be more reliable and secure22:01
and more comfortable too since you can use state-of-the-art remote administration tools like SSH and even tools like git :)22:01
and rsync!22:01
← kerrick left22:01
← leavittx left22:02
cmn indeed; I was pleasantly suprised today when I managed to copy over some data to a filesystem whilst resizing it online and rebuilding the RAID it ran on22:02
← zeth2571 left22:03
cmn and yeah, you also get a system everyone uses to run everything anyway22:03
← rrn left22:04
→ mxweas_ joined22:05
cbreak I hope you had backups...22:05
← Darxus left22:05
tango_ what's the fun in that22:05
cbreak being able to tell the non-backup-havers "told you it'd be useful" if something fails22:06
→ vicapow joined22:06
← LekeFly left22:07
← blacktulip left22:07
→ lekefly_ joined22:07
← dreiss left22:08
→ blacktulip joined22:09
← vicapow left22:09
cmn yes, I do have backups22:09
← pantsman left22:10
→ fayimora joined22:10
← gazler left22:18
← limoges left22:19
← blacktulip left22:19
→ Guest32113 joined22:21
← sq-one left22:22
← mischat left22:22
← mantic0 left22:23
← alberto56 left22:24
→ tvw joined22:26
← arietis left22:26
← aspotashev|| left22:27
→ dsantiago joined22:29
→ maxorator joined22:30
← gabeh left22:30
→ Fullmoon joined22:32
maxorator hello, I'm trying to clone a new (empty) google code project, at first I kept getting this: "error: The requested URL returned error: 400 while accessing https://maxorator@code.google.com/p/my-project/ /info/refs fatal: HTTP request failed"22:33
→ rafasc joined22:33
T-Gunn it's an asp.net site, so can't use a linux vps.. already have a windows vps setup22:33
maxorator I haven't changed anything, but now I'm getting this instead: "fatal: Couldn't find remote ref HEAD Unexpected end of command stream"22:33
using git gui on windows22:33
rafasc hello, how can i add the changes from the master branch to my development branch?22:33
git merge development master?22:34
← fisted_ left22:34
wereHamster rafasc: git checkout development; git merge master22:35
→ wims joined22:36
→ francky joined22:36
→ Goplat joined22:37
→ fisted joined22:37
rafasc wereHamster: thanks. This always confuses me.22:38
wereHamster what confuses you?22:39
→ pfFredd joined22:39
→ alberto56 joined22:39
→ barr5790 joined22:39
rafasc branching , merges and rebases.22:39
wereHamster git merge always merges into the currently active branch. So if you want to merge something into X, you first have to checkout X.22:39
rafasc but it worked. Thanks.22:39
← minde left22:39
johnkpaul → johnkpaul-afk22:42
← iamjarvo left22:44
← t4nkd left22:45
_aeris_|away → _aeris_22:46
← mxweas_ left22:47
← _iron left22:48
← Fullmoon left22:48
→ mxweas_ joined22:48
cmn T-Gunn: surely mono supports asp.net; but if you want to use Windows, you can use whatever deployment system works on there22:48
→ austinbv joined22:50
→ Oog joined22:52
← Jay_Levitt left22:52
Oog waht creates a branch like remotes/origin/HEAD -> origin/master ?22:53
some of my gits have it some dont22:53
wereHamster 'what'? git does.22:53
Oog what makes it create HEAD and what is HEAD22:54
is that a branch?22:54
or a tag?22:54
cmn it's a symref, origin/HEAD is generally created by clone22:54
wereHamster ' remotes/origin/HEAD -> origin/master' means remotes/origin/HEAD is a symref pointing to origin/master22:54
← ipalaus_ left22:54
Oog i see yes these others i didnt use clone on22:55
instead i did remote add22:55
is that a problem? should i clone instead?22:55
← subh left22:55
→ gabeh joined22:56
cbreak just git remote update22:56
→ andriusm joined22:56
Oog that is the same as fetch pretty much right? doesnt seem to make HEAD22:56
cmn that's because clone creates it22:56
Oog do i need it for anythign? what is it used for?22:57
should i make it manually?22:57
cmn to know origin's default branch22:57
which for other remotes isn't as important22:57
wereHamster Oog: is there any specific reason why you want to have that symref?22:57
Oog wereHamster: i dont know that is why im asking. a symref is just like a name so isntead of doing git push origin master i could do git push origin HEAD ?22:58
wereHamster if it isn't there, and it doesn't cause any problems for you, then don't bother with it22:58
Oog ok22:58
wereHamster just continue using git as you were.22:58
canton7 iirc, origin/HEAD is only show when there's more than one remote branch?22:59
Oog canton7: i dont think so. theone where it is only has one remote22:59
cbreak it's useless in most cases22:59
Oog the other where it does not exist has multiple22:59
cbreak don't bother with it22:59
if you really care23:00
Oog: man git-remote23:00
gitinfo Oog: the git-remote manpage is available at http://jk.gs/git-remote.html23:00
cbreak look for set-head -a23:00
← rafasc left23:00
→ rafasc joined23:01
Oog that did it23:02
← newbie999|3 left23:02
← rafasc left23:02
→ newbie999|3 joined23:03
Oog one more question - how does git push know what remote/branch to push to if you dont specify it? in the docs i dont see it mentioning a default23:03
first i had to do git push origin master but now git push works23:03
cbreak it's determined with the upstream branch from the config23:03
and then matched by name23:03
← master-lincoln left23:04
→ subh joined23:04
Oog what is the upstream branch...23:04
cbreak git branch -vv23:04
Oog: man git-config23:04
gitinfo Oog: the git-config manpage is available at http://jk.gs/git-config.html23:04
cbreak look for the <branch> settings23:04
→ optixx_ joined23:05
→ Rafusek_ joined23:05
cbreak like branch.<name>.remote23:05
→ basepi_ joined23:05
← basepi left23:05
← optixx left23:05
← Rafusek left23:05
basepi_ → basepi23:05
← XayOn left23:06
→ XayOn joined23:06
Oog thanks23:06
→ subbyyy joined23:07
← Oog left23:08
← tvw left23:08
← Guest32113 left23:09
→ Aron joined23:09
Aron → Guest5935623:09
← lusers left23:10
← gabeh left23:10
← subh left23:12
← mxweas_ left23:12
→ linusoleander joined23:13
← fisted left23:14
← whitman left23:14
→ kevlarman joined23:14
→ lusers joined23:14
→ subh joined23:14
→ Guest22560 joined23:14
← rbrooks left23:15
→ rbrooks joined23:16
→ fisted joined23:19
→ w09x joined23:21
→ juvenal joined23:22
→ mxweas_ joined23:22
← mritz left23:23
Guest22560 → Gunni23:24
← d0k left23:25
← sontek left23:25
← T-Gunn left23:25
→ kadoban_ joined23:26
← oso96_2000 left23:27
→ sontek joined23:27
← Destos left23:28
→ oso96_2000 joined23:29
→ will joined23:30
← will left23:30
_aeris_ → _aeris_|away23:30
← austinbv left23:30
← griotspeak left23:31
→ rhl joined23:31
→ Neptu_ joined23:31
← dr_lepper left23:34
→ griotspeak joined23:37
mister_m → mister_awaym23:38
← rendar left23:38
← kadoban_ left23:39
← mister_awaym left23:42
← tiglog left23:44
→ EasyCo joined23:47
gitinfo set mode: +v23:47
EasyCo Is there any way to go back a couple of commits and branch off from there?23:48
offby1 yep!23:48
git branch whatever-ya-wanna-call-it HEAD~623:48
e.g23:48
cmn checkout and branch take a starting point as optional argument23:48
offby1 verra verra easy23:49
EasyCo Will that take the last few commits and put them in the new branch?23:49
← abstrakt left23:49
← subh left23:50
← dvalfrid left23:51
→ andrew-g joined23:51
offby1 er23:51
no23:51
I suspect you don't know what a branch really is23:51
commits are nodes in a directed acyclic graph23:51
EasyCo Of course23:51
→ kadoban_ joined23:51
offby1 branches are like little Post-It™s stuck to various nodes23:52
so my command sticks a Post-It™ on the commit that you want to be the tip of the new branch23:52
← esc left23:52
EasyCo Basically I just made some changes to my project's master branch then realised I should have made a branch for it since it's a substantial change23:52
offby1 sure23:52
what you want to do is "git branch whatever-ya-wanna-call-it"23:52
EasyCo Love that you put ™ on the end of Post-It23:53
offby1 and _then_ you want to "git reset --hard HEAD~6" (or whatver)23:53
indeed23:53
®23:53
I just like typing unicode23:53
♩♬it makes me happy♫♪23:53
anyway23:53
EasyCo Figured23:53
offby1 you should make the new branch "where you are" now23:53
→ BlaDe^ joined23:53
EasyCo Yah gotcha23:53
offby1 and then jerk the current branch (master, I guess) back to where it was when you started23:53
EasyCo And bring the master back23:53
offby1 this is all pretty easy via gitk23:53
EasyCo All good thanks.23:54
offby1 not too hard with the command line either23:54
EasyCo cli it is23:54
I just hadn't thought of rewinding the master branch afterwards.23:55
Thx for the help.23:55
→ marina_- joined23:55
← Xizor left23:56
← marina_- left23:57
← neurodrone left23:58
offby1 *nod23:58
← Guest59356 left23:59

Logs Search ←Prev date Next date→ Channels Documentation