IRCloggy #git 2014-08-23

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-08-23

→ eletuchy joined00:00
← koi left00:00
← eletuchy left00:00
→ eletuchy joined00:01
→ mmitchel_ joined00:01
→ bartman`` joined00:02
→ ewong joined00:02
← eletuchy left00:03
→ eletuchy joined00:03
→ WaReZ joined00:04
← _5kg left00:05
← imachuchu left00:05
← mmitchel_ left00:07
← laputa left00:07
← eletuchy left00:07
← _ikke_ left00:07
→ eletuchy joined00:08
→ _ikke_ joined00:08
← Robarelli left00:09
→ stef1a joined00:10
← mustafavelioglu_ left00:10
→ hkon_ joined00:11
→ mustafavelioglu_ joined00:11
← enelar left00:11
← EgS left00:11
← konr left00:11
→ mizu_no_oto joined00:11
← smw left00:12
→ Eins_ joined00:13
← SonikBoom left00:15
← mustafavelioglu_ left00:15
← hkon_ left00:15
← Errorical left00:16
← hebz0rl left00:17
← treehug88 left00:19
→ Quevin_ joined00:19
← eletuchy left00:21
← Quevin left00:22
→ Manny_ joined00:23
← Manny left00:23
← LeMike left00:25
← mikecmpbll left00:25
→ eletuchy joined00:26
← lucha left00:27
→ cmmagid joined00:27
→ chrisgeorge joined00:27
← oriba left00:27
→ lukeholder joined00:28
← Quevin_ left00:31
→ k_sze joined00:31
← braj left00:31
← Sasazuka left00:31
← davispuh left00:32
k_sze What's the purpose of signed tags?00:34
→ dgutierrez1287 joined00:35
← sdouglas left00:35
JosephFerano k_sze: signed tags can bring with them additional information00:35
← skorgon left00:35
→ sdouglas joined00:36
rudi_s k_sze: The idea is to verify that you've fetched the source as provided by the maintainer. And nobody can provide you with a modified history.00:36
However they are sadly not implemented securely.00:36
→ skorgon joined00:36
rudi_s (At least not as good as they could be.)00:36
phy1729 rudi_s: details?00:36
rudi_s phy1729: GPG-signature of the commit sha1, but sha1 is not considered secure anymore.00:36
So an attacker might be able to forge the sha1. It would be better if the GPG-signature was over the complete tree.00:37
*and commit id.00:37
phy1729 git uses sha1 for everything it'd be odd to use a different hash00:37
→ jfelchner joined00:37
← damccull left00:37
← simesy left00:37
rudi_s phy1729: Well, it's not secure in git as well.00:37
My point is, that a signed tag should verify the content.00:37
And sha1 is not future-proof for that.00:38
phy1729 the hash is based on the contents00:38
rudi_s phy1729: Doesn't matter if the hash isn't secure.00:38
← St_Marx left00:38
phy1729 also: "A 2011 attack by Marc Stevens can produce hash collisions with a complexity of 261 operations.[1] No actual collisions have yet been produced." Sure I'll use Sha512 when possible but sha1 isn't broken00:39
Corey84 uses sha256 or 512 on all his keys00:39
rudi_s phy1729: I didn't say broken. I just said it isn't considered safe and not future-proof.00:39
phy1729 isn't secure means broken00:39
rudi_s phy1729: Depends on your definition of broken.00:40
Anyway, it's just one point to consider when using signed tags which is why I mentioned it.00:40
← sdouglas left00:40
← dgutierrez1287 left00:40
k_sze I hope git has an upgrade path to convert all the hashes to sha256 or sha512 in the future. :D00:42
rudi_s k_sze: I doubt it.00:43
← KdgDev left00:44
← surfdue left00:46
← WaReZ left00:47
← mizu_no_oto left00:47
→ St_Marx joined00:47
→ jftf joined00:48
→ surfdue joined00:49
→ wlemuel joined00:50
← jftf left00:52
→ dgutierrez1287 joined00:53
← lazarus477 left00:54
← dgutierrez1287 left00:54
→ dgutierrez1287 joined00:55
← bartman`` left00:56
→ madprocess joined00:56
← maletor left00:57
→ mizu_no_oto joined00:57
← amikiri left00:57
← dreiss left00:57
→ bezet joined00:57
← Nizumzen left00:58
← lidaaa left00:58
← dgutierrez1287 left00:58
→ lidaaa joined00:58
← lukeholder left00:58
→ dgutierrez1287 joined00:59
← mizu_no_oto left00:59
→ sdouglas joined00:59
← fstd left01:00
→ fstd joined01:00
→ EminenceHC joined01:01
← bezet left01:02
→ bartman`` joined01:02
whaley → BlakeBortles01:02
→ mmitchel_ joined01:03
gitinfo set mode: +v01:04
→ DolphinDream joined01:08
← mmitchel_ left01:09
← EminenceHC left01:09
→ Vampire0_ joined01:10
← kenneth left01:12
← Vampire0 left01:14
← Not_Whatever left01:14
← iaaah left01:14
→ punchagan joined01:15
→ Polymorphism joined01:15
← Polymorphism left01:15
← eletuchy left01:16
← madprocess left01:16
→ smitzer joined01:16
← dgutierrez1287 left01:17
→ iaaah joined01:17
→ mmitchel_ joined01:17
→ eletuchy joined01:17
→ madprocess joined01:17
← Polymor__ left01:17
smitzer how do I merge A and B if B was branched from A and A has not been changed and I want the changes in B to be applied to A01:18
Nugget checkout A ; merge B01:18
→ Literphor joined01:19
Nugget merge is one way, it's not bidirectional, if that's what you're thinking. direction matters01:19
it is arguably mis-named01:19
smitzer merge A B != merge B A ?01:20
Nugget correct01:20
checkout A ; merge B will take all the changes in B and bring them into the A branch01:20
but if A had (theoretically) changes that didn't exist in B, they will not be in B after the merge01:20
← seanmerron left01:20
Nugget to do that you'd have to also checkout B ; merge A01:20
← _Vi left01:21
→ kcj joined01:21
→ Lyqyd joined01:22
→ eburcat joined01:22
→ montchr joined01:22
← montchr left01:22
Nugget perhaps the confusion stems from the fact that there is no "merge A B" command or "merge B A" command.01:22
merge just takes the one argument, not two01:22
and applies to current checked out branch01:22
← Sivil left01:23
→ Malsasa joined01:24
← logix812 left01:24
← nil- left01:26
← eburcat left01:26
→ EgS joined01:27
← sdouglas left01:27
→ sdouglas joined01:28
← deric_skibotn_ left01:30
← EgS left01:32
← sdouglas left01:32
→ CorySimmons joined01:36
← Literphor left01:38
→ Literphor joined01:39
← mmitchel_ left01:39
→ JeanCarloMachado joined01:39
→ EgS joined01:40
← Literphor left01:40
→ watabou joined01:41
→ sohail joined01:41
← sohail left01:41
→ sohail joined01:41
← smitzer left01:42
← pbrobst left01:42
→ pbrobst joined01:43
← Lyqyd left01:43
← jfelchner left01:44
→ skylite joined01:45
→ bitri joined01:47
← n-st left01:47
→ kenneth joined01:48
← eletuchy left01:48
→ jftf joined01:48
← darkbasic_ left01:49
→ darkbasic joined01:50
← bartman`` left01:52
→ sdouglas joined01:52
→ p4sh4 joined01:53
← jftf left01:53
→ mal10c joined01:55
← nedbat left01:56
← rjhunter left01:57
← gargola left01:57
→ gargola joined01:57
← nkouevda left01:57
← Corey84 left01:58
← CorySimmons left01:58
jrnieder rudi_s: do you mean it should be a secure hash of the full fast-export stream, or something like that?02:00
rudi_s: ultimately some clever person needs to help figure out a nice way to switch git to a new hash function02:01
rudi_s: keeping the old object names for old objects, perhaps just using a lookup table or something for that02:01
← craigp left02:01
rudi_s jrnieder: Secure hash of the current tree (including blobs) would be enough IMHO for tags, just like a tarball. - True.02:01
*just like a signed tarball02:01
← Nicholas_Rishel_ left02:01
jrnieder rudi_s: mm, that would be solving a different problem IMHO02:01
rudi_s: better to actually distribute a signed tarball :)02:02
rudi_s: the nice thing about signed tags is you're signing the history, too02:02
rudi_s jrnieder: Yeah. A full fast-export would be even better, but that will be very slow.02:02
→ bartman`` joined02:02
← stef1a left02:02
← DolphinDream left02:04
→ jfelchner joined02:05
→ Akagi201 joined02:05
← Noldorin left02:05
← Marcus left02:06
→ Marcus joined02:06
← madprocess left02:08
→ madprocess joined02:08
← Ornacia left02:09
← madprocess left02:09
→ madprocess joined02:09
→ mmitchel_ joined02:10
← ColdKeyboard left02:10
← Marcus left02:11
← kcj left02:11
→ hkon_ joined02:11
→ Ornacia joined02:12
→ rjhunter joined02:12
← gargola left02:13
← skylite left02:14
→ pushnell joined02:14
→ donmichelangelo joined02:14
← mmitchel_ left02:14
← hkon_ left02:16
← michelangelo left02:16
← rjhunter left02:17
← wlemuel left02:17
→ Neozonz joined02:19
← Neozonz left02:19
→ Neozonz joined02:19
← kenneth left02:19
→ CorySimmons joined02:20
→ rjhunter joined02:20
← benbergman left02:21
→ benbergman joined02:22
→ CuriousMind joined02:22
CuriousMind How do you use the git editor, I am new to using git.02:22
I see a bunch of hashtags and words, I am trying to undo a commit I've done.02:22
→ MattMake_ joined02:22
CuriousMind It says pick f2c637a <commit message>02:23
# Rebase etc..02:23
← JeanCarloMachado left02:23
CuriousMind Can someone redirect me to a tutorial on how to use the git editor?02:24
→ snuffeluffegus joined02:24
← MattMake_ left02:24
→ m0viefreak joined02:25
← MattMaker left02:25
→ otter768 joined02:25
→ MattMaker joined02:25
→ jfelchne_ joined02:26
bremner you can use whatever editor you want, within reason. Use git config --global core.editor yourfavouriteeditor02:26
→ JeanCarloMachado joined02:27
← jfelchner left02:28
← kevinb left02:28
CuriousMind I'm sorry, can someone help me use this vim thing please? I am new to this. http://oi57.tinypic.com/vxln5h.jpg02:31
→ nkouevda joined02:31
← salamanderrake left02:32
→ kerrick joined02:33
← d1b left02:33
→ damccull joined02:33
→ etpuis joined02:35
→ salamanderrake joined02:36
→ d1b joined02:37
bremner CuriousMind: I'd suggest you start with another editor than vim, that you already know.02:37
← damccull left02:38
bremner Unless of course you don't know any editor, in which case I guess #vim can point you to vim tutorials.02:38
CuriousMind bremner what is vim exactly?02:38
bremner will Sublime Text 2 work?02:38
← polyzen left02:39
bremner vim is a text editor.02:39
← livingstn left02:39
← bitri left02:39
bremner I suppose you can make sublime text work; I don't use it myself.02:40
CuriousMind bremner, so vim is a text editor that works only in the terminal?02:40
bremner, does vim work in cmd for windows?02:40
← jonmorehouse left02:40
← renatow left02:41
→ xp_prg joined02:44
xp_prg hi all, I am trying like crazy to install git on centos 6.402:44
do I have to install from source?02:44
bremner CuriousMind: sorry, I'm not the one to help with windows. If you wait a bit maybe someone else will answer.02:45
CuriousMind bremner ok, thank you.02:45
← jfelchne_ left02:47
← pbrobst left02:48
← Mitchbones left02:48
→ Mitchbones joined02:49
← CorySimmons left02:49
→ jftf joined02:49
→ bitri joined02:49
← Neozonz left02:53
← jftf left02:54
→ bezet joined02:58
→ DeathIncarnate joined03:00
→ ncd|leeN joined03:00
→ EminenceHC joined03:01
← bezet left03:02
← leeN left03:04
← m0viefreak left03:05
← otter768 left03:05
→ damccull joined03:06
→ moritzs joined03:06
← cmmagid left03:08
← EminenceHC left03:09
→ thiago_ joined03:09
→ CorySimmons joined03:10
thiago_ → thiago03:10
→ stef1a joined03:10
→ mmitchel_ joined03:11
← stef1a left03:11
→ otter768 joined03:12
← Manny_ left03:12
→ Manny joined03:13
→ kyoshero joined03:15
← hagabaka left03:16
← mmitchel_ left03:16
← bitri left03:17
→ hagabaka joined03:17
← d1b left03:19
nulled Anyone figure this out? The push to server is bare=false and I cloned from the push to server to my client getting push error... I have origin master setup thru ssh: not git: protocol. http://pastebin.com/RxdA69nh03:19
← EgS left03:20
→ kenneth joined03:20
← CuriousMind left03:21
kadoban nulled: I'm not sure I understand the question...did you try fetching and integrating the remote changes first?03:21
← toothrot left03:22
→ EgS joined03:22
kadoban nulled: And you're pushing to a non-bare repo? Why? Afaik there is no good reason to do that03:22
nulled no I used push which I know does 2 things, excuse my ignorance, fetch and a merge... what I did was modify index.php on the clone and just want to sync back to the master from the clone.03:22
kadoban You're thinking of pull? pull is fetch then merge. Push is for pushing to a remote03:23
← nkouevda left03:24
← bitkiller left03:24
→ nkouevda joined03:24
nulled alright so I make a change on the CLONE and I want to update the master... that is what I want to do.03:25
→ lazarus477 joined03:25
kadoban 'master' is really ambiguous there. I'm not sure what you're referring to. Do you mean the remote that you cloned from?03:25
← xSmurf left03:26
lazarus477 Is it ok to move a bare repo to a new location on the file system, such as move it into a sub directory? Do I need to re-init it or anything when doing this?03:26
kadoban lazarus477: Yeah you can move it around and it won't care. If you have references to it elsewhere you'll have to fix them of course.03:26
→ xSmurf joined03:27
nulled ok cuz it is distributed... master as in... if I want to allow updates to a repo from another repo... I didnt do init --shared03:27
yes remote that I cloned from... trying to push clone commits to where I cloned FROM.03:28
← kpease left03:28
kadoban init --shared is part of the setup if you want to have several unix user accounts pushing to one remote using plain ssh protocol or file-level protocol, taht's probably not what you're looking for03:28
nulled: Ah, so you made changes and are trying to push them? Then yeah you need to fetch what's at the remote and integrate your changes somehow. Either merge or rebase. What happened is, someone else pushed first and git can't know how to integrate your changes with theirs, you have to decide.03:29
nulled the linux server (master in my mind) and client is the clone (windows git-bash)03:29
← alvaro_o__ left03:29
← alvaro_o left03:29
← alvaro_o_ left03:29
kadoban nulled: 'master' in the git world usually refers to the default main branch, so will cause confusion used like that :-/03:30
nulled ok03:30
kadoban nulled: 'remote' or shared repository is probably a better term, something like that.03:30
→ nedbat joined03:31
kadoban nulled: But anyway, try 'git fetch' and then see if you can figure out what to do. gitk --all very well might help, or some invocation of git log03:31
Your choices basically come down to either merging or rebasing your changes on top, then you can push them.03:32
nulled I ran git init --shared on the Linux server... and tried to run $ git push origin master on the CLONE and I get http://pastebin.com/RxdA69nh03:32
lazarus477 kadoban: Ah yes, that makes sense03:33
kadoban: Thank you03:33
kadoban 'welcome03:33
nulled: Is this the first time you're pushing to the repo after you inited it you mean?03:33
← CheckDavid left03:34
kadoban nulled: By the way, you very probably want git init --bare if you're going to be pushing to it.03:34
nulled kadoban: I get a different message when there was a push already so no.03:35
i mean yes03:35
first time.03:35
→ d1b joined03:35
kadoban Did you do work and commits on the linux server? I don't think that message can happen after just creating a repo and pushing to it, as far as I know...03:36
← SimonNa left03:36
← Slush- left03:37
nulled Ill just rm -rf .git directory and git init --shared and try to push again see what happens.03:37
on linux03:37
kadoban At least do --bare as well, if you're pushing to it.03:38
And if you're actually doing a shared setup and need --shared be aware that you need to do a bit of work with linux permissions/groups too or it won't work long-term.03:38
nulled yes, i tried that and it seemed to take... but then I had to reset to bare=false because no working tree found03:38
kadoban nulled: That's what bare means, and how it's supposed to be if you're pushing to it. You use repositories as either working locations or remotes for sharing or whatever basically. Remotes you push to are always bare03:39
→ sgen joined03:40
nulled rm -rf ./.git; git init --shared which should make a fresh repo and I will delete the clone entirely and reclone it...03:40
kadoban nulled: If you want to do work on the linux box as well, then you make yet another clone of the bare repo and work there03:40
← gfixler left03:41
SamB you *can* use a non-bare repo as a remote, but it's mostly useful if you just want to grab some commits off of them without having to push them someplace else first03:42
→ gasull joined03:42
SamB because pushing to non-bare repositories has issues03:42
← iaaah left03:42
→ jonmorehouse joined03:43
← JeanCarloMachado left03:43
nulled git init --bare; git add . (and it says: fatal: This operation must be run in a work tree) and I cant clone it because it is empty03:45
kadoban nulled: You don't do work in the bare repository. You do it elsewhere and push there. And you can clone bare repositories.03:45
nulled: Are you mistaking the warning it gives you for an error? It's not.03:46
nulled yes pushing to a non-bare repo has issues...03:47
kadoban It isn't so much that it has issues even, it just fundamentally doesn't make much sense.03:48
← bobbytek2 left03:49
nulled its funny I set the repo to core.bare=true... did the push from clone ... and linux side git show/status I see the changes... so I have to set it BACK to bare=false my god mabe I need to get a book.. Git pro... is that any good?03:50
→ jftf joined03:50
← kenneth left03:50
kadoban nulled: You shouldn't be changing the bare setting except in the rare case that you messed up and created a repo non-bare and need to make it bare...which is a one-time thing.03:51
nulled BTW people need to check out... Future of the Mind... talking telepathy here.... and I attracted some attention... just saying... Micho Kakus book... no BS anyways03:52
MRI machines the size of iPhones no BS03:52
← jftf left03:54
nulled because well the stock market is getting ready to collapse.. and the riots are already in europe ... and in america it has begun...03:55
→ flowerhack joined03:55
nulled so if you start getting harrassed... remember what you just read.03:56
may day may 1st03:56
→ P4_Denis joined03:58
→ Jetchisel joined03:59
← P4_Denis_ left04:00
← otter768 left04:01
→ kenneth joined04:01
→ otter768 joined04:01
→ craigp joined04:02
← kpreid left04:02
→ kpreid joined04:03
→ Literphor joined04:03
→ P4_Denis_ joined04:04
← moritzs left04:05
← P4_Denis left04:06
→ JeanCarloMachado joined04:06
→ P4_Denis joined04:07
← pushnell left04:08
← P4_Denis_ left04:09
← JeanCarloMachado left04:11
→ hkon_ joined04:12
→ mmitchel_ joined04:13
← Behi left04:14
← oojacoboo left04:16
→ simesy joined04:17
→ DolphinDream joined04:17
→ lukeholder joined04:17
← hkon_ left04:17
← lukeholder left04:17
→ lukeholder joined04:18
← lukeholder left04:18
← mmitchel_ left04:18
→ lukeholder joined04:19
← lukeholder left04:19
→ Behi joined04:19
→ lukeholder joined04:20
← lukeholder left04:20
→ lukeholder joined04:21
← lukeholder left04:21
→ lukeholder joined04:22
← lukeholder left04:22
→ _5kg joined04:23
→ lukeholder joined04:23
← kaendfinger left04:24
← lukeholder left04:24
→ kaendfinger joined04:24
→ dik_dak joined04:24
→ lukeholder joined04:24
← lidaaa left04:26
← craigp left04:26
← Behi left04:27
→ pheaver joined04:28
→ [1]VictorGrunn joined04:29
← aidalgol left04:30
gitinfo set mode: +v04:30
← rjhunter left04:30
→ JeanCarloMachado joined04:32
← nedbat left04:32
← netameta left04:33
← madewokherd left04:34
→ lidaaa joined04:37
← JeanCarloMachado left04:37
→ bgerber joined04:37
[1]VictorGrunn → VGrunn04:39
← Eins_ left04:40
← Goplat left04:45
← kaendfinger left04:45
→ mennea joined04:45
← harish left04:45
→ beautifulmind joined04:50
← simesy left04:50
→ harish joined04:50
→ jftf joined04:51
← Malsasa left04:51
← Literphor left04:51
← beautifulmind left04:51
→ beautifulmind joined04:52
→ Tommy[D]_ joined04:52
← srcerer left04:53
← yacks left04:54
← gasull left04:54
← rethus left04:54
← Jetchisel left04:54
← Tommy[D] left04:55
← jftf left04:56
→ Sheperson joined04:56
→ Polymorp_ joined04:56
→ mikecmpbll joined04:57
← blakbunnie27 left04:57
← punchagan left04:58
← DeathIncarnate left04:58
← pheaver left05:00
→ pheaver joined05:00
→ EminenceHC joined05:01
→ blakbunnie27 joined05:02
← JosephFerano left05:02
← zz_unglid left05:04
← lukeholder left05:07
← CorySimmons left05:07
← EminenceHC left05:09
→ zz_unglid joined05:09
→ lukeholder joined05:09
→ rjhunter joined05:09
Sheperson How can I post a screenshot of my commit tree here?05:10
← lukeholder left05:10
→ lukeholder joined05:11
← lukeholder left05:11
→ lukeholder joined05:12
→ Malsasa joined05:12
→ Eins_ joined05:13
→ DeathIncarnate joined05:13
→ ninsei_y joined05:15
← rjhunter left05:15
→ mmitchel_ joined05:16
← ninsei left05:16
← mikecmpbll left05:17
→ gasull joined05:18
← DolphinDream left05:19
→ rethus joined05:19
← shinnya left05:20
← mmitchel_ left05:21
→ HicksD joined05:22
← lidaaa left05:22
← HicksD_ left05:23
→ lidaaa joined05:24
← Manny left05:26
→ Manny joined05:26
→ shinnya joined05:27
← ejnahc left05:27
→ ejnahc joined05:28
← ninsei_y left05:29
← lukeholder left05:30
← SudoKing left05:30
→ subhojit777 joined05:31
→ SudoKing joined05:31
→ Jake3432 joined05:31
→ nfk joined05:32
→ lukeholder joined05:32
← lukeholder left05:33
→ lukeholder joined05:33
← lukeholder left05:33
→ vrishab joined05:33
← lindenle left05:35
← otter768 left05:37
→ lukeholder joined05:37
→ lindenle joined05:40
← beautifulmind left05:42
→ Lyqyd joined05:42
→ beautifulmind joined05:44
← lindenle left05:45
→ AnujSharma joined05:45
← beautifulmind left05:46
← blorbx left05:46
→ beautifulmind joined05:46
→ blorbx joined05:46
→ lindenle joined05:51
→ jftf joined05:51
→ King_Hual joined05:52
← DeathIncarnate left05:54
→ P4_Denis_ joined05:55
← sin3t_ left05:55
← lindenle left05:55
→ sin3t_ joined05:56
← jftf left05:56
→ lindenle joined05:56
← Sheperson left05:57
← P4_Denis left05:57
← gasull left05:58
→ P4_Denis joined05:58
← P4_Denis_ left06:00
← lindenle left06:01
→ koi joined06:01
→ Sheperson joined06:01
→ JakeSays_ joined06:01
← JakeSays left06:05
→ Literphor joined06:07
← StefanLehmann left06:08
← lukeholder left06:09
→ StefanLehmann joined06:10
→ lukeholder joined06:10
← lukeholder left06:10
→ DeathIncarnate joined06:11
→ lukeholder joined06:11
← lukeholder left06:11
→ lukeholder joined06:12
→ Asiajey joined06:13
→ hkon_ joined06:13
→ Junior joined06:14
→ Rastus_Vernon joined06:14
← sohail left06:14
← DeathIncarnate left06:15
← Sheperson left06:16
→ Sheperson joined06:16
← hkon_ left06:18
→ mmitchel_ joined06:18
→ DeathIncarnate joined06:18
← lidaaa left06:23
← mmitchel_ left06:23
→ lidaaa joined06:23
← Literphor left06:24
← lidaaa left06:24
→ vals_ joined06:27
→ AlexDenisov joined06:27
← tango_ left06:28
→ tgkokk joined06:31
→ lindenle joined06:32
← Jake3432 left06:32
→ dc5ala joined06:33
vals_ → tango_06:33
← Sheperson left06:34
→ memleak joined06:35
memleak hello!06:36
how do i cherry pick a commit non-merged tree on a non-master branch?06:36
*from a non-merged tree06:36
← Mitchbones left06:37
→ Sheperson_ joined06:38
← lindenle left06:38
→ rjhunter joined06:39
← mugenzebra left06:40
thiago "a commit non-merged tree" doesn't make sense06:40
you have two nouns there06:40
← kerrick left06:41
thiago anyway, you can't cherry-pick a tree, only a commit06:41
→ lidaaa joined06:42
memleak sorry i misworded a few things06:42
plus i also just made an orphan branch06:42
← beautifulmind left06:43
memleak ok i pulled in a tree on an orphan branch, and the orphan branch has a lot of code that is different from my current code, i want to cherry pick only the changes in that specific commit, not the code that was written outside that commit06:43
← gccostabr left06:43
thiago ok, so you want to cherry-pick a commit06:44
what's the difficulty?06:44
memleak its basically an entirely different tree but i want to see how far git will get for me, by making the changes in that commit06:44
← pheaver left06:44
memleak the code between trees is hardly similar but i would like to try and see how far it will get06:45
because only small sections of the code in that commit per file are changed06:45
very small.. annoyingly so06:45
thiago still waiting for you to tell me what the difficulty is06:45
so far, you've described the standard behaviour of git cherry-pick06:46
memleak when i run git cherry-pick it tries to pull in the entire tree06:46
(just about)06:46
→ gccostabr joined06:46
thiago no06:46
git cherry-pick picks and applies exactly one commit06:46
it never pulls06:46
when you say "tree", do you mean "repository" ?06:48
memleak ah i see what the problem is now06:48
← jonmorehouse left06:48
memleak is there a way to cherry pick a commit without it trying to merge anything that would cause conflicts?06:48
thiago cherry-pick never merges06:49
it cherry-picks06:49
→ simesy joined06:49
← simesy left06:49
thiago if by "merge" you didn't mean "git merge", please use another word to describe what you meant06:49
memleak is there a way to cherry pick a commit without it trying to cherry pick any changes in that specific commit that would cause conflicts?06:49
thiago how would it know what will conflict?06:50
→ jonmorehouse joined06:50
thiago it only knows that something will conflict by trying06:50
and once it conflicts, it has conflicted06:50
memleak ah..06:50
thiago you can't make an omelet without breaking some eggs06:51
memleak XD06:51
ok06:52
thank you :) git clean -fd after git cherry-pick helped too06:52
thiago git cherry-pick --abort if you want to stop it06:52
→ jftf joined06:52
← SudoKing left06:53
→ SudoKing joined06:53
memleak is there a way to exclude files from git cherry pick?06:53
thiago name all other files06:53
→ upene joined06:54
memleak ok06:56
thank you :)06:56
← jftf left06:57
→ bezet joined06:58
← _5kg left07:01
→ EminenceHC joined07:01
← Gamecubic left07:01
← thiago left07:02
← bezet left07:03
← King_Hual left07:03
← starkhalo left07:03
→ Neon1024 joined07:04
← snuffeluffegus left07:05
→ Malsasa_ joined07:05
← ribasushi left07:05
← Malsasa left07:05
← teran left07:06
← AnujSharma left07:06
← Sheperson_ left07:07
← EminenceHC left07:09
→ zapb joined07:10
→ ribasushi joined07:10
← upene left07:10
← gccostabr left07:11
→ Jetchisel joined07:12
→ longbeach joined07:12
→ sinkensabe joined07:12
→ msankhala joined07:14
→ yacks joined07:17
→ khmarbaise joined07:17
Vampire0_ → Vampire007:18
← dik_dak left07:20
→ mmitchel_ joined07:20
→ doev joined07:21
→ simesy joined07:22
→ jheg joined07:23
→ teran joined07:23
→ CraigyDavi` joined07:23
← zapb left07:24
→ jontmorehouse joined07:25
← mmitchel_ left07:25
← CraigyDavi left07:26
← BSaboia left07:26
nulled Is it possible to use git://blah.com/proj/proj.git to clone with when I set up a git repo on Ubuntu instead of use ssh://ipaddress:22/path/to/repo/ because right now I am using ssh ... in other words how do I open a git port that listens for git and ssh...07:27
← jonmorehouse left07:27
← Neon1024 left07:28
→ jagob joined07:28
← jheg left07:30
nulled zzzz07:30
→ Literphor joined07:30
→ braj joined07:31
← EgS left07:31
→ mikecmpbll joined07:32
→ arup_r joined07:32
← khmarbaise left07:32
→ tuocuggino joined07:33
← DeathIncarnate left07:33
← arup_r left07:33
→ lindenle joined07:33
← Jetchisel left07:34
→ thierryp joined07:35
Seveas nulled: you'll neet to set up the git daemon, for which Ubuntu packages helper scripts in the git-daemon-run package07:35
→ LeMike joined07:35
Seveas it listens on tcp port 9418, so make sure your firewall allows that07:36
← nfk left07:37
nulled thanks07:38
← tgkokk left07:38
→ EgS joined07:38
← lindenle left07:38
→ KdgDev joined07:40
→ tgkokk joined07:41
← thierryp left07:41
← tgkokk left07:41
→ tgkokk joined07:42
← Literphor left07:42
→ Literphor joined07:44
← lidaaa left07:48
← longbeach left07:48
→ zanchoPa1sa joined07:49
← glebihan_ left07:51
→ vexoon joined07:51
← kyoshero left07:51
→ dsdeiz joined07:52
← mikecmpbll left07:52
← zanchoPansa left07:52
→ jftf joined07:53
→ mikecmpbll joined07:54
→ iLoop joined07:54
← iLoop left07:54
→ iLoop joined07:54
→ glebihan_ joined07:55
→ oojacoboo joined07:55
← LeMike left07:55
→ thierryp joined07:56
← lukeholder left07:57
← Literphor left07:57
← jftf left07:57
← iLoop left08:00
→ xobb joined08:01
→ nilg joined08:01
→ hkon_ joined08:01
← simesy left08:02
← mikecmpbll left08:04
→ wlemuel joined08:05
← hkon_ left08:06
← wlemuel left08:06
← jontmorehouse left08:06
← sinkensabe left08:06
→ mikecmpbll joined08:07
→ OffTheRails joined08:07
← koi left08:08
→ AnujSharma joined08:08
→ koi joined08:09
← AnujSharma left08:09
← StefanLehmann left08:09
→ StefanLehmann joined08:10
← Lyqyd left08:11
← Manny left08:15
→ Slush- joined08:15
→ Manny joined08:15
← nilg left08:16
← fstd left08:16
→ fstd joined08:16
← fstd left08:16
→ fstd joined08:16
← mikecmpbll left08:17
→ irqq joined08:17
→ Sceorem joined08:19
→ sinkensabe joined08:19
→ kukks joined08:20
← kukks left08:20
→ kukks joined08:20
→ mmitchel_ joined08:22
← kenneth left08:22
→ tron joined08:24
→ mikecmpbll joined08:24
→ kenneth joined08:25
tron → Guest8200508:25
← kenneth left08:25
← sinkensabe left08:26
→ TheFuzzball joined08:26
← mmitchel_ left08:28
← damccull left08:29
← finster left08:31
← vrishab left08:32
→ axrfnu joined08:32
← axrfnu left08:32
→ axrfnu joined08:32
axrfnu → finster08:32
← thierryp left08:33
← finster left08:34
← bluesm left08:34
→ finster joined08:34
← finster left08:34
→ finster joined08:34
← braj left08:40
← joki left08:41
← nkouevda left08:41
→ maroloccio joined08:43
→ b100s joined08:45
← Eins_ left08:45
→ khmarbaise joined08:45
→ iLoop joined08:45
→ joki joined08:46
→ vrishab joined08:46
← doev left08:48
← AdrianGuenter left08:48
← Ragnor left08:48
→ Ragnor joined08:48
← bartman`` left08:49
← iLoop left08:51
← Sceorem left08:52
← JPT left08:52
→ JPT joined08:53
← Guest82005 left08:53
→ jftf joined08:54
→ bvi joined08:54
→ mustafavelioglu_ joined08:54
→ bluesm joined08:56
← khmarbaise left08:56
← Malsasa_ left08:56
← Rastus_Vernon left08:56
← jftf left08:58
→ bezet joined08:59
← garethdaine left08:59
→ hebz0rl joined09:00
→ EminenceHC joined09:01
→ bartman`` joined09:02
← bezet left09:03
→ JeanCarloMachado joined09:04
→ gambler joined09:05
← cagedwisdom left09:08
→ sinkensabe joined09:08
← JeanCarloMachado left09:08
→ jiku joined09:09
← rjhunter left09:09
← dc5ala left09:09
← EminenceHC left09:10
→ craigp joined09:10
← Asiajey left09:11
→ raw joined09:13
← xobb left09:13
raw → Guest5827809:13
→ hoschi_ joined09:15
gitinfo set mode: +v09:15
Guest58278 → archian09:15
archian → mangola09:15
mangola → monogit09:15
→ Eins_ joined09:17
monogit Hi everybody, Is there any command/way to initialize a new repo on the git server from client side09:17
→ khmarbaise joined09:19
← OffTheRails left09:20
→ Balliad joined09:20
→ hj2014 joined09:21
← Eins_ left09:22
cbreak monogit: no09:23
monogit: there's no git server09:23
monogit: you can make new server git repositories with git init --bare09:23
→ descala joined09:23
→ mmitchel_ joined09:24
← bdavenport left09:25
→ xobb joined09:25
monogit cbreak: okay but can I do that from client, using some method09:25
cbreak sure. Log in via ssh09:28
← memleak left09:28
cbreak monogit: have you considered using !gitolite?09:28
gitinfo monogit: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/09:28
monogit My situation: I have a centralized git repository server where multiple clients can keep their respective repos. The problem this way is, everytime a new client want's a new repo name, I have to manually git init on the central server. I need clients to create/initialize a repo on the server on their own without requiring my manual intervention.09:29
→ jottr joined09:29
cbreak monogit: gitolite allows that with wild repositories09:29
← mmitchel_ left09:30
monogit cbreak: Oh... okay. I'll have a look into that.09:30
← bvi left09:31
← mustafavelioglu_ left09:32
→ mustafavelioglu_ joined09:33
← fstd left09:33
→ fstd joined09:33
← maxorator left09:34
← maroloccio left09:34
→ lindenle joined09:35
→ maxorator joined09:35
→ ocbtec joined09:35
← sinkensabe left09:39
→ ColdKeyboard joined09:39
← lindenle left09:40
→ Gizburdt joined09:40
→ LeMike joined09:40
→ BSaboia joined09:40
← fstd left09:43
→ fstd joined09:44
→ raaamina joined09:45
→ lukeholder joined09:47
← xobb left09:47
← lukeholder left09:47
→ lukeholder joined09:48
← lukeholder left09:48
← vexoon left09:49
← ColdKeyboard left09:49
→ lukeholder joined09:49
← irqq left09:49
→ hkon_ joined09:50
← AlexDenisov left09:50
← lukeholder left09:51
← jottr left09:53
→ AlexDenisov joined09:53
← shinnya left09:54
← hkon_ left09:54
→ jftf joined09:55
→ xobb joined09:56
→ shinnya joined09:56
sitaram_ monogit: replied on #gitolite; going afk again for a bit....09:57
← Junior left09:58
→ longbeach joined09:59
← jftf left09:59
← p4sh4 left10:00
→ beautifulmind joined10:01
← xSmurf left10:03
← jiku left10:04
← mustafavelioglu_ left10:05
← maxorator left10:05
→ punchagan joined10:05
→ m8 joined10:06
→ maxorator joined10:06
← bgerber left10:06
→ lukeholder joined10:07
→ Behi joined10:08
← Behi left10:08
g0th oops10:09
I did git checkout . without a backup10:09
can I recover?10:09
→ Behi joined10:09
← Behi left10:09
g0th always those damn symlinks10:09
← ecky--ptang-zoob left10:09
← hoschi_ left10:09
← shinnya left10:09
→ Behi joined10:10
← Behi left10:10
→ ecky--ptang-zoob joined10:10
g0th all is lost?10:10
luto recover what?10:10
your old pre-checkout working dir?10:10
→ Behi joined10:10
g0th yes10:11
I'm screwed, right?10:12
→ shinnya joined10:12
g0th I still got the ~ files10:12
so I guess I can recover a bit10:12
luto did you stage any of them?10:12
g0th why do I keep doing the same mistake of trying to backup a symlink dir with cp -r10:12
← punchagan left10:12
g0th sigh10:13
luto: no10:13
luto I guess you're lost then. sorry.10:13
→ sinkensabe joined10:13
← raaamina left10:14
→ mizu_no_oto joined10:14
→ jayrobot joined10:14
→ tokik joined10:14
→ motto joined10:16
← Gizburdt left10:17
cbreak if git doesn't know about it, git can't recover it10:17
and git only really knows about state if you add it, and then commit it.10:18
← sinkensabe left10:18
← m8 left10:18
→ Eins_ joined10:18
→ sinkensabe joined10:18
→ godgodgodgo joined10:20
→ Gizburdt joined10:21
g0th yeah I assumed so10:21
but so much is saved, I was still hoping10:21
anyway, fortunately the backup files of joe are still there10:21
so instead of 20 hours lost it's just like 1 hour10:21
or less10:21
I was cleaning up my backup, sigh10:21
bad idea to do that without git stash10:22
just needs one thought mistake somewhere and you are screwed10:22
← Eins_ left10:23
→ bdavenport joined10:25
← etpuis left10:27
→ mmitchel_ joined10:27
eXeC64 I always preferred doing git diff > ~/some_file.patch10:27
→ thierryp joined10:27
eXeC64 and then git apply10:27
I've never really gotten on well with stash10:28
cbreak g0th: maybe you don't understand backups :/10:28
they don't need to be cleaned10:28
something like time machine or other backup software cleans up after itself10:28
→ freestyl3r joined10:29
→ seanmerron joined10:30
g0th cbreak: I do10:30
during my codings I didn't want to keep like 10 copies of stash10:31
so I started to cp -r stuff quickly into .bak directories just to be save10:31
cbreak that sounds dumb.10:31
g0th why?10:31
cbreak you can just git commit10:31
g0th what?10:31
no!10:31
cbreak what ever you want10:31
g0th it's crappy code10:31
cbreak it's easy, fast, safe10:31
so?10:31
g0th so where would I commit it?10:31
cbreak you don't have to push it10:31
where ever you want10:31
g0th I had like 10 versions10:31
cbreak so?10:31
ten branches. Done.10:32
g0th yeah right10:32
cbreak you can throw them away later.10:32
g0th _that_ sounds dumb10:32
cbreak nah10:32
it works perfectly10:32
git can handle thousands of branches10:32
← mmitchel_ left10:32
g0th until you/I mess up my git tree10:32
cbreak they are easily rebased and used for cherry-pick10:32
← Khisanth left10:32
cbreak hahaha10:32
g0th with all the confusion10:32
no thanks10:32
it was fine10:32
← lukeholder left10:33
g0th my mistake was that I didn't commit/stash the "nice" version10:33
→ Khisanth joined10:33
luto cbreak: "about state if you add it, and then commit it." adding alone should be enough if you're lucky, right?10:33
g0th before I removed the bad versions10:33
cbreak luto: adding creates file state10:33
luto: but committing creates tree state10:33
g0th (+ I cp -r'ed a symlink dir)10:33
cbreak you can try to recover files you added but it's quite painful, committing is much easier to recover from10:33
luto sure10:33
cbreak naturally, stashing is between committing and just adding. It creates commits, but doesn't record them in a normal branch, nor a normal reflog10:34
g0th: yep, that wouldn't have happened if you had a better workflow :)10:34
→ Malsasa joined10:36
← Behi left10:36
← KdgDev left10:36
masak g0th: there's a way to use git so well that you don't need the .bak directories you currently feel you need.10:37
→ stamina joined10:39
→ bgerber joined10:40
→ pantsman_ joined10:42
← khmarbaise left10:43
← madprocess left10:43
→ SonikBoom joined10:43
← AlexDenisov left10:45
→ WaReZ joined10:47
→ fstd_ joined10:47
← D-Boy left10:47
g0th ok, I'll try it out10:48
→ Jackneill joined10:48
g0th masak: please elaborate a bit on the workflow10:48
I assume I make a branch with a name like "bak1" for each such backup and commit to it?10:48
git checkout -b "bak1" ?10:48
→ amikiri joined10:49
g0th after thinking about it, it might not be such a bad idea ^^10:49
you already use that method, any further hints, small things as well10:49
?10:49
← fstd left10:50
fstd_ → fstd10:50
→ D-Boy joined10:51
← sinkensabe left10:51
→ hexagoxel joined10:51
cbreak g0th: you can make multiple branches, depending on wether you want to continue working or start working from a fresh state10:51
← pantsman_ left10:52
cbreak g0th: if you want to continue working on changes, you can later squash them with rebase -i10:52
masak g0th: yes, like that.10:53
→ rjhunter joined10:53
g0th the rebase thingy is the part I'm not completely familiar with and would run some risk of messing something up10:54
xnrand → offended10:54
g0th basically the changes are not commit ready10:54
masak g0th: git is clever enough that you can do that *in the middle of working on something*. it will just float the uncommitted changes over to the new branch.10:54
→ Sceorem joined10:54
cbreak g0th: commit ready is meaningless in git10:54
just commit them anyway10:55
g0th I want a clean commit history in the end10:55
cbreak that's ok10:55
commit them to a temporary branch and rebase -i later10:55
→ jftf joined10:55
g0th git checkout -b "newbranch"10:56
git rebase -i "bak1"?10:56
can you give an example line?10:56
cbreak no10:56
more like git checkout yourtempbranch10:56
git rebase -i lastcommitonbase10:56
then you can select squash or reword or reorder the commits10:56
g0th I don't commit on base10:56
it's the other way around10:57
cbreak you can also reset --mixed all commits away and git add -p and git commit them again completely different10:57
g0th I want to incorporate the changes of yourtempbranch into my base10:57
cbreak g0th: I know10:57
g0th: you commit on yourtempbranch10:57
g0th: you have to give git a reference to where to start to rebase from10:57
that's the last commit on your temp branch that's also on base10:57
g0th isn't that annoying?10:57
ok that makes sense10:58
cbreak it's git merge-base base yourbranch10:58
no, not annoying10:58
← hebz0rl left10:58
cbreak there are shorthands such as @{u}, but that one has other side effects10:58
g0th git merge-base?10:58
cbreak g0th: man git merge-base10:58
gitinfo g0th: the git-merge-base manpage is available at http://jk.gs/git-merge-base.html10:58
← rjhunter left10:58
g0th sigh10:58
all those new commands10:58
git stash is a bit simpler10:59
so how would my rebaseing work?11:00
assuming I know what my tempbranch is based on11:00
← jftf left11:00
g0th ideally I would like to "uncommit+unstage" the changes of tempbranch onto my base11:01
← fstd left11:01
→ fstd joined11:01
→ EminenceHC joined11:01
g0th but I guess your suggestion is to work on tempbranch until its modifications are "commit-ready" and then bundle them together and apply that to base?11:02
→ robbyoconnor joined11:02
g0th I don't like that so much since it forces me to work away from my base, I mainly wanted to use the tempbranches as backups11:03
not as working branches11:03
cbreak g0th: you don't need to bundle them together11:03
you can squash commits, making them one. You can reword the commit messages11:03
if you want to completely rewrite the commits, i.e. split the changes up, then there are better ways than rebase11:04
g0th: it doesn't force you to work on an other branch11:04
you can work anywhere11:04
← bluesm left11:04
cbreak being on a feature branch when developing is just convention11:04
doing that more often would have saved me a whole lot of trouble in the past...11:05
← Manny left11:05
← St_Marx left11:05
→ Manny joined11:05
→ St_Marx joined11:06
g0th my base is already on a feature branch11:06
← xobb left11:06
g0th so it would be feature branch on feature branch ^^11:06
→ xobb joined11:07
→ saorge_ joined11:08
← EminenceHC left11:10
g0th is there also a way to "uncommit + unstash" changes onto the current branch?11:10
→ hebz0rl joined11:10
g0th i.e. leave the current branch completely unchanged but apply the changes from some other commit to the files11:10
(outside of git)11:10
like stash11:11
← saorge left11:11
→ paul424 joined11:12
cbreak g0th: sure. git cherry-pick11:13
you can copy commits from other branches11:13
g0th perfect11:13
cbreak as for uncommitting, just reset --hard11:13
that'll nuke history11:14
g0th nono11:14
never reset --hard again11:14
^^11:14
but cherry-pick sounds nice for backups, no?11:14
cbreak no11:14
g0th why not?11:14
cbreak it's worthless for backups11:14
it doesn't back anything up11:14
just make a branch11:14
done.11:15
g0th I can cherry-pick back uped changes onto base?11:15
→ hebz0rl_ joined11:15
cbreak sure11:16
where ever you currently are11:16
(so you'll have to check out base)11:16
g0th yes11:16
← gambler left11:17
→ hkon_ joined11:17
g0th git checkout -b "bak1", git checkout base, git cherry-pick <something, hmm>11:17
← hebz0rl left11:17
→ nour joined11:17
→ rjhunter joined11:17
g0th git cherry-pick bak1 should work I guess11:18
simple enough11:18
→ Eins_ joined11:19
g0th ait11:19
wait11:19
it commits the changes?11:19
sigh11:20
osse g0th: --no-commit11:20
→ doev joined11:20
cbreak g0th: as I said, it's for copying commits11:21
→ fairuz1 joined11:21
→ tadni`` joined11:21
← fstd left11:21
→ khmarbaise joined11:21
osse git reset HEAD~11:21
→ fstd joined11:22
→ _bart joined11:22
← tadni` left11:22
_bart Hi, is it potentially dangerous to use: https://github.com/aanand/git-up ?11:22
← fairuz left11:23
osse that's a very broad question. It is potentially dangerous to walk your dog. On the other hand you can undo stuff using git-reflog11:23
← Eins_ left11:23
osse it looks aliright to me11:25
← xobb left11:26
← kyb3r_ left11:27
→ SimonNa joined11:28
← fairuz1 left11:28
← Gizburdt left11:28
g0th osse: thanks11:28
← maxorator left11:28
← StefanLehmann left11:28
→ Gizburdt joined11:28
← Gizburdt left11:29
→ mmitchel_ joined11:29
→ Gizburdt joined11:29
← kevin-brown left11:30
→ maxorator joined11:30
← harold2 left11:30
→ dccc joined11:31
→ StefanLehmann joined11:31
← Spinkzeit left11:31
← hkon_ left11:32
← StefanLehmann left11:32
→ harold2 joined11:32
← guardian left11:32
→ nedbat joined11:33
→ jatt joined11:33
← jatt left11:33
→ jatt joined11:33
→ fairuz joined11:34
→ StefanLehmann joined11:34
← mmitchel_ left11:34
→ xobb joined11:35
→ zack6849_ joined11:35
← k_sze left11:36
← aucecil left11:37
← Kulrak left11:37
← Tabmow left11:37
← zack6849 left11:37
← Gizburdt left11:39
→ Gizburdt joined11:40
← thierryp left11:40
→ aucecil joined11:40
← xobb left11:40
← Gizburdt left11:40
← hj2014 left11:42
→ sohail joined11:43
→ hj2014 joined11:43
← blahdodo left11:44
→ Sivil joined11:47
→ xobb joined11:51
→ kopparam joined11:52
← kopparam left11:53
→ thierryp joined11:54
← jerius left11:54
← sohail left11:55
→ jerius joined11:56
→ jftf joined11:56
← tokik left11:56
→ lukeholder joined11:59
→ Embassy joined11:59
← lukeholder left11:59
→ lukeholder joined12:00
→ SonikBoom_ joined12:00
← lukeholder left12:00
→ netameta joined12:00
← jftf left12:01
→ lukeholder joined12:01
← lukeholder left12:01
→ lukeholder joined12:02
← sgen left12:02
← hcc23 left12:02
→ hcc23 joined12:02
← SonikBoom left12:03
← xobb left12:03
→ xobb joined12:05
→ ag4ve_ joined12:05
→ kevin-brown joined12:06
→ Spinkzeit joined12:08
→ Kulrak joined12:08
→ Tabmow joined12:08
← msankhala left12:11
← xobb left12:11
→ xobb joined12:12
→ AlexDenisov joined12:12
→ Errorical joined12:12
→ msankhala joined12:13
← mizu_no_oto left12:14
← lukeholder left12:14
← hj2014 left12:16
→ hj2014 joined12:17
← motto left12:17
← jatt left12:18
→ m8 joined12:20
→ zapb joined12:22
→ Gizburdt joined12:22
← StefanLehmann left12:23
← shinnya left12:23
→ gccostabr joined12:24
← LeMike left12:24
→ lukeholder joined12:25
← lukeholder left12:25
→ toothrot joined12:26
← xobb left12:27
→ cbr_ joined12:27
→ lukeholder joined12:28
← lukeholder left12:28
→ m0viefreak joined12:28
← paul424 left12:29
→ lukeholder joined12:30
← lukeholder left12:30
→ shinnya joined12:30
adam12 → adam12:30
→ lukeholder joined12:31
adam → Guest1212612:31
← lukeholder left12:31
→ mmitchel_ joined12:32
→ trewe joined12:32
→ irqq joined12:32
→ lukeholder joined12:32
← lukeholder left12:33
→ maroloccio joined12:34
→ lukeholder joined12:34
→ StefanLehmann joined12:34
← lukeholder left12:34
→ diegoviola joined12:34
← Gizburdt left12:36
→ lukeholder joined12:37
→ Gizburdt joined12:37
← lukeholder left12:37
← mmitchel_ left12:37
← teran left12:37
← cbr_ left12:38
← Gizburdt left12:38
→ lukeholder joined12:38
→ Gizburdt joined12:38
← lukeholder left12:39
← gccostabr left12:39
→ lukeholder joined12:40
← lukeholder left12:40
→ xobb joined12:40
→ lukeholder joined12:41
→ dgutierrez1287 joined12:41
← lukeholder left12:41
→ cmmagid joined12:42
→ lukeholder joined12:42
← lukeholder left12:43
→ OffTheRails joined12:44
→ lukeholder joined12:45
← lukeholder left12:45
← Manny left12:46
→ lukeholder joined12:46
← xobb left12:46
← lukeholder left12:47
→ blackoperat joined12:47
→ xobb joined12:47
← blackoperat left12:48
→ lukeholder joined12:48
← lukeholder left12:48
→ lukeholder joined12:49
→ cbr_ joined12:49
→ polyzen joined12:49
← cbr_ left12:49
→ cbr_ joined12:49
← lukeholder left12:49
← Gizburdt left12:50
← nedbat left12:50
→ Gizburdt joined12:50
→ lukeholder joined12:51
→ Gizburdt_ joined12:51
← lukeholder left12:51
→ lukeholder joined12:53
→ Skapadapaduu joined12:53
→ King_Hual` joined12:53
← lukeholder left12:53
→ teran joined12:54
← Gizburdt left12:54
→ lukeholder joined12:55
→ jds joined12:55
← lukeholder left12:55
→ lukeholder joined12:56
← israelpattison left12:56
← joschi left12:56
← kukks left12:56
← stamina left12:56
← lukeholder left12:56
→ israelpattison joined12:56
→ jftf joined12:57
→ Dreamer3 joined12:57
→ lukeholder joined12:57
← lukeholder left12:58
← Errorical left12:58
→ lukeholder joined12:59
← teran left12:59
← lukeholder left12:59
→ lukeholder joined13:00
← lukeholder left13:00
→ moritzs joined13:00
← msankhala left13:00
← moritzs left13:00
→ msankhala joined13:01
→ lukeholder joined13:01
← lukeholder left13:01
→ EminenceHC joined13:01
← jftf left13:02
→ lukeholder joined13:02
← lukeholder left13:02
→ moritzs joined13:02
→ mmitchel_ joined13:03
← mmitchel_ left13:03
→ lukeholder joined13:03
diegoviola github says that my master branch is 29 commits behind foo:master13:03
how do I see which commits are those?13:03
in order for me to merge them13:03
_ikke_ What is foo:master?13:04
← lukeholder left13:04
cbreak diegoviola: git remote add && git remote update && !lol13:04
gitinfo diegoviola: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all13:04
→ lukeholder joined13:04
← khmarbaise left13:04
← Dreamer3 left13:04
← lukeholder left13:05
→ sohail joined13:05
← sohail left13:05
→ sohail joined13:05
→ lukeholder joined13:05
→ khmarbaise joined13:05
← lukeholder left13:06
← cbr_ left13:06
→ iLoop joined13:06
osse diegoviola: git log master..foo/master13:06
→ lukeholder joined13:07
→ hkon_ joined13:07
← moritzs left13:07
← Alenah left13:08
diegoviola ty13:08
← iLoop left13:09
→ Dreamer3 joined13:09
← EminenceHC left13:10
← lukeholder left13:10
← Dreamer3 left13:10
→ Alenah joined13:10
→ hoschi_ joined13:10
→ Dreamer3 joined13:11
← amikiri left13:11
← Dreamer3 left13:11
← hkon_ left13:11
→ teran joined13:13
→ Noldorin joined13:16
→ kevinb joined13:16
← Ziber left13:16
→ Kaisyu joined13:17
← totte left13:17
→ lukeholder joined13:19
← beautifulmind left13:19
→ moritzs joined13:20
← teran left13:20
→ Ziber joined13:20
← kevinb left13:20
→ Eins_ joined13:21
← Balliad left13:21
CabalJohnson → CaveJohnson13:22
→ kevinb joined13:23
← JEEB left13:24
← Vile left13:24
diegoviola git log master..origin/master doesn't return anything13:25
← WaReZ left13:25
← Eins_ left13:25
osse oooh, github says that, not git status13:26
have you added 'foo' as a remote?13:26
→ msmto joined13:27
← msmto left13:27
diegoviola well, it's already a remote13:28
origin/master13:28
oh13:28
that's my remote13:28
i forgot to add the one i forked from13:28
sorry13:28
yep, works now, thanks :)13:29
→ Dreamer3 joined13:31
← _bart left13:32
→ angrycodr joined13:33
→ darkbasic_ joined13:33
→ bitkiller joined13:34
← darkbasic left13:34
→ p4sh4 joined13:35
← kevinb left13:35
→ kevinb joined13:36
diegoviola that confused me a bit13:37
→ Manny joined13:38
→ isc_ joined13:39
cbreak told you :)13:40
→ ology joined13:40
→ mizu_no_oto joined13:40
→ mechanicalduck_ joined13:41
diegoviola right, thanks13:41
← ntio1 left13:41
→ Mitchbones joined13:42
← Dreamer3 left13:42
→ ntio1 joined13:42
← mechanicalduck left13:42
← maxorator left13:42
← AlexDenisov left13:42
← isc_ left13:43
→ mablae joined13:43
→ maxorator joined13:43
← p4sh4 left13:44
← sohail left13:45
→ cannonball joined13:45
← Spinkzeit left13:45
← Kulrak left13:45
← Tabmow left13:45
gitinfo set mode: +v13:47
mablae hi there!13:47
I have the following situation: I have master and release branches. Now I did a new (hotfix)-branch (based on release), and merged that back into release. Pushed. So far so good. Now I need to merge this hotfix into master branch, but master was already ahead relase, when creating hotfix branch. How to merge cleanly into master?! "Normally" we _always merge master into release. So I need to manage the merge that way that it is not l13:47
ost when merging master into release again next time...13:47
→ mtk joined13:47
mablae Should I rebase my hotfix against master ?!13:47
What is the best approach?13:48
cbreak don't rebase13:48
just merge13:48
mablae so just checkout master13:48
← monogit left13:48
→ bit_twit joined13:48
mablae git merge hotfix-branch ?!13:48
cbreak mablae: look at !lol before and after13:48
gitinfo mablae: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all13:48
cbreak sure13:48
← c0d3d left13:49
mablae Let me check13:49
→ motto joined13:51
← m8 left13:51
← mizu_no_oto left13:53
← Gizburdt_ left13:53
mablae cbreak, Look like it worked13:53
← bit_twit left13:53
cbreak good :)13:53
mablae Now when the master branch is ready for release I can just merge it into release as before and have ALL changes in it?! How does git check that my hotfix is already merged into release?!13:54
← bitkiller left13:55
mablae ATM I have my branches seperated I think13:55
cbreak it doesn't have to check13:55
mablae Like split, Like they both go their "own way"13:55
cbreak the hotfix is merged into both13:55
→ DavidCruse joined13:56
mablae So I can delete it now?! The hotfix-branch?13:56
cbreak so at best merge will see nothing happening, at worst it'll conflict and trivially resolve13:56
mablae: yeah. The commit is referenced by the other branches13:56
← mennea left13:56
→ doener joined13:56
mablae Git is awsome!13:56
cbreak (it has been merged into the other branches so the commit is in history of those)13:56
check with !lol afterwards13:56
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all13:56
mablae I worked with subversion until last week, and I dont think this is even possible with svn13:57
cbreak (you'll see that all that changed is the branch label for the hotfix vanishing)13:57
← seg left13:57
gitinfo set mode: +v13:57
→ Gizburdt joined13:57
mablae cbreak, yeah, it looks like a real git tree :)13:57
pekster The only reason to keep the hotfix-branch around now is if you need to merge it elsewhere, where it's convenient to do so by name. Even if you delete it and later decide it needs to go into the "old-release" branch, you can still merge by commitish, but it's less convenient13:57
DavidCruse What happens when I follow someone on github?13:57
cbreak yep. Or you can recreate the branch.13:57
→ c0d3d joined13:57
cbreak DavidCruse: they sue you for stalking?13:57
→ jftf joined13:58
mablae DavidCruse, Nothing... They dont get notified or sth13:58
DavidCruse cbreak: What did you actually mean?13:58
mablae: or sth?13:59
cbreak DavidCruse: what I actually mean is that it doesn't matter, git is unrelated to github :)13:59
mablae DavidCruse, Get email for example13:59
DavidCruse cbreak: Yes, I'm aware about that just wanted to know if they're notified or not ;)14:00
← thierryp left14:00
mablae DavidCruse, I always use "watch repo" - this way is more project centric. It gives me all users activity on a certian project instead showing me all things a special user does14:01
→ p4sh4 joined14:01
→ JEEB joined14:02
DavidCruse mablae: Fair enough :)14:02
→ RiVale joined14:02
← RiVale left14:02
← jftf left14:02
← lukeholder left14:03
→ sohail joined14:04
← sohail left14:04
→ sohail joined14:04
→ hice3000 joined14:04
← hice3000 left14:07
→ casium joined14:07
→ Spinkzeit joined14:08
→ Kulrak joined14:08
→ Tabmow joined14:08
→ JeanCarloMachado joined14:08
← Manny left14:08
→ starkhalo joined14:09
← casium left14:10
← kevinb left14:10
← TheFuzzball left14:10
← p4sh4 left14:11
→ leeN joined14:12
← leeN left14:12
← Malsasa left14:13
→ bitkiller joined14:14
← watabou left14:14
→ n-st joined14:14
→ niaglo joined14:15
→ Manny joined14:15
← mtk left14:16
→ endiruna joined14:17
← Sceorem left14:17
→ mennea joined14:17
← JEEB left14:18
→ Malsasa joined14:19
← Manny left14:19
→ mizu_no_oto joined14:20
→ teran joined14:21
→ looper joined14:21
← zapb left14:23
← Malsasa left14:24
→ AlexZan joined14:25
→ AlexDenisov joined14:26
← tgkokk left14:26
← teran left14:26
← dsdeiz left14:26
← Gizburdt left14:26
→ dreiss joined14:26
← fold left14:26
→ Dreamer3 joined14:27
→ jrhorn424 joined14:27
→ bit_twit joined14:27
→ kukks joined14:27
← Dreamer3 left14:27
← shinnya left14:28
← niaglo left14:28
→ Gizburdt joined14:28
→ dangerousdave joined14:28
→ niaglo joined14:30
jrhorn424 → zz_jrhorn42414:30
→ thiago_ joined14:31
← thiago_ left14:31
→ thiago_ joined14:31
→ punchagan joined14:33
← Gizburdt left14:33
→ Gizburdt joined14:34
→ Gamecubic joined14:34
→ daanavitch joined14:35
→ zapb joined14:36
→ tgkokk joined14:37
→ bluesm joined14:37
sitaram_ → sitaram14:37
→ sheperson joined14:38
← Gizburdt left14:38
← zumba_addict left14:38
← mizu_no_oto left14:38
← FreezingCold left14:38
thiago_ → thiago14:38
→ Gizburdt joined14:38
→ zumba_addict joined14:39
→ mizu_no_oto joined14:41
← dangerousdave left14:42
← punchagan left14:43
→ thierryp joined14:44
sitaram jast: is there a way to delete a bot trigger phrase? I added one that I now think is not really useful and want to get rid of it.14:44
→ noxd joined14:44
→ Dreamer3 joined14:45
phy1729 sitaram: for most bots it's forget <phrase>14:45
→ Zectbumo joined14:46
Zectbumo what is the git eqivalent of bzr export <repo>14:49
← DavidCruse left14:49
osse what does it do?14:49
Zectbumo downloads a non version controlled source14:50
← AlexDenisov left14:50
← sheperson left14:50
osse you run it locally and then you get just plain files from <repo> which refers to some external location?14:51
Zectbumo yeah14:51
osse Then there is no equivalent in Git. But most web interfaces for Git repoos have a "download tarball" or "download zip" button14:51
← mizu_no_oto left14:51
← maxorator left14:52
rom1504 git archive14:52
Zectbumo hmm, bummer. I use the CLI version of git. I'll look for a download option14:52
osse Zectbumo: failing that you can do git clone --depth 1 <repo>14:52
Zectbumo rom1504: thanks14:52
osse ahh, git archive --remote might work, but it's off by default14:52
→ mizu_no_oto joined14:53
→ maxorator joined14:53
→ Gizburdt_ joined14:53
← JeanCarloMachado left14:53
← theanine left14:53
← StefanLehmann left14:54
← khmarbaise left14:54
→ JeanCarloMachado joined14:54
→ FreezingCold joined14:54
← paddymahoney left14:55
→ DigitallyBorn joined14:55
→ StefanLehmann joined14:55
← rjhunter left14:55
→ lbn joined14:55
← lbn left14:56
sitaram phy1729: hmm... thanks. I don't see that documented in http://jk.gs/bot but I'll try it14:56
→ KdgDev joined14:57
← Gizburdt left14:57
→ sinkensabe joined14:57
→ LeMike joined14:58
→ jftf joined14:58
Zectbumo man, you guys have it rough. git is hard14:59
← dreiss left14:59
osse They use Git to cut diamonds15:00
rom1504 git is hard ?15:00
compared to what ?15:00
Zectbumo bzr15:00
→ bezet joined15:00
rom1504 why ?15:00
what's the point of bzr export (or git archive) btw ?15:00
never needed that15:00
Zectbumo I am having trouble using git archive --remote15:00
thiago rom1504: do you make releases of your software?15:01
← nour left15:01
Zectbumo rom1504: if you don't want to download the whole repository history to develop and just want the code to build.15:01
→ EminenceHC joined15:01
→ AlexDenisov joined15:01
rom1504 yeah but not source ones, and i'd let github (or gitlab) handle that, but yeah I guess if you're not using something like github or gitlab you might need it15:02
→ fold joined15:02
← Embassy left15:02
→ punchagan joined15:02
thiago rom1504: you want people to go find the commit in the github repository?15:02
← JeanCarloMachado left15:02
← mizu_no_oto left15:03
← jftf left15:03
osse Zectbumo: what is the trouble you're having15:04
rom1504 you can make release in github15:04
(linked with tags)15:04
→ mizu_no_oto joined15:04
← bezet left15:04
rom1504 like this https://github.com/syncthing/syncthing/releases15:04
→ rjhunter joined15:05
thiago rom1504: I didn't know that15:05
→ diegovio1 joined15:06
Zectbumo osse: I do git archive --format=tar --remote=https://github.com/jquery/jquery.git | tar xf -15:06
fatal: Operation not supported by protocol.15:06
Unexpected end of command stream15:06
thiago Zectbumo: does the remote server support git archive?15:06
← AlexDenisov left15:07
Zectbumo thiago: github, maybe not because they probably just want me to change the extension15:07
osse Zectbumo: I know for a fact that github for some reason disallows it15:07
← diegoviola left15:07
osse Zectbumo: wget https://github.com/jquery/jquery/archive/master.zip15:07
→ JEEB joined15:08
diegovio1 → diegoviola15:08
rom1504 well apparently there's svn export https://github.com/user/project/trunk15:08
but that's kind of broken15:08
← dgutierrez1287 left15:08
rom1504 (that you have to do that)15:09
thiago Zectbumo: please check github's documentation to see if they have the archive extension enabled.15:09
rom1504 http://stackoverflow.com/questions/9609835/git-export-from-github-remote-repository15:09
← EminenceHC left15:09
→ lindenle joined15:10
→ ockham joined15:10
← donmichelangelo left15:10
← King_Hual` left15:10
← Skapadapaduu left15:10
Zectbumo ok, well thanks anyways. I'll just brunt the hit of git clone. I feel that every time I need to do something in git, I feel it is hard. Don't get me wrong, git is super powerful and awesome looking. just not simple. At least in the command line interface world.15:11
rom1504 well if it's from github, you can simply to that too https://github.com/jquery/jquery/archive/master.zip15:12
→ King_Hual joined15:12
osse Zectbumo: but I gave you a direct link to a zip! :(15:12
← mechanicalduck_ left15:12
rom1504 oh yeah I didn't se that15:12
← trewe left15:12
← rjhunter left15:13
→ dgutierrez1287 joined15:13
← thierryp left15:14
← moritzs left15:14
← lindenle left15:14
Zectbumo osse: thanks for the link. I'm scripting this stuff and I used jquery as an example to get an answer. I'm just not happy with the answer.15:15
← Sivil left15:15
→ thierryp joined15:15
osse Zectbumo: most of the popular hosting sites have predictable URLs to tarballs/zips. But if that's not good enough then you can at least clone --depth 1 to take less of a hit15:16
→ JeanCarloMachado joined15:17
Zectbumo osse, yes. I like the clone --depth 1 answer the best15:17
→ mechanicalduck joined15:18
→ seg joined15:19
← dgutierrez1287 left15:19
→ marscher joined15:20
→ Gizburdt joined15:22
→ Nizumzen joined15:22
→ teran joined15:22
→ pheaver joined15:22
← Gizburdt_ left15:22
← thierryp left15:22
→ braj joined15:22
→ WaReZ joined15:22
← DigitallyBorn left15:23
→ dgutierrez1287 joined15:24
← seanmerron left15:25
← mizu_no_oto left15:26
← Gizburdt left15:26
← teran left15:26
Zectbumo osse: all the zips I would download for all projects are all named master.zip. Who wants that?15:27
rom1504 wget -O15:28
wget https://github.com/jquery/jquery/archive/master.zip -O jquery.zip15:28
osse Zectbumo: probably no one. the zip is named after the branch the zip is made of15:29
← mennea left15:29
Zectbumo yeah, I get it. and master is the standard15:29
← JeanCarloMachado left15:30
→ ehmatthes joined15:30
→ Neon1024 joined15:31
→ kenneth joined15:32
→ Gizburdt joined15:32
Zectbumo I've used cvs, svn, bzr, hg and a little git.15:32
→ lindenle joined15:32
← yacks left15:32
← Gizburdt left15:33
→ preaction_ joined15:33
→ Sceorem joined15:34
← preaction left15:34
preaction_ → preaction15:34
→ sgambino joined15:35
qsuscs master is just the default name and can be changed as you want15:37
e.g. unlike mercurial, where default has a meaning15:37
→ bitri joined15:38
→ mizu_no_oto joined15:39
Zectbumo oh yeah! and how could I forget RCS! ah... that was pain15:39
qsuscs see, i started with git15:39
i started to read the svn book and banged my head against the table every 10 pages15:40
← WaReZ left15:40
Zectbumo qsuscs: good choice. distributed repository is the way to go15:40
qsuscs then i made the mistake to open the CVS texinfo :D15:40
Zectbumo nice! going backwards15:40
← hebz0rl_ left15:40
Zectbumo qsuscs: all you needed was some RCS and your eyes would cross15:41
qsuscs i didn’t find good lecture but for CVS and git !book15:41
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 !parable15:41
← irqq left15:41
qsuscs the hg book seems to be outdated as hell15:41
Zectbumo qsuscs: have you tried bzr?15:42
→ dsdeiz joined15:42
→ hebz0rl_ joined15:42
qsuscs Zectbumo: not yet (except for `bzr branch`)15:42
→ khmarbaise joined15:42
qsuscs and i find the description on the website, i’m not really sure whether i want to do so15:42
Zectbumo it's the perfect blend of svn and git. best of both worlds15:42
→ irqq joined15:42
qsuscs does it have the index?15:43
(and there is something good about svn?)15:43
← xobb left15:43
Zectbumo the commands in svn were simple, but you get the distributed repo like git.15:43
the directory structure is straight forward15:43
qsuscs but i like the git interface and find it simple enough15:43
Zectbumo you don't have meta data like in git where branches are "hidden"15:44
qsuscs how are branches in git “hidden”?15:44
Zectbumo qsuscs: I don't know about GUI. I work only in CLI. So I have a different perspective. I heard bzr GUI was weak.15:45
qsuscs branches in git are easy as pie: http://pics.nase-bohren.de/version-control.jpg15:45
Zectbumo: i’m talking about CLI, i only use !gitk from time to time15:45
gitinfo Zectbumo: A tool to view commit history and the diffs they introduced, branching and merging, etc. It is shipped with git, run `gitk` from inside a repository.15:45
Zectbumo hidden as in bzr (and svn) the branches are bzr branch /myrepo/branches/mybranch. but git (if I'm correct) is git clone /myrepo; then have to switch mybranch.15:46
→ semente joined15:46
qsuscs yes15:46
it’s called clone, hence it clones the whole repo (neglecting shallow clones aka --depth, which results in some funny problems)15:47
→ Goplat joined15:47
semente hi guys.. I need a help here. Somehow a branch was merged into my branch. It has all its changes, but I can't find the merge commit to revert. Looks like there is no merge commit but all commits from the other branch is there :/15:47
→ Trudko joined15:48
→ Literphor joined15:48
qsuscs semente: it could have been cherry-picked15:48
← Literphor left15:48
→ xobb joined15:49
Zectbumo semente: can you do a blame and see what lines are in the other branch and see the revision?15:49
→ mennea joined15:49
← marscher left15:49
← tgkokk left15:49
← kukks left15:50
Zectbumo is there a praise command in git?15:50
qsuscs Zectbumo: man git blame15:50
gitinfo Zectbumo: the git-blame manpage is available at http://jk.gs/git-blame.html15:50
semente qsuscs, almost sure it was not cherry-picked15:50
→ acharlieh joined15:51
Zectbumo my point was that you can tell bzr has a heart when they alias a blame to praise. bzr praise is the same as bzr blame. I love it.15:51
Hello71 !lol15:51
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all15:51
qsuscs semente: almost<100% ;) but yeah, you can git blame the file and see where the line was introduced15:52
← saorge_ left15:52
qsuscs Zectbumo: git config alias.praise blame15:52
Zectbumo qsuscs: very cool15:52
qsuscs Zectbumo: i think every command in git only exists once (except for e.g. !pull)15:52
gitinfo Zectbumo: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/15:52
→ JeanCarloMachado joined15:53
→ madprocess joined15:53
semente qsuscs, the thing is: it happened minutes ago, only me is working in this branch. I did not use cherry-pick. The commits have the same hash (when you cherry-pick they are new commits)...15:56
← mennea left15:56
qsuscs semente: search your shell history. you must have used git merge or git pull somewhere, everything else (cherry-pick or rebase) changes the hashes15:57
→ dwltz joined15:57
→ Embassy joined15:57
qsuscs semente: are you sure you are actually in the right branch? gitk --all or !lol to see all the branches with history and stuff15:58
semente qsuscs, if I did some kind of cherry pick it could be from magit/Emacs by mistake.. but I don't know if I there is a command log in Emacs15:58
gitinfo semente: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all15:58
qsuscs semente: emacs is the weirdest of all tools. besides, it’s not !gui technically spoken, but that should apply nevertheless15:58
gitinfo semente: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.15:58
→ kukks joined15:59
← kukks left15:59
→ kukks joined15:59
→ xSmurf joined15:59
→ rishabh_kwt joined15:59
→ jottr joined15:59
→ jftf joined15:59
qsuscs (i might be offline soon, sitting in the train and reception gehts weaker and weaker)16:00
← JeanCarloMachado left16:00
Zectbumo qsuscs: you know, my favorite part of svn was that you can take the exact repo URL and paste it into your browser and get an HTML navigatable version. Always. You can't say that about any other of these version control systems.16:00
osse qsuscs: counter-example: git annotate16:01
Zectbumo qsuscs: if you disconnect, it was nice chatting with you16:01
← hebz0rl_ left16:01
← khmarbaise left16:01
→ dreiss joined16:01
→ khmarbaise joined16:03
→ pantsman_ joined16:04
→ lb1a joined16:04
← DrNick left16:04
← looper left16:04
← jftf left16:04
← rishabh_kwt left16:05
→ rishabh_kwt joined16:05
← Pyrogerg left16:05
← madprocess left16:06
offended → xnrand16:07
← godgodgodgo left16:07
→ godgodgodgo joined16:08
→ daedeloth joined16:08
→ mkoskar joined16:08
← Trudko left16:09
← Silex left16:10
← jottr left16:10
qsuscs osse: didn’t know about that16:11
so, back. at home, where i have bad wifi instead of bad 3g16:11
← dsdeiz left16:12
→ paul424 joined16:12
← bartman`` left16:12
qsuscs Zectbumo: oh, your browser speaks svn+ssh://? :D16:12
← jsjc1 left16:12
← freestyl3r left16:12
Zectbumo qsuscs: I wish! but if it could, it would show my HTML file. Which is awesome in my book. but sorry my browser isn't as cool as svn :/16:13
qsuscs osse: according to man git annotate, it’s slightly different.16:13
gitinfo osse: the git-annotate manpage is available at http://jk.gs/git-annotate.html16:13
← msankhala left16:13
→ JeanCarloMachado joined16:14
← acharlieh left16:14
← hoschi_ left16:14
← longbeach left16:14
qsuscs Zectbumo: svn? cool?! linus says that “svn ist the most pointless project ever started” :P16:14
Zectbumo oh now that's not true16:14
svn was a godsend compared to what we had at the time (CVS)16:14
← lpax left16:15
lb1a "cvs done right" ... when you start with that kind of slogan, there's no way you can go..16:15
(linus)16:15
← dreiss left16:15
Zectbumo lb1a: it's true, but where was git at the time?16:16
qsuscs one of the design goals of git was “what would CVS not do”16:16
→ Willow joined16:16
→ freeaaa joined16:16
← freeaaa left16:16
pekster I've also heard the slogans "svn is cvs done right" and "git: because you can't do cvs right"16:17
→ acharlieh joined16:17
Zectbumo svn merges are painful. I'm surprised that google still uses svn16:17
lb1a Zectbumo, there were tarballs and patches ^^16:17
osse qsuscs: that difference is so slight that i stand by what I said16:18
qsuscs “tarballs and patches, actually superior to CVS” —Linus16:18
→ jottr joined16:18
lb1a ^^16:18
Eugene Walgreens > CVS16:18
Zectbumo haha16:18
lb1a Tumbleweed & Crickets > CVS16:19
Zectbumo CSV > CVS16:19
← fold left16:19
lb1a i'd go that far and say: Excel > CVS16:20
→ nkouevda joined16:20
qsuscs osse: ask your cc: float foo=0.666; if (foo == 2/3) printf("true") else printf("false");16:20
Zectbumo ouch16:20
qsuscs (probably insert some semicolons)16:20
osse qsuscs: why16:20
ChanServ set mode: +o16:20
qsuscs osse: slight difference, still false.16:20
:P16:20
Nevik_ if you ever need a gif for someone who messed up a merge, "Here is how not to merge" http://i.imgur.com/ipcCTVk.gif16:20
(via reddit)16:21
Eugene changed the topic to: Welcome to #git, the place for git help and a killer soundtrack | Current stable version: 2.1.0 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Wait for the git-beats --drop16:21
Eugene set mode: -o16:21
Eugene Nevik_ - `git merge -Xours`16:21
Nevik_ `git merge && git add -A && git merge --continue -m "fuck everyone else" && git push -f` Eugene16:22
Zectbumo well, in defense of CVS, tarballs don't have file locks16:22
specing Eugene: you sure that won't be git-bass --drop?16:22
osse qsuscs: oh well, whatever. there are still some undocumented synonyms, but I can't be bothered to look them up16:22
Eugene specing - patches welcome16:22
→ Eins_ joined16:23
→ teran joined16:23
→ Silex joined16:23
← bit_twit left16:24
osse qsuscs: accidentally found one: git stage16:24
← jottr left16:24
qsuscs wtf16:24
osse and it's even documented16:25
→ bit_twit joined16:25
Nevik_ ha16:25
all the synonyms16:25
qsuscs what do you find out next, that git-beats --drop actually exists?16:25
→ sdrfnord1 joined16:25
Nevik_ well dropping stashes is a thing16:25
so dropping beats might be the next thing 2.1.1 brings up16:25
Eugene That's a different joke entirely16:25
osse qsuscs: git explain-file16:26
Seveas git kitchen-sink16:26
osse qsuscs: http://git-man-page-generator.lokaltog.net/#cae1f9a24eac9ac91a9dad74aa9ab19116:26
→ Corey84 joined16:26
→ jsjc joined16:27
osse git-haul-origin hauls all non-logged unstaged origins inside all quiltimported subtrees, and any specifying of a ref that performs a branch a while after can be stripped with git-intensify-origin.16:27
--reconcile-log16:27
the submodule may not be ravaged by a grepped upstream16:27
← LeMike left16:27
← teran left16:27
← Eins_ left16:27
← breiti left16:27
Seveas git-construct-archive [ --rattle-hire-change | --seal-photograph-base ] [ --blend-shorten-log | --jar-tip | --flush-area ]16:27
← zanchoPa1sa left16:28
→ zanchoPansa joined16:28
→ Literphor joined16:28
→ Lyqyd joined16:29
osse --order-log16:29
with this argument, git-smell-upstream --enter-tip names areas that name the defined archives16:29
→ breiti joined16:29
osse Zectbumo: you see? It isn't so bad16:29
Eugene It's funny because these are actual man pages, right16:30
← jsjc left16:30
← Corey84 left16:30
← bit_twit left16:31
Zectbumo it's a good laugh16:31
→ bit_twit joined16:31
← paul424 left16:31
← lb1a left16:32
osse Eugene: yes16:32
← Goplat left16:34
← jds left16:35
→ knownasilya joined16:36
→ yacks joined16:37
← ehmatthes left16:38
→ dreiss joined16:38
→ coasterz joined16:40
→ hebz0rl_ joined16:40
→ fold joined16:41
→ cbr_ joined16:44
→ gargola joined16:44
→ Asiajey joined16:46
← Asiajey left16:46
→ Asiajey joined16:46
→ jackz1 joined16:46
← punchagan left16:47
→ jsjc joined16:49
← jackz1 left16:50
← jsjc left16:50
← hebz0rl_ left16:51
→ AnujSharma joined16:51
← irqq left16:51
→ jackz joined16:52
← AnujSharma left16:52
→ irqq joined16:52
→ Corey84 joined16:54
← jackz left16:54
→ Pyrogerg joined16:54
← Literphor left16:55
→ punchagan joined16:55
← daanavitch left16:55
← cannonball left16:56
→ kyoshero joined16:56
→ Literphor joined16:57
← bit_twit left16:58
→ rob___ joined16:58
← Dreamer3 left16:59
← doev left16:59
→ jftf joined17:00
→ bezet joined17:00
linduxed so what is it in this page indent file that does so that when i do <CR> in normal-mode when writing an arugment list, it indents all the way up to the opening parenthesis?17:00
https://github.com/linduxed/vim-ruby/blob/master/indent/ruby.vim17:00
i think it's line 90, but i'm not sure. on top of that, i don't understand the syntax at all17:01
← frew1 left17:01
→ EminenceHC joined17:01
linduxed god damn it, wrong channel again17:01
sorry about this guys17:01
→ bartman`` joined17:02
← Sceorem left17:03
→ hebz0rl_ joined17:03
→ TheFuzzball joined17:04
→ Dreamer3 joined17:04
← cbreak left17:04
← bezet left17:05
← jftf left17:05
→ Huevos joined17:05
← Orbitrix left17:05
→ zardoz_ joined17:05
→ Sceorem joined17:05
← dwltz left17:06
→ dwltz joined17:07
→ jceb joined17:07
→ Rastus_Vernon joined17:08
← EminenceHC left17:09
← Esya left17:10
← hebz0rl_ left17:10
→ kerrick joined17:10
gitinfo set mode: +v17:11
zardoz_ hello17:11
gitinfo zardoz_: 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.17:11
← toothrot left17:11
→ jsjc joined17:11
← dwltz left17:11
→ mennea joined17:12
← oojacoboo left17:12
zardoz_ can notepad++ be used with git17:12
as the default editor I mean17:12
qsuscs zardoz_: yes17:13
zardoz_ qsuscs: thank you17:13
← fold left17:13
qsuscs zardoz_: https://stackoverflow.com/questions/1634161/how-do-i-use-notepad-or-other-with-msysgit/2486342#248634217:13
← y_nk left17:13
→ hoschi_ joined17:13
→ hexagoxel_ joined17:13
← hexagoxel left17:15
→ Esya joined17:15
← endiruna left17:16
→ endiruna joined17:16
→ cbreak joined17:16
← rob___ left17:16
→ y_nk joined17:16
← sohail left17:16
← sinkensabe left17:17
Zectbumo rom1504: osse: https://github.com/jquery/jquery/archive/master.zip is actually a HTML!!! sheesh17:19
github is so misleading naming a link .zip and then returning content-type: text/html17:20
← tapout left17:20
← Esya left17:20
zardoz_ qsuscs: I was going through the instructions on the getting started (for Git) and it referred to this irc channel for help... so I thought I would try it... your response was fast and the channel seems to be as valuable as advertised... thank you17:21
→ davispuh joined17:21
← niaglo left17:21
← fstd left17:22
→ fstd joined17:22
→ tapout joined17:23
← hoschi_ left17:23
→ Esya joined17:23
Zectbumo the actualy content/type application/zip link is https://codeload.github.com/jquery/jquery/zip/master17:24
← Nizumzen left17:25
→ karstensrage joined17:25
→ psoo joined17:25
← y_nk left17:25
→ y_nk joined17:25
← cbr_ left17:26
← zardoz_ left17:27
→ niaglo joined17:27
→ dccc_ joined17:30
← Dreamer3 left17:30
Eugene It's almost like there's no particular relationship between the letters after a period in a URL or filename17:30
→ JohnBat26 joined17:30
Eugene ....and the contents of that file17:30
→ cbr_ joined17:30
→ kpease joined17:31
← irqq left17:31
← cbreak left17:32
→ irqq joined17:32
← dccc left17:33
→ toothrot joined17:33
bremner isn't that heresy for an admitted Windows user17:34
karstensrage git log -G is pretty amazing17:36
→ rath joined17:36
karstensrage well ii guess whats more amazing is that every change log is in every repo17:36
→ Dreamer3 joined17:37
qsuscs Zectbumo: i don’t get your problem, it’s a clean 302 http://pastie.org/private/ztlnbqwdmdyivaiw3ddjw17:37
→ CoreIT84 joined17:37
→ hoschi_ joined17:38
→ Eins_ joined17:38
← Sceorem left17:39
← mizu_no_oto left17:39
Zectbumo qsuscs: I was using curl which wasn't redirecting17:39
→ daito_ joined17:40
qsuscs Zectbumo: NOTOURBUG WONTFIX :>17:40
Zectbumo notourbug?17:40
← Corey84 left17:40
qsuscs not our (not that i belong to github) bug, but curl’s17:40
Zectbumo not our, ah17:41
well, it's just the URL is a redirect. is all. text/html 302 -> application/zip. pointless.17:41
I blame git for not having a normal way to get source without the git_dir that actually works17:42
CoreIT84 → Corey8417:43
nkouevda use -L?17:43
→ cbreak joined17:44
→ buck1 joined17:44
qsuscs nkouevda: as option to which command?17:45
← Willow left17:45
→ Willow joined17:46
← kukks left17:46
nkouevda curl17:47
Zectbumo -L does the trick17:48
qsuscs nkouevda: ah, i thought you meant <Zectbumo> I blame git for not having a normal way to get source without the git_dir that actually works17:48
← daito_ left17:48
← daedeloth left17:48
Zectbumo if only17:48
→ Sceorem joined17:48
← ag4ve_ left17:49
Zectbumo git archive --make-this-actually-work=true17:49
j/k17:49
qsuscs in my configuration files, you have to set DangerousOption="YesIKnowWhatIAmDoing" to make it work17:50
(for all the others, foo=yes is enough)17:50
← Willow left17:50
← psoo left17:51
→ dannixon joined17:52
← endiruna left17:52
← Akagi201 left17:52
→ thierryp joined17:54
← thierryp left17:56
→ TCubed joined17:57
osse Zectbumo: don't blame git; blame github17:57
→ epifanio joined17:58
osse https://help.github.com/articles/can-i-archive-a-repository17:58
oh, that is a different type of archiving.17:58
← diegoviola left17:58
← cbr_ left17:59
qsuscs osse: well, you can `svn export svn://foo/bar/baz` and get like `git clone git://foo/bar/baz && rm -rf baz/.git`18:00
ok, you can --depth=1 and stuff, but it’s still not exactly the same18:00
→ nour joined18:00
osse why are you telling me :O18:00
→ jftf joined18:01
→ mizu_no_oto joined18:01
→ Guest60343 joined18:01
Zectbumo osse: okay, I'll blame github. Though git could have made the archive so transparent that github wouldn't be able to turn it off18:01
bremner blame whoever you like ;)18:01
← angrycodr left18:02
qsuscs it should be no big deal to implement this18:02
after all, you can clone --depth=118:02
Zectbumo bremner: you're right. either way it's broken18:02
osse qsuscs: it is already implemented18:02
Zectbumo yeah, --depth=1 is fine18:02
qsuscs osse: but possible to disable it? or did i misread something?18:02
osse i think there's a config option you can set server-side18:03
github has done something to not make it work, at least18:03
Zectbumo I think I want the opposite of git-clone --no-checkout18:03
← JSharpe left18:04
← jftf left18:05
→ thumpba joined18:07
← niaglo left18:09
→ logix812 joined18:09
→ niaglo joined18:09
→ madewokherd joined18:11
← Embassy left18:11
→ teran joined18:12
← niaglo left18:12
→ Advocation joined18:12
← rjc left18:12
→ niaglo joined18:12
← Mitchbones left18:13
→ watabou joined18:13
← niaglo left18:13
→ jackz joined18:13
← pheaver left18:13
→ rjc joined18:14
→ amikiri joined18:15
→ niaglo joined18:16
← jackz left18:16
← teran left18:16
→ damccull joined18:17
← starkhalo left18:17
→ Malsasa joined18:18
← niaglo left18:18
← Mark_ left18:18
→ AlexDenisov joined18:22
→ diegoviola joined18:22
← acharlieh left18:23
→ acharlieh joined18:23
← Literphor left18:24
→ niaglo joined18:26
← nkouevda left18:27
← dansan left18:27
→ mugenzebra joined18:27
← acharlieh left18:27
← himikof left18:29
← bitri left18:29
JakeSays_ → JakeSays18:30
→ Literphor joined18:30
→ Embassy joined18:31
→ Goplat joined18:32
→ jontmorehouse joined18:32
← kyoshero left18:33
→ eburcat joined18:34
→ Mitchbones joined18:35
← kpease left18:35
→ acharlieh joined18:38
→ flugo joined18:39
→ jftf joined18:40
← flugo left18:40
← rishabh_kwt left18:40
→ himikof joined18:41
→ flugo joined18:41
→ nfk joined18:42
← hoschi_ left18:42
← acharlieh left18:42
← flugo left18:46
→ Diemuzi joined18:47
gitinfo set mode: +v18:47
← rath left18:47
→ cbr_ joined18:48
← Kaisyu left18:48
← jftf left18:48
← damccull left18:48
→ bitri joined18:49
← rjc left18:49
← Literphor left18:50
← cbr_ left18:50
← m0viefreak left18:50
→ rjc joined18:51
← robustus left18:51
→ lite_ joined18:51
← Neon1024 left18:52
→ _thumpba joined18:52
→ Willow joined18:53
→ Sivil joined18:53
← subhojit777 left18:53
→ robustus joined18:54
→ ag4ve_ joined18:54
← lite_ left18:55
→ kukks joined18:55
→ CoreIT84 joined18:56
← thumpba left18:56
← mizu_no_oto left18:56
← Corey84 left18:57
CoreIT84 → Corey8418:57
← Advocation left18:57
→ kaendfinger joined18:57
→ flugo joined18:58
→ Literphor joined19:00
→ reyha joined19:00
→ mizu_no_oto joined19:00
→ bezet joined19:01
← ag4ve_ left19:01
← Literphor left19:01
→ EminenceHC joined19:01
→ OleVik joined19:02
variable → constant19:03
← amikiri left19:04
← bezet left19:05
← bitri left19:07
→ endiruna joined19:07
← EminenceHC left19:09
← khmarbaise left19:09
← Zectbumo left19:11
→ mmitchel_ joined19:11
← OffTheRails left19:12
→ pothibo joined19:12
← buck1 left19:12
→ teran joined19:12
← yacks left19:13
← dreiss left19:13
→ yacks joined19:15
← Vinnie_win left19:16
← teran left19:17
abyss42 Is thare a way in git to merge everything except one folder from a branch into master?19:17
→ Vinnie_win joined19:17
_ikke_ nope19:18
Unless you manuanlly intervene19:18
← skasturi left19:19
← mt left19:19
→ Balliad joined19:20
→ ojacobson joined19:22
← pothibo left19:23
→ Zectbumo joined19:26
← hexagoxel_ left19:26
← TCubed left19:26
← Sleepy63 left19:27
→ OffTheRails joined19:27
→ donmichelangelo joined19:27
→ CoreIT84 joined19:27
Guest12126 → adam1219:28
← Goplat left19:28
→ drjeats joined19:28
← Corey84 left19:31
→ hexagoxel_ joined19:31
← flugo left19:32
→ gooly joined19:33
→ cbr_ joined19:34
← mizu_no_oto left19:34
→ Sleepy63 joined19:35
← gooly left19:35
→ thumpba joined19:36
← noxd left19:37
→ flugo joined19:38
CoreIT84 → Corey8419:38
← BSaboia left19:38
→ mt joined19:39
← OleVik left19:39
← _thumpba left19:40
→ lidaaa joined19:41
→ skasturi joined19:42
→ jftf joined19:44
← jsjc left19:45
→ [diablo] joined19:47
→ ffs82defxp joined19:47
ffs82defxp i accidently committed and pushed a file with sensitive info to a public repo on github19:48
i immediately rm'ed it and recomitted, but now the change is still in the history19:48
what do i do?19:48
ojacobson Github has a page about it19:48
cbreak ffs82defxp: change your history to remove it19:49
ojacobson but if it's keys/passwords/etc, the real answer is "burn them and reissue them"19:49
cbreak ffs82defxp: and change reality so it's no longer sensitive19:49
ojacobson even purging them from history won't drop them from github immediately19:49
← jftf left19:49
ojacobson (or possibly ever, depending on gc schedules -- which are entirely out of your control -- and how their caching and search engine works -- ditto)19:49
ffs82defxp true, i guess changing a password would be a lot simpler than rewriting commit history19:49
cbreak ffs82defxp: it's like an ice cream that has dropped on the floor. Sure, you can probably get away eating it still. But do you really want to?19:50
→ sinkensabe joined19:50
ffs82defxp indeed19:50
Ornacia waves19:53
→ TCubed joined19:53
→ zivester joined19:56
← zivester left19:56
← maroloccio left19:56
← cbr_ left19:56
← thiago left19:57
← jceb left19:57
← St_Marx left19:57
→ thiago joined19:57
→ tgkokk joined19:58
→ cagedwisdom joined19:59
→ niaglo_ joined19:59
← niaglo_ left19:59
→ nour_ joined19:59
← Sceorem left19:59
← mmitchel_ left20:00
← eburcat left20:00
→ mmitchel_ joined20:00
← nour left20:03
→ mfmfmfmfmfmf joined20:03
→ crobays joined20:03
→ crobays_ joined20:03
← semente left20:04
← mmitchel_ left20:05
← sinkensabe left20:05
← mikecmpbll left20:05
→ cbr_ joined20:07
→ nour__ joined20:08
→ Goplat joined20:08
→ ag4ve_ joined20:09
→ Sasazuka joined20:09
← logix812 left20:11
← nour_ left20:12
← cbr_ left20:13
← kukks left20:13
← Sasazuka left20:14
→ Advocation joined20:15
← chingis__ left20:16
← Jackneill left20:17
→ xMYTHICx joined20:18
→ chingis__ joined20:18
← xMYTHICx left20:19
→ kyb3r_ joined20:19
→ mizu_no_oto joined20:20
← Advocation left20:20
→ Mark_ joined20:20
← pantsman_ left20:20
← TCubed left20:20
← Mark_ left20:21
→ _1_el joined20:21
← knownasilya left20:23
← [diablo] left20:23
→ Mark_ joined20:23
← niaglo left20:23
→ St_Marx joined20:24
← Mark_ left20:24
→ nkouevda joined20:24
→ gccostabr joined20:25
→ Mark_ joined20:25
← Mark_ left20:25
→ Mark_ joined20:25
→ sinkensabe joined20:25
← Mark_ left20:25
← sinkensabe left20:26
→ sinkensabe joined20:26
→ m0ltar joined20:26
← lidaaa left20:26
→ mustafavelioglu_ joined20:29
→ lidaaa joined20:29
← zapb left20:29
→ Mark_ joined20:29
← Mark_ left20:29
→ Mark_ joined20:29
← m0ltar left20:30
→ CoreIT84 joined20:30
← mizu_no_oto left20:30
→ Techy84 joined20:32
→ hkon_ joined20:32
← gccostabr left20:33
← craigp left20:33
← _1_el left20:33
← Techy84 left20:33
← tadni`` left20:35
← CoreIT84 left20:35
← Corey84 left20:35
← hkon_ left20:37
→ teran joined20:38
→ Sceorem joined20:38
← thumpba left20:39
← ojacobson left20:39
→ zapb joined20:42
→ starkhalo joined20:42
→ Corey84 joined20:43
→ thumpba joined20:44
→ CodePulsar joined20:45
→ jftf joined20:45
← salamanderrake left20:46
→ ojacobson joined20:46
← cmmagid left20:46
← endiruna left20:47
← Corey84 left20:47
→ salamanderrake joined20:47
← AlexDenisov left20:48
← mustafavelioglu_ left20:49
→ mustafavelioglu_ joined20:49
← jftf left20:50
→ mizu_no_oto joined20:51
→ AKK9 joined20:51
← MattMaker left20:51
→ MattMaker joined20:52
← flowerhack left20:52
→ flowerha_ joined20:52
→ StefanLehmann_ joined20:53
← mustafavelioglu_ left20:54
→ niaglo joined20:54
← bluesm left20:54
← StefanLehmann left20:54
← mizu_no_oto left20:55
← sdrfnord1 left20:56
← bitkiller left20:57
← TDJACR left20:57
← punchagan left20:58
→ thibaultcha joined20:59
← vrishab left20:59
← ojacobson left21:00
→ mizu_no_oto joined21:00
→ oojacoboo joined21:01
← kaendfinger left21:01
→ bezet joined21:01
← heroux left21:01
← tarkus left21:01
→ EminenceHC joined21:01
← JohnBat26 left21:03
← mennea left21:03
→ craigp joined21:04
→ heroux joined21:04
→ hoschi_ joined21:04
→ kaendfinger joined21:04
← bezet left21:05
← nour__ left21:05
→ a_le_ joined21:06
→ intent joined21:06
← kenneth left21:06
→ punchagan joined21:07
→ nectarys joined21:07
→ cyphase joined21:07
← CodePulsar left21:07
← skorgon left21:08
→ skorgon joined21:08
← a_le left21:09
intent I am a bit confused with how to handle the workflow for my site. Basically, I have a live site and a dev site. We have a branch for live and a branch for dev. Where I begin to get confused is, there are 2 people working on the dev site. Person A is in charge of minor changes that basically get pushed live immediately, and Person B is doing more involved work. I don't want the daily pushes from Person A to contain incomplete code from21:09
Person B, and I need to make sure Person B always has the up to date code from Person A without losing his work in a merge. How do I do this?21:09
← EminenceHC left21:09
Mark_ B needs to branch and work from there21:10
he can rebase from the branch A is working on as needed21:10
assuming A is only making minor changes, the rebase should be quick and conflict free21:10
← kaendfinger left21:11
← craigp left21:11
→ khmarbaise joined21:12
→ kaendfinger joined21:12
← mugenzebra left21:13
→ sdrfnord1 joined21:14
→ _lexjm joined21:14
intent Mark_: Is there a way to check for conflicts?21:14
I have a feeling that's a basic git questoin but I dont have much experience with it to start21:14
thibaultcha intent: The !gitflow model is very interesting in this case21:14
gitinfo intent: The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references21:14
intent thibaultcha: reading that now21:16
Another newbie question - pushing from A to B is the same as pulling from B to A right?21:16
← bhldev left21:16
← hoschi_ left21:17
← Goplat left21:17
→ kenneth joined21:20
→ LeMike joined21:20
← ocbtec left21:20
← mizu_no_oto left21:20
_ikke_ pulling also involves merging, pushing not21:20
← punchagan left21:20
→ Vile joined21:21
→ mizu_no_oto joined21:22
← LeMike left21:22
→ danzilio joined21:23
← mizu_no_oto left21:24
← Sceorem left21:24
→ mizu_no_oto joined21:24
→ gfixler joined21:25
→ Goplat joined21:25
→ nedbat joined21:25
→ mustafavelioglu_ joined21:26
← mkoskar left21:26
→ dreiss joined21:26
← Vile left21:26
← JeanCarloMachado left21:26
← toothrot left21:28
← gargola left21:28
→ gargola joined21:30
→ mkoskar joined21:30
→ Sceorem joined21:31
← ericweic63amg left21:32
→ Nizumzen joined21:33
← maxorator left21:33
→ maxorator joined21:34
intent Mark_: We work on the same dev site though, I think it may be an issue21:34
→ dsdeiz joined21:35
← zanchoPansa left21:35
→ zanchoPansa joined21:36
→ irqq_ joined21:37
→ piccata joined21:37
← Malsasa left21:38
← sdouglas left21:38
← zanchoPansa left21:38
← irqq left21:38
← gargola left21:39
intent _ikke_: so what happens when i push a file that already exists in the remote repo?21:40
← aretecode left21:40
→ sohail joined21:41
→ Literphor joined21:41
→ preaction_ joined21:42
→ tang^ joined21:42
← preaction left21:43
preaction_ → preaction21:43
_ikke_ intent: You push commits, not files21:43
→ aretecode joined21:43
← sinkensabe left21:43
← aretecode left21:44
← Zectbumo left21:44
← Embassy left21:44
intent Ah okay21:44
← danzilio left21:44
→ aidalgol joined21:45
intent The one question I have about the workflows, is it looks like they each assume a local development environemnt to test21:45
→ Vile joined21:45
_ikke_ Well, git is not a deployment system21:45
intent If Person A and B as above are both doing their development on the dev server, would that just mean their changes would keep getting caught up when pushing commits?21:46
→ jftf joined21:46
← zapb left21:48
→ mdel joined21:48
_ikke_ intent: What has developing on a dev server to do with git?21:50
← jftf left21:51
← dsdeiz left21:51
← mizu_no_oto left21:52
intent Well we commit specific files from the dev server to the git repo (bitbucket in this case)21:53
Person A and person B are both working on the same set of files21:53
So if theyre simultaneously making changes, a commit by one of them would include the changes made by the other @_ikke_21:54
← ockham left21:54
comps multiple people working on a single set of files at the same time is not a good concept21:54
← mustafavelioglu_ left21:54
comps in git, svn, cvs or anywhere else21:54
_ikke_ I'm with comps21:55
← flaguy48 left21:55
comps smarter editing tools actually "lock" the files and detect foreign change + display warning21:55
_ikke_ intent: You can even without git overwrite eachothers changes21:55
qsuscs how are these web editors called, where you can see all the others’ cursors and changes in real time?21:56
→ DolphinDream joined21:56
_ikke_ etherpad / piratepad21:57
comps IOW it's fine if multiple people work in their own repositories (clones) on the same files, but make commits separately + push independently (possibly resolving conflicts)21:57
_ikke_ ?21:57
Seveas qsuscs: I don't think there's a generic name for those21:57
← Literphor left21:58
→ danzilio joined21:58
→ oriba joined21:58
intent Okay I am following21:58
qsuscs etherpad—it sounds like one brand name that is used for the whole type of product. like … i just don’t get any english example.21:59
intent So then how about making sure each person has the most up to date versions of the files21:59
Do they need to pull the files they work on as soon as they start - and what if somebody else is working on the same file as they are, and they make conflicting edits21:59
_ikke_ intent: so how about each person has their own seperate development environment21:59
intent Yes I take that as a presupposition to my question22:00
I realize two people working on the same set of fils is raught with potential issue22:00
→ moritzs joined22:00
← crankharder left22:00
qsuscs isn’t it possible to work around this at the first place?22:00
_ikke_ intent: Yes, some communication needs occur, git is not a replacement of communication22:01
qsuscs i actually saw people having a 12k main.cpp (and all the variable names in finnish, without any comments at all, but thats a whole different story)22:01
12k lines, that is22:01
thiago boy, aren't we glad Linus wrote the kernel in English, not Finnish? :-P22:02
→ garethdaine joined22:03
_ikke_ :D22:03
qsuscs his native language is swedish anyway, he just lived in finland22:03
← kaendfinger left22:03
→ rjhunter joined22:03
← rjhunter left22:04
qsuscs the files in that repo, e.g.: https://github.com/stt/pk2/blob/master/PK2LevelEditor/LevelEditor.cpp22:05
note the #includes.22:05
thiago qsuscs: technically both.22:05
→ kaendfinger joined22:05
→ punchagan joined22:07
← maxorator left22:07
→ crankharder joined22:08
→ craigp joined22:08
← danzilio left22:08
→ xMYTHICx joined22:08
→ danzilio joined22:10
→ maxorator joined22:10
→ flaguy48 joined22:10
← Sceorem left22:11
← moritzs left22:12
← mfmfmfmfmfmf left22:12
← danzilio left22:12
← craigp left22:13
← Diemuzi left22:14
← godgodgodgo left22:14
← maxorator left22:17
← niaglo left22:18
→ JosephFerano joined22:19
→ maxorator joined22:20
→ deanclkclk joined22:20
→ hkon_ joined22:21
→ sdouglas joined22:21
← sin3t_ left22:21
→ sin3t_ joined22:22
← netameta left22:22
← diegoviola left22:24
← hkon_ left22:25
← Eins_ left22:27
cmn_ → cmn22:28
← irqq_ left22:31
→ devoldmx joined22:31
→ netameta joined22:32
→ irqq joined22:32
← Balliad left22:33
→ endiruna joined22:34
← sin3t_ left22:34
→ sin3t_ joined22:35
→ ockham joined22:35
← ockham left22:35
← sdouglas left22:36
→ sdouglas joined22:36
→ devoldmx_ joined22:38
← sdouglas left22:41
← Nizumzen left22:41
← devoldmx left22:42
← garethdaine left22:43
← ivan\ left22:43
← bgerber left22:44
← sdrfnord1 left22:45
← netameta left22:45
→ hebz0rl_ joined22:47
→ jftf joined22:47
→ kevinb joined22:47
← deanclkclk left22:48
← tuocuggino left22:51
← preaction left22:51
← jftf left22:52
← watabou left22:53
→ netameta joined22:53
← xMYTHICx left22:53
→ sdouglas joined22:53
→ bgerber joined22:54
← kevinb left22:56
→ Literphor joined22:58
→ kevinb joined22:59
← oojacoboo left22:59
← lidaaa left22:59
→ coldswitch joined23:00
← devoldmx_ left23:00
→ devoldmx joined23:00
← Literphor left23:01
→ EminenceHC joined23:01
← Vile left23:01
→ sandr8 joined23:01
→ bezet joined23:01
→ stamina joined23:02
→ ferreum768 joined23:05
→ shinnya joined23:05
← KdgDev left23:06
← hexagoxel_ left23:06
← bezet left23:06
→ craigp joined23:06
← netameta left23:06
← ferreum158 left23:08
→ preaction joined23:08
← coldswitch left23:08
→ coldswitch joined23:09
← EminenceHC left23:09
intent Thanks _ikke_ comps and Mark_23:09
← intent left23:09
← tgkokk left23:10
→ netcarver joined23:10
← craigp left23:11
→ Akagi201 joined23:11
→ tgkokk joined23:12
← fstd left23:13
→ fstd joined23:13
← JosephFerano left23:15
→ deanclkclk joined23:15
← Akagi201 left23:16
→ basiclaser joined23:19
← khmarbaise left23:19
→ eskatrem joined23:21
← madewokherd left23:21
← nfk left23:22
eskatrem hey, I have on a server linked to a git repo, I deleted that file, can I get it back? (git pull is not bringing that file back)23:22
← kaendfinger left23:25
→ pushnell joined23:28
→ JeanCarloMachado joined23:30
→ ivan\ joined23:30
← JeanCarloMachado left23:31
← dreiss left23:31
→ dreiss joined23:32
eskatrem nevermind, git checkout <file> worked23:33
→ JeanCarloMachado joined23:34
← sdouglas left23:35
← reyha left23:35
← TheFuzzball left23:36
← Asiajey left23:37
→ kcj joined23:39
← hebz0rl_ left23:43
→ sinkensabe joined23:44
← King_Hual left23:44
← jontmorehouse left23:45
← FreezingCold left23:46
← dgutierrez1287 left23:46
→ fstd_ joined23:47
→ jftf joined23:48
→ ctgriffiths joined23:49
← sinkensabe left23:49
← fstd left23:51
fstd_ → fstd23:51
← shinnya left23:51
← eskatrem left23:52
← jftf left23:52
→ craigp joined23:53
← irqq left23:56
→ irqq joined23:57
→ Literphor joined23:58
→ vorcer joined23:59

Logs Search ←Prev date Next date→ Channels Documentation