IRCloggy #git 2015-03-18

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.

2015-03-18

← bb010g left00:00
← imachuchu left00:00
→ mmitchell joined00:02
← iamjarvo left00:02
→ ghostpl_ joined00:02
→ quizzi joined00:03
→ Lyqyd joined00:04
← pbrobst left00:05
← Sceorem left00:05
← chrisshattuck left00:05
← Pookz left00:05
→ mr-kyd joined00:06
← Unbeerable left00:06
→ Unbeerable joined00:06
← scientes left00:06
← leolrrj left00:06
→ leolrrj joined00:07
→ chrisshattuck joined00:07
← pm90_ left00:07
← Tuna-Fish left00:07
← kermit left00:08
← ghostpl_ left00:08
→ Tuna-Fish joined00:08
→ tgavc joined00:08
← dreiss left00:08
← ropav left00:08
← tgavc left00:09
→ dm7freek joined00:09
→ pm90_ joined00:10
→ Seikho_ joined00:10
→ Ankhers joined00:11
→ Entomo joined00:13
← stylo left00:14
← weiyang left00:14
← mmitchell left00:14
← dm7freek left00:14
→ mmitchell joined00:15
→ lsiv568 joined00:15
→ checkItOut joined00:16
→ madewokherd joined00:17
← baweaver_ left00:17
→ _Atom_ joined00:17
← gdoteof left00:17
→ thierryp joined00:17
← mmitchell left00:19
← MacWinner left00:20
→ codeman joined00:20
→ duplicatelogon joined00:20
← kevwil left00:21
← codeman left00:21
→ baweaver joined00:21
→ CheckDavid joined00:21
→ codeman joined00:21
← mostlybadfly left00:22
← Tuna-Fish left00:22
← crane left00:22
← thierryp left00:22
← edwardly left00:22
← checkit left00:23
← checkItOut left00:23
← JonasF left00:23
← DonVitoCorleone left00:23
← freestyl3r left00:24
→ JonasF joined00:24
← s8321414 left00:24
← _Atom_ left00:24
← duplicatelogon left00:25
→ DonVitoCorleone joined00:25
← yqt left00:28
→ crane joined00:28
← EvilPenguin left00:28
→ Consuela joined00:28
← baweaver left00:29
→ edwardly joined00:29
← edwardly left00:29
→ edwardly joined00:29
← NoNMaDDeN left00:29
← grigora left00:29
← in_deep_thought left00:30
→ clarkpan joined00:30
← delinquentme left00:30
← chrisshattuck left00:31
← pm90_ left00:31
→ Tuna-Fish joined00:33
← pheaver left00:33
← Alex27121 left00:34
← tuelz1 left00:34
← DonVitoCorleone left00:35
→ _orchor joined00:35
→ jaznow joined00:35
→ cdown joined00:35
→ baweaver joined00:36
→ senkin joined00:36
← alexwhitman left00:37
← jonmorehouse left00:38
→ _Atom_ joined00:38
→ endiruna joined00:38
← jaznow left00:39
→ pm90_ joined00:40
→ jonmorehouse joined00:42
← baweaver left00:42
← cdown left00:43
→ bronson joined00:44
← afuentes left00:44
→ NoNMaDDeN joined00:45
→ jottr joined00:45
← _orchor left00:46
→ steele joined00:47
← Quevin left00:48
← bronson left00:48
→ chrisshattuck joined00:49
← jottr left00:50
← kadoban left00:50
→ Quevin joined00:50
← steele left00:52
← Tuna-Fish left00:53
→ nyexpress joined00:53
→ Aldo joined00:54
→ jwhisnant joined00:54
gitinfo set mode: +v00:54
Aldo hello world00:54
gitinfo Aldo: 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.00:54
→ mizu_no_oto joined00:55
← chrisshattuck left00:55
← ErKa left00:57
Aldo !guide00:57
gitinfo [!simpleguide] The Simple Git Guide by Roger Dudler: http://rogerdudler.github.io/git-guide/00:57
→ ghostpl_ joined00:58
← hexagoxel left00:59
← fstd left01:00
→ fstd joined01:00
← bgerber left01:01
← Entomo left01:02
→ hexagoxel joined01:02
← konr left01:03
← u1106 left01:03
← ghostpl_ left01:03
→ u1106 joined01:03
→ checkItOut joined01:04
→ Tuna-Fish joined01:04
→ gdoteof joined01:04
→ JR___ joined01:05
← SegFaultAX left01:05
→ ropav joined01:06
→ AndreasL joined01:06
→ dreiss joined01:06
→ SegFaultAX joined01:06
→ _X_C_V_B_ joined01:06
← _X_C_V_B_ left01:06
→ theme2 joined01:07
← Sasazuka left01:07
→ _X_C_V_B_ joined01:07
AndreasL I'm confused by 'ours' and 'theirs' when doing a pull --rebase. Particularly, when I do git checkout --theirs somefile, am I discarding remote's somefile or the local version?01:07
→ Literphor joined01:07
ojacobson during git-rebase, --ours is the last commit added to the branch being constructed, and --theirs is the commit being copied01:07
thiago AndreasL: ours is what is in the branch before you applied the command01:08
theirs is what is getting brought in01:08
when you're merging, ours is what you had and theirs is what you're merging01:08
← clarkpan left01:08
thiago when you're rebasing, it's reversed because your changes are what's coming in01:08
AndreasL hmm01:09
Oh, right. OK, it makes sense after all01:09
I was just confused by the results when I ran checkout --ours01:09
Thanks!01:09
→ okanck_ joined01:10
→ CKyle joined01:10
← checkItOut left01:10
→ DonVitoCorleone joined01:11
← maletor left01:12
→ checkItOut joined01:12
→ Gamecubic_ joined01:12
← nyexpress left01:13
→ tmager joined01:13
← _X_C_V_B_ left01:13
→ _X_C_V_B_ joined01:13
→ kadoban joined01:13
AndreasL hmm, I'm in the middle of a rebase, and I did checkout --ours, but it turns out I should have used checkout --theirs, because I mixed up what I had initially01:14
← okanck_ left01:14
AndreasL Is there anyway I can recover from that checkout without starting the rebase all over again?01:14
→ chrisshattuck joined01:14
← Gamecubic left01:15
← thiago left01:16
→ edude03 joined01:17
← tmager left01:18
← geomyidae_ left01:18
← chrisshattuck left01:19
→ chrisshattuck joined01:19
→ devoldmx3 joined01:20
→ milesmatthias joined01:20
→ jambocomp joined01:20
← endiruna left01:21
← devoldmx left01:21
→ daito joined01:21
← _X_C_V_B_ left01:21
← absk007 left01:22
← vladgh left01:22
→ rubyonrailed joined01:22
← pm90_ left01:22
← effi left01:23
← LucasTT left01:23
dwmw2 → dwmw2_gone01:24
→ danzilio joined01:25
← milesmatthias left01:25
← cagedwisdom left01:26
→ hahuang65 joined01:26
→ bgerber joined01:27
← ncd|leeN left01:27
→ yn5 joined01:28
→ m0ltar joined01:29
→ Zentdayn joined01:29
← hahuang62 left01:29
→ otter768 joined01:30
→ EminenceHC joined01:31
→ codeman_ joined01:32
← codeman_ left01:32
← yn5 left01:33
← theme2 left01:33
← Aldo left01:33
→ theme2 joined01:33
→ Terabyte joined01:33
Terabyte hey01:33
in the github windows where it says configure git and it asks for your fullname is that "Joe Blogs" or "joeblogs" ?01:34
theme2 Joe Blogs01:34
I think01:34
← EminenceHC left01:35
← codeman left01:35
← otter768 left01:35
→ alexwhitman joined01:35
← checkItOut left01:35
→ jaznow joined01:36
Terabyte seems it doesn't matter in terms of linking, it's just the "hover" text on a commit that shows up with the full name...01:36
← oo_miguel left01:36
→ checkItOut joined01:37
← chrisshattuck left01:38
← Quevin left01:38
← kadoban left01:38
→ cagedwisdom joined01:39
← Literphor left01:39
→ Quevin joined01:39
→ Literphor joined01:40
→ porcoesphino joined01:40
→ hyperair joined01:40
← jaznow left01:40
→ smccarthy joined01:40
→ milesmatthias joined01:41
← Consuela left01:42
→ Consuela joined01:42
← bluesm left01:43
← porcoesphino left01:43
← TheNet left01:44
→ bb010g joined01:44
→ TheNet joined01:44
→ porcoesphino joined01:45
← milesmatthias left01:45
← th3fallen left01:45
→ chrisshattuck joined01:46
→ milesmatthias joined01:47
← dougsland left01:48
→ pyokagan joined01:49
← robustus left01:49
← chrisshattuck left01:51
→ Rastus_Vernon joined01:52
← ropav left01:52
→ robustus joined01:52
→ macabre joined01:52
← checkItOut left01:53
→ effi joined01:53
→ Goplat joined01:53
← mikiones left01:54
← TheNet left01:54
→ checkItOut joined01:55
→ TheNet joined01:55
← vivekananda left01:55
← Literphor left01:56
← u1106 left01:57
→ u1106 joined01:57
→ dm7freek joined01:58
← warrickFL left02:01
→ Entomo joined02:01
← devoldmx3 left02:02
← TheNet left02:02
→ TheNet joined02:02
→ ashu11 joined02:03
← dm7freek left02:04
← Zentdayn left02:04
→ DolphinDream joined02:06
← bgerber left02:06
← MarkyC left02:07
→ effi_ joined02:07
← raijin left02:07
→ sctskw joined02:08
← rubyonrailed left02:08
→ mostlybadfly joined02:09
← edude03 left02:09
← effi left02:10
← bitkiller left02:11
→ edude03 joined02:12
Briman|off → Briman02:13
← JR___ left02:14
← mingwandroid_ left02:14
← porcoesphino left02:15
← Terabyte left02:16
→ ropav joined02:16
→ bgerber joined02:17
← bollullera left02:17
← theme2 left02:18
← DrHouse|DellM650 left02:18
← CheckDavid left02:18
← CKyle left02:19
← Tuna-Fish left02:19
→ hobodave joined02:19
→ Tuna-Fish joined02:19
→ porcoesphino joined02:20
← ropav left02:21
→ ropav joined02:21
→ rubyonrailed joined02:21
← Quevin left02:22
← tieTYT2 left02:22
→ tieTYT2 joined02:22
→ michelangelo joined02:22
← tieTYT2 left02:23
→ Quevin joined02:23
→ Literphor joined02:24
← durham left02:25
→ kcj joined02:25
← m0viefreak left02:26
← donmichelangelo left02:26
→ Vampire0 joined02:27
→ agileadam joined02:28
→ AustinTheGrey joined02:29
→ bronson joined02:30
← Vampire0_ left02:30
← AndreasL left02:30
→ stylo joined02:31
→ tpollard joined02:32
← Noldorin left02:34
→ jottr joined02:34
← bronson left02:34
← edude03 left02:34
← stylo left02:35
→ stylo joined02:35
→ otter768 joined02:37
→ technivore joined02:37
← jottr left02:38
→ kadoban joined02:40
→ IIT joined02:42
→ echo-area joined02:42
→ acl_ joined02:42
→ BuenGenio joined02:42
← joelm left02:43
← whitby left02:43
→ theme2 joined02:44
← Es0teric left02:44
← pks left02:45
→ k_sze[work] joined02:46
→ pks joined02:46
← oojacoboo left02:46
→ ghostpl_ joined02:47
← Quevin left02:48
→ duderonomy joined02:48
← _Atom_ left02:48
→ CKyle joined02:48
← pngl left02:50
← IIT left02:51
technivore hi all. not sure if this is a git or openshift question but: I have a python project in a git repo and want to deploy it to openshift. I create an openshift app and it creates a git repo with some boilerplate in it. I want to make that repo an upstream for my main repo but keep the stuff in it out of my main repo’s master branch (IE make a branch that has just the openshift stuff that I can merge master into for openshift02:51
deployment). Is this possible?02:51
← TheNet left02:51
→ EvilPenguin joined02:52
technivore er, sorry, I dont want the openshift repo to be an upstream, I want it to be a remote for just this one branch. But I want my local branch to correspond to the master branch of the openshift repo.02:52
← Entomo left02:53
→ Quevin joined02:53
← ghostpl_ left02:53
← mizu_no_oto left02:53
← c_bp left02:55
→ clarkpan joined02:56
→ rchavik joined02:57
← macabre left02:58
← toothrot left02:58
→ okanck_ joined02:59
← m1dnight_ left03:00
milki technivore: you can have multiple !remotes03:02
gitinfo technivore: [!gh-remotes-help] Github has a few help articles on common operations for remotes (adding, changing URL, renaming, removing, etc): https://help.github.com/categories/18/articles03:02
→ _Atom_ joined03:02
→ Kulrak joined03:02
← Kulrak left03:02
→ Kulrak joined03:02
milki technivore: and then something like !tracking03:02
gitinfo technivore: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <bra03:02
→ duplicatelogon joined03:03
← okanck_ left03:03
→ durham joined03:03
← hobodave left03:03
→ DrShoggoth joined03:03
← bgerber left03:04
← durham left03:05
→ durham joined03:05
← DrShoggoth left03:05
→ DrShoggoth joined03:06
→ IIT joined03:06
← MMukherjee left03:07
technivore milki: thanks. so if I `git remote add openshift <openshift_repo_url>`, then how do I create a new local branch that tracks openshift/master?03:08
← quizzi left03:08
← _flow_ left03:08
← duplicatelogon left03:09
← MattHardcastle left03:10
→ _flow_ joined03:10
← rchavik left03:10
→ MMukherjee joined03:11
technivore `git branch —track my-local-branch openshift/master` ?03:11
← voiceofgrog left03:12
technivore or `git branch -u openshift/master my-local-branch` ?03:12
→ joelm joined03:13
→ quizzi joined03:13
← joelm left03:14
→ joelm_ joined03:14
← cyphase left03:16
← u1106 left03:17
→ u1106 joined03:18
→ EminenceHC joined03:20
→ rchavik joined03:21
← Consuela left03:22
→ bgerber joined03:23
→ weiyang joined03:24
← Orbitrix left03:24
← EminenceHC left03:24
→ jaznow joined03:25
← agileadam left03:25
→ ashnur joined03:25
← _Atom_ left03:26
← darkbasic left03:27
→ darkbasic joined03:27
→ pheaver joined03:28
← jaznow left03:29
→ bronson joined03:31
← cagedwisdom left03:32
→ devoldmx joined03:34
→ jottr joined03:35
← bronson left03:35
← danzilio left03:35
← eletuchy left03:36
→ jxpx777 joined03:36
← CKyle left03:39
← jottr left03:40
← devoldmx left03:40
← ashu11 left03:40
Briman → Briman|off03:41
← EvilPenguin left03:42
← Ryanar left03:43
← daito left03:43
→ TyrfingMjolnir joined03:43
→ daito joined03:43
← theme2 left03:44
← Quevin left03:45
TyrfingMjolnir How can I clone my own repo?03:45
using ssh03:45
I already tried this: git clone me@node:projectA projectA03:45
→ Quevin joined03:46
TyrfingMjolnir to make my repo I did: git init; git add .; git commit in the projectA folder of user me on node03:46
← martinbmadsen left03:47
→ dm7freek joined03:47
→ martinbmadsen joined03:47
TyrfingMjolnir Do I have to name my repo using git somehow?03:47
Currently reading here: $ man gittutorial03:48
gitinfo the gittutorial manpage is available at http://jk.gs/gittutorial.html03:48
→ Mateo_W joined03:48
← martinbmadsen left03:48
→ cagedwisdom joined03:48
← daito left03:48
→ eletuchy joined03:48
→ Zifre_ joined03:48
← jstimm left03:48
TyrfingMjolnir In /home/me/projectA there is a .git folder03:49
This is what I'm trying to do: If Bob later decides to work from a different host, he can still perform clones and pulls using the ssh protocol: bob$ git clone alice.org:/home/alice/project myrepo03:49
← porcoesphino left03:50
← Xiti left03:50
→ introom joined03:50
introom can I only checkout a certain submodule?03:50
← Quevin left03:50
→ Quevin joined03:51
→ the_hand_sanitis joined03:51
← bgerber left03:51
→ watabou joined03:51
← AustinTheGrey left03:52
← Zifre left03:52
→ martinbmadsen joined03:52
← dm7freek left03:52
→ jstimm joined03:52
→ Xiti joined03:53
→ Dragooon joined03:53
← hahuang65 left03:53
→ jayeshsolanki joined03:53
← the_hand_sanitis left03:53
TyrfingMjolnir In other words I did importing a new project from gittutorial03:54
→ the_mighty_bogan joined03:54
← jxpx777 left03:54
the_mighty_bogan hi guys, quick question: why if rebase my feature branch into master, then checkout to master, and merge master with feature branch it does not create a merge commit ?03:54
→ mrojas66 joined03:54
→ MattHardcastle joined03:54
→ mikiones joined03:54
← watabou left03:55
← ojacobson left03:55
← MattHardcastle left03:56
→ bgerber joined03:57
← Dragooon left03:57
→ c0mrad3 joined03:59
← mikiones left03:59
← Quevin left04:00
← netj left04:00
→ netj joined04:01
← joelm_ left04:03
← u1106 left04:04
← otter768 left04:04
→ u1106 joined04:04
→ Quevin joined04:05
→ steele joined04:06
→ pwnz0r joined04:06
← evie_hammond left04:07
pyokagan the_mighty_bogan: It should be a fast forward merge, so there should be no merge commit. You can always ensure it is a fast forward by passing the --ff-only flag.04:07
→ senkin_ joined04:10
← senkin left04:10
pyokagan TyrfingMjolnir: It should work, do you have any error message?04:10
mattcen Hi all. I want to do a 'git log --grep=foo' and show any commits whose messages contain foo, AS WELL AS 2 of their ancestors. Can I do this in one step?04:10
TyrfingMjolnir Not any more04:10
the_mighty_bogan pyokagan, thanks, it makes sense04:10
TyrfingMjolnir The error message was just like having a path to a non-gited folder04:10
← steele left04:11
→ JR___ joined04:12
← DrShoggoth left04:13
→ hahuang65 joined04:13
→ highcup joined04:14
→ schmodd joined04:14
← NoNMaDDeN left04:15
← rubyonrailed left04:15
← Quevin left04:15
← SjB left04:15
← smccarthy left04:16
→ Quevin joined04:16
→ subhojit777 joined04:16
← eletuchy left04:17
→ eletuchy joined04:17
→ daito joined04:20
→ cyphase joined04:21
← eletuchy left04:22
← jonmorehouse left04:22
→ Consuela joined04:25
← mrojas66 left04:26
← govg left04:27
→ jonmorehouse joined04:28
→ devoldmx joined04:28
← Quevin left04:30
→ craigp joined04:30
← mezod left04:30
← pwnz0r left04:32
← hahuang65 left04:33
→ nnyk joined04:33
← nnyk left04:33
→ nnyk joined04:33
← brandonw left04:33
→ hahuang65 joined04:33
→ TF42VD joined04:34
← lsiv568 left04:34
← madewokherd left04:34
→ iliketurtles joined04:35
← bgerber left04:36
→ ghostpl_ joined04:37
← leolrrj left04:39
Celelibi How do I see which tags I pushed?04:40
← hahuang65 left04:40
← highcup left04:40
→ scientes joined04:40
← scientes left04:40
→ scientes joined04:40
→ Quevin joined04:41
→ hahuang65 joined04:41
→ nnyk_ joined04:41
→ PaddyPatPat joined04:41
← phoenixz left04:42
← nnyk left04:42
← PaddyPatPat left04:43
← m0ltar left04:44
→ kyb3r_ joined04:44
← ghostpl_ left04:44
kadoban Celelibi: You mean just now? Or ever? Because the first, I think it tells you explicitly. The second is probably impossible, unless you just mean "how do I see which tags exist on a specified remote"04:45
Celelibi Yeah, the latter.04:45
← JR___ left04:45
kadoban Celelibi: 'git ls-remote --tags the_remote' I believe04:45
← sctskw left04:46
Celelibi Thanks.04:47
→ okanck_ joined04:48
→ ossifrage joined04:51
→ nardev joined04:52
← okanck_ left04:52
← lindenle left04:53
→ irqq joined04:53
← scientes left04:54
← jonmorehouse left04:54
→ beautifulmind joined04:54
ossifrage I'm trying to figure out how to undo the side effects of a screwed up 'git push --set-upstream origin branch'04:54
← gdoteof left04:55
ossifrage I somehow how managed to loose the local branch in the origin server04:55
← Quevin left04:55
→ steele joined04:56
← kappy left04:56
← hahuang65 left04:56
kadoban ossifrage: What does that mean?04:56
→ Quevin joined04:56
→ hahuang65 joined04:56
← Ankhers left04:57
→ jottr joined04:57
ossifrage I created a local branch, made a ton of changes and then managed to push that branch to bitbucket as if all the changes where on the master04:57
← Consuela left04:58
→ n-st joined04:58
ossifrage All the commits are on bitbucket but the changes aren't on the branch04:59
→ Myk267 joined04:59
→ highcup joined05:00
kadoban ossifrage: What exactly did you run? I suspect the above command wasn't it if it had the behavior described.05:00
→ nnyk joined05:00
ossifrage I've been going over my command history trying to figure out what I did wrong.05:00
bitbucket says there are no commits on the branch05:01
← hahuang65 left05:01
→ hahuang65 joined05:01
→ bronson joined05:01
← jottr left05:02
← nnyk_ left05:02
ossifrage I guess the lazy thing to do is to just stick a tag on the initial branch point and call it a day05:04
← kyb3r_ left05:06
← dreiss left05:06
ossifrage Is there a way to move a sequence of commits onto a branch retroactively?05:06
← Gamecubic_ left05:06
← bronson left05:07
→ brandonw joined05:07
← epifanio left05:08
← linuxmint left05:08
← TF42VD left05:08
← beautifulmind left05:08
← hahuang65 left05:08
→ hahuang65 joined05:09
← phantombeta left05:10
ossifrage Okay this might be some sort of visualization issue on bitbucket and not something I did wrong with my commit05:11
← u1106 left05:11
→ u1106 joined05:12
→ adambrenecki joined05:12
→ ManikM joined05:12
→ phantombeta joined05:12
→ jaznow joined05:13
← echo-area left05:14
→ kappy joined05:16
→ Polyatomic joined05:16
← jaznow left05:18
→ Consuela joined05:18
→ bgerber joined05:19
→ epifanio joined05:19
→ blubberbop joined05:19
← babilen left05:20
← milesmatthias left05:21
→ Rephiax__ joined05:21
← hahuang61 left05:22
→ hahuang61 joined05:22
← hahuang65 left05:23
→ milesmatthias joined05:24
← Rephiax left05:24
← u1106 left05:24
→ wachpwnski joined05:24
→ u1106 joined05:24
wachpwnski git diff --stat origin/master..origin/master@{1.year.ago} what am I messing up in this command?05:25
← blubberbop left05:25
wachpwnski I am trying to get the diff between the origin/master current and origin mater 1 year ago or even 2015-01-0105:25
kadoban wachpwnski: Try quotes, depending on your shell it can mess that up05:25
← surfdue left05:26
← hvxgr left05:26
← Consuela left05:26
wachpwnski kadoban: what parts should I quote ?05:26
kadoban I dunno, everything?05:26
← Quevin left05:27
→ Consuela joined05:27
→ porcoesphino joined05:27
← milesmatthias left05:28
→ Quevin joined05:28
→ Tommy[D]_ joined05:28
wachpwnski kadoban: it looks like the origin/master was messing it up05:29
← Rephiax__ left05:29
← Tommy[D] left05:32
← Quevin left05:32
kadoban Just out of curiosity you mean it was messing up your shell, or the reflog doesn't store remote tracking branch reflogs? (I'm not really sure if it does, but I thought it did)05:33
→ Quevin joined05:33
→ devoldmx3 joined05:33
← porcoesphino left05:34
← cyphase left05:35
← Nikhil_D left05:35
→ beautifulmind joined05:35
← bpugh-away left05:36
→ dm7freek joined05:36
→ Nikhil_D joined05:36
→ bynarie joined05:36
→ scientes joined05:36
← scientes left05:36
→ scientes joined05:36
bynarie anyway to pull a specific directory/file from a repo instead of the entire repo?05:37
← devoldmx left05:37
→ The_Phoenix joined05:37
→ surfdue joined05:38
← KeiKun left05:39
Lady_Aleena Hello again. I just started a shiny new repository. Now I would like to add some files to it from my computer. I chose to authenticate with ssh. The create a repository page on GitHub (https://help.github.com/articles/create-a-repo/) doesn't go into how to copy files into my repository. Any reading suggestions or help would be appreciated.05:39
ossifrage Hmm, I see all the commits to my local branch .git/logs/refs/heads but the branch with the same name on the remote points to a different place05:39
kadoban bynarie: Not in a way that's going to save you a download, if that's the goal. The best you can do is a shallow clone05:39
bynarie basically im trying to pull 1 directory out of an entire repo05:40
→ ghostpl_ joined05:41
← dm7freek left05:41
kadoban bynarie: If you actually mean transfer it to another repo, preserving history, you can do that, kinda. But I suspect that's not your goal?05:41
bynarie im not sure what a shallow clone is, maybe using --depth05:41
kadoban Yes05:41
bynarie just downloading it to local machine05:41
← gopar left05:41
← irqq left05:41
gitinfo set mode: +v05:42
kadoban Yeah, a shallow clone is the best you can probably do then, unless there is a UI outside of git to download stuff. Like on github you can just download an archive instead, but I suspect the download size is the same. I don't know of one that will let you download parts only.05:42
bynarie eh thats alright its not a huge deal05:43
thanks =]05:43
kadoban Lady_Aleena: Well, you can use just normal git commands to do it. http://www.git-scm.com/book/en/v2 is a decent (free, online) book I believe05:43
Lady_Aleena: That's just general git info though, I don't know any resources in particular about doing exactly what you want, there may be a quickstart somewhere.05:43
← polyzen left05:44
← iliketurtles left05:45
← ghostpl_ left05:45
→ dreiss joined05:46
← Quevin left05:47
→ Quevin joined05:49
→ cyphase joined05:50
→ kerrick__ joined05:51
→ ehmatthes joined05:51
← Lyqyd left05:52
← zivester left05:53
→ lindenle joined05:53
→ Ankhers joined05:53
→ mikiones joined05:54
→ porcoesphino joined05:56
→ hvxgr joined05:56
← porcoesphino left05:57
← creppe left05:57
→ porcoesphino joined05:57
← lindenle left05:58
← the_mighty_bogan left05:58
→ a-l-e joined05:59
← mikiones left05:59
→ macabre joined05:59
→ EminenceHC joined05:59
← wethu left06:00
iveqy ossifrage: have you push/fetch from the remote?06:00
→ creppe joined06:00
ossifrage iveqy, all the code is on the remote, what I manged to loose the record keeping of the branch06:00
← nnyk left06:01
← Ankhers left06:01
← devoldmx3 left06:01
ossifrage so it was as if I did all the commits on the master06:01
iveqy ossifrage: have you runned git fetch?06:01
ossifrage yup06:02
← seg left06:02
→ DrHouse|DellM650 joined06:02
iveqy ossifrage: I don't follow. You've a local repository and you've a remote repository. And you have commits on the remote repository that you don't have on your local repository. Correct?06:02
ossifrage I created a local branch, checked it out made about 60 commits and then I pushed the changes to the remote06:03
← macabre left06:03
← tyreld left06:03
← craigp left06:03
iveqy ossifrage: okay, so what's the problem?06:04
← EminenceHC left06:04
← bgerber left06:04
← shayolden left06:04
→ arup_r joined06:05
→ otter768 joined06:05
ossifrage iveqy, the branch is empty on the remote and all the changes are on the master06:05
iveqy ossifrage: when you issued git push, what exactly did you wrote?06:05
→ drzel joined06:06
→ arup_r_ joined06:06
ossifrage The initial push failed so I did a 'git push --set-upstream origin branchname06:06
← JanC left06:07
ossifrage I've done this a few times in the past and I never had any problems, now clue what I did wrong.06:08
iveqy ossifrage: looks like that "branchname" might have been master...06:08
→ zoso joined06:08
← ruukasu left06:08
← arup_r_ left06:08
ossifrage The exact command was: 'git push --set-upstream origin sdk_8.0.0'06:08
← otter768 left06:09
← arup_r left06:09
iveqy ossifrage: and instead of pushing to sdk_8.0.0, master was updated instead of sdk_8.0.0?06:10
→ seg joined06:10
← seg left06:10
→ seg joined06:10
adambrenecki ossifrage: what do you get when you type 'git branch -vv'?06:10
ossifrage adambrenecki, that shows both master and sdk_8.0.0 and origin/sdk_8.0.006:11
← vixterra left06:12
→ bgerber joined06:12
→ arup_r joined06:12
→ thierryp joined06:12
← souther left06:13
← bynarie left06:13
adambrenecki ossifrage: it should show which branch is tracking which, like this: '* master b8f36d1 [origin/master: ahead 3]'06:13
→ jaznow joined06:14
ossifrage adambrenecki, at this point I think all the damage is done06:14
Nothing was lost so it is no big deal, but I'm normally pretty anal about proper branching and merging of major changes06:15
← Quevin left06:16
→ Quevin joined06:17
ossifrage I'm a bit of a git newbie and most of my git usage has been fairly simple linear development06:17
← durham left06:18
← HoMM left06:18
→ Rephiax joined06:19
→ HoMM joined06:19
Lady_Aleena Do I have to keep a local repository to upload files to my GitHub repository with git?06:19
← jaznow left06:19
← IIT left06:19
→ souther joined06:20
mattcen Lady_Aleena: Not necessarily, but that's more of a question for #github. You can use the github web UI to create files without having a local repo06:20
Lady_Aleena mattcen, that is a lot of files to copy and paste.06:21
kadoban Lady_Aleena: The usual way to go is certainly to have a local repo.06:21
→ PCatinean joined06:21
mattcen Lady_Aleena: then clone a local copy of the repo06:21
→ JanC joined06:21
← scientes left06:22
← michael_mbp left06:22
→ kanuku joined06:22
Lady_Aleena So I have to keep two copies of this one directory basically, one where I work and one to use just once to make a repository.06:23
→ clarkpan_ joined06:23
kadoban Lady_Aleena: A git repository usually contains a working directory as well, so no, they're one-in-the-same in the usual way of working.06:23
→ ruukasu joined06:24
← ruukasu left06:24
→ ruukasu joined06:24
← sin3t left06:24
→ michael_mbp joined06:24
→ milesmatthias joined06:25
Lady_Aleena I will go over to #github to see if there is a way to make an online repository without having a local one after I get some sleep. Thanks.06:25
kadoban one and the same*, gah06:25
Lady_Aleena: Half of the fun of git is that the repositories are trivial to create and cheap to have around, but okay.06:26
→ Jetchisel joined06:26
← clarkpan left06:27
← clarkpan_ left06:28
← dreiss left06:28
Lady_Aleena Night.06:28
← Lady_Aleena left06:28
← milesmatthias left06:29
→ MechtiIde joined06:29
→ mtakkman joined06:29
→ IIT joined06:33
← mikecmpbll left06:34
→ okanck_ joined06:36
← pingupingu left06:36
← MLM left06:37
→ tomog9991 joined06:38
→ TomyLobo joined06:38
← jstimm left06:38
→ scientes joined06:38
→ Junior joined06:39
Junior yello ;)06:39
→ leeN joined06:40
← tomog999 left06:40
← pheaver left06:41
← scientes left06:41
← okanck_ left06:41
→ nnyk joined06:42
← jayeshsolanki left06:43
→ Raging_Hog joined06:43
← bgerber left06:43
← Mateo_W left06:45
→ ThomasLocke joined06:46
→ jottr joined06:46
→ Silmarilion joined06:46
← zapb_ left06:49
← n-st left06:49
→ bronson joined06:50
← jottr left06:50
← beautifulmind left06:51
← kanuku left06:54
→ ronskisika joined06:54
← bronson left06:55
→ zapb_ joined06:55
← c0mrad3 left06:55
← Raging_Hog left06:56
→ Ankhers joined06:58
→ twoface88 joined06:58
← highcup left06:58
← dling left07:00
→ Macaveli joined07:00
→ freimatz joined07:00
← MechtiIde left07:01
→ ciampix joined07:01
← Ankhers left07:02
→ Trozz joined07:04
← troyt left07:05
← TomyLobo left07:07
→ c_bp_ joined07:08
← c_bp_ left07:08
→ c_bp joined07:08
→ bgerber joined07:08
← twoface88 left07:10
→ KevinTS joined07:10
← CEnnis91 left07:10
← mtakkman left07:11
→ mtakkman joined07:11
← ManikM left07:11
→ Manny joined07:11
→ dling joined07:12
← nnyk left07:12
→ ghostpl_ joined07:12
← BuenGenio left07:12
→ absk007 joined07:13
← a-l-e left07:13
→ Gavrisimo joined07:13
→ Vadimus joined07:14
← bvi left07:14
→ roelmonnens joined07:14
← ehmatthes left07:15
→ jiku joined07:15
→ doev joined07:16
→ acolson joined07:16
→ craigp joined07:17
→ wicope joined07:17
← Gavrisimo left07:18
→ huck5 joined07:19
← Goplat left07:19
huck5 Hey there. I have a question. I've got an up-to-date/completed branch I'm working on. It doesn't want to rebase with the master without causing trouble. I want to remove git-association from the folder, zip the folder, and ensure that the correct branch's contents are in the zip.07:20
One way to do this, that I can think of, would be to clone the local-branch to a new git repository.07:20
I attempted to, when in the correct branch ('boostrap'), delete the .git folder. Of course this just reverted back to the local-master branch.07:20
→ jstimm joined07:21
← acl_ left07:21
huck5 I am running git from console.07:22
kadoban huck5: Uhm, if you've deleted the .git, it didn't do anything repo related, like switching branches or reverting anything. Why are you doing this? This seems like a /really/ bad idea. What's the actuall rebase goal, and what's going wrong when you try?07:22
huck5 Just a moment please. And thank you for the response.07:23
→ bvi joined07:23
huck5 I had copied the entire folder before attempting this.07:23
So I still have a working git project :)07:23
→ mariuscc joined07:24
huck5 The errors are merge-conflicts.07:24
kadoban huck5: Sure, that's a good backup step. Okay cool, so what's wrong with that though? merge conflicts aren't something to be too scared of. !eek has some advice07:24
gitinfo huck5: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II07:24
← lrvick left07:25
→ dm7freek joined07:25
← zadock left07:25
huck5 That does shed some light on those merge conflicts :)07:25
There are quite a few files to go through. Is it possible to create a new repository from a local branch?07:26
This is not something I would do regularly. I just want to create a folder, with no git association, so that I ensure the person receiving the project uses the correct files.07:26
← doev left07:27
kadoban huck5: 'git archive' maybe sounds like what you want?07:27
→ sinkensabe joined07:27
→ dhjondoh joined07:27
→ AmR|EiSa joined07:27
→ jrahmy joined07:27
huck5 Something like this? $ git archive --format zip --output /full/path/to/zipfile.zip master ?07:29
→ Gizburdt joined07:29
→ jakke joined07:29
kadoban huck5: Looks like it could be correct07:29
huck5 Fantastic. Thanks for your assistance! I'm becoming more familiar with git; but those merge conflicts still scare me a little. I didn't realize what the <<<HEAD, etc, lines meant. Thanks for shedding some light!07:30
→ jaznow joined07:30
← dm7freek left07:30
kadoban huck5: Glad I could help, yeah merge conflicts are pretty scary at first I must say, but git becomes /way/ more fun once you can deal with them.07:30
→ milesmatthias joined07:30
← kerrick__ left07:31
← TyrfingMjolnir left07:31
← pacon2 left07:31
→ devoldmx joined07:33
huck5 Another thing (maybe) worth noting: Compressing the file via Git resulted in a _way_ smaller file than the "right+click > Compress" method07:34
← jaznow left07:35
← milesmatthias left07:35
→ troyt joined07:35
kadoban Hmm really? Odd, but cool07:36
→ jagob joined07:36
← ahr3n left07:36
huck5 A little startling at first. But extracting and running the application yielded the expected results.07:37
← jophish left07:37
← huck5 left07:37
← neunon left07:37
→ jceb joined07:37
→ hs366 joined07:38
→ Xethron joined07:38
← boombatower left07:38
→ neunon joined07:38
← devoldmx left07:39
→ pacon2 joined07:40
→ m1dnight_ joined07:40
→ wrouesnel1 joined07:42
← tuor left07:42
→ saidelike joined07:42
→ lindenle joined07:43
→ jophish joined07:43
← ome left07:43
← gsingh93 left07:43
→ aidalgol joined07:43
← Quevin left07:44
← einmalfel left07:44
← m1dnight_ left07:46
← lindenle left07:47
→ EminenceHC joined07:48
← jrahmy left07:49
← jazzzu left07:49
→ tuor joined07:51
← bgerber left07:51
→ petersr joined07:51
← EminenceHC left07:52
← wrouesnel1 left07:53
→ devoldmx joined07:53
→ skylite joined07:53
→ TomyWork joined07:53
→ sin3t joined07:54
b00^wk hey, is there away to throw away a part of the log ?07:56
→ nnyk joined07:56
→ Quevin joined07:57
← DrHouse|DellM650 left07:57
← schmodd left07:57
b00^wk if its a chunk test commits & pushes, that pollute the log07:57
← daito left07:57
→ daito joined07:57
← skylite left07:58
_ikke_ !fixup07:58
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!07:58
→ hebz0rl joined08:01
← daito left08:02
← devoldmx left08:02
→ awkwardusername joined08:03
← awkwardusername left08:03
→ otter768 joined08:06
← diegoviola left08:07
→ lb1a joined08:07
→ harish_ joined08:08
b00^wk !rewrite08:09
gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum08:09
→ ashu11 joined08:10
← otter768 left08:10
b00^wk hmm, i don't mind rewrite, because im the only one using that history at the moment08:10
→ codefo joined08:13
→ vivekananda joined08:14
← craigp left08:14
→ bronson joined08:14
→ okanck_ joined08:15
→ daito joined08:16
→ jottr joined08:17
← codefo left08:18
← bronson left08:19
→ m0nkmaster joined08:19
→ Kugelfisch1 joined08:19
← m0nkmaster left08:19
← Macaveli left08:20
→ m1dnight_ joined08:21
→ thiago joined08:21
← jottr left08:21
→ Akagi201 joined08:23
→ PeterBooker joined08:24
← Quevin left08:24
← teran left08:24
→ m0nkmaster joined08:24
→ mlechner joined08:25
→ jayeshsolanki joined08:25
→ stylo_ joined08:25
→ seschwar joined08:25
← m1dnight_ left08:26
→ Quevin joined08:26
→ ki0 joined08:27
→ Takle joined08:27
← ki0 left08:27
→ Cust0sL1men joined08:27
→ ki0_ joined08:28
← Manny left08:28
← chiemseesurfer left08:28
Trozz → zzTrozz08:28
zzTrozz → Trozz08:28
← stylo left08:29
→ chiemseesurfer joined08:29
→ danjordan joined08:29
→ Balliad joined08:30
→ jaznow joined08:32
← dewdrop left08:32
→ craigp joined08:33
← petersr left08:34
→ irqq joined08:34
← seschwar left08:34
← Kugelfisch1 left08:35
← arup_r left08:37
→ acetakwas joined08:37
← pacon2 left08:38
→ babilen joined08:38
← babilen left08:38
→ babilen joined08:38
← thiago left08:38
→ pacon2 joined08:38
← kadoban left08:39
→ thiago joined08:40
← scarcry left08:40
→ dvaske joined08:41
→ scarcry_ joined08:41
← chiemseesurfer left08:41
← weiyang left08:41
→ chiemseesurfer_ joined08:41
→ codefo joined08:42
→ jrahmy joined08:43
← scarcry_ left08:44
→ scarcry joined08:44
→ leolrrj joined08:45
← leolrrj left08:45
→ dewdrop joined08:47
← pacon2 left08:47
→ pacon2 joined08:48
→ seschwar joined08:48
← porcoesphino left08:48
← ghostpl_ left08:49
← Rephiax left08:50
→ settermjd joined08:50
← Literphor left08:50
← codefo left08:50
→ vurma joined08:53
→ Macaveli joined08:53
→ ropav_ joined08:53
→ ome joined08:54
→ intellix joined08:54
← sin3t left08:55
→ Mega joined08:55
← Mega left08:55
→ Mega joined08:55
← craigp left08:58
← Steve_Jobs left08:58
→ BlaXpirit joined08:58
← ropav_ left08:59
→ NoOova joined08:59
NoOova Hello!08:59
How to pull changes to anoother branch?08:59
tobiasvl NoOova: what do you mean? please explain in a bit more detail09:00
jast pulling normally only works on the checked out branch09:00
Seveas git checkout otherbranch ; git merge whatever-other-branch09:00
← martinbmadsen left09:00
← ronskisika left09:00
→ ronskisika joined09:00
→ xxcooljesusxx joined09:00
jast there's a way around that for branches that can be fast-forwarded (no new commits on your end), but it's not very intuitive09:01
NoOova My problem is that i could not undestand man of git pull09:01
https://www.kernel.org/pub/software/scm/git/docs/git-pull.html09:01
<refspec> section09:01
what is purposes of <dst>09:01
jast no matter what you put for refspec, it'll still use the branch that is checked out as the target09:01
with pull there's virtually no reason you're actually going to need to give a <dst> part09:01
NoOova so <dst> is not a local branch, that will merget?09:01
→ pantsman- joined09:01
jast no09:01
NoOova What is? =)09:02
jast well, pull is a two-step operation: fetch (grab new commits from the remote repository) and merge (combine those new commits with what you have in your local branch)09:02
NoOova Yep09:02
jast the refspec affects only the first step09:02
NoOova so, refspec is only for fetch09:02
jast it tells fetch which branch to fetch (src) and where to store the new state of that branch (dst)09:03
normally that's something like refs/remotes/origin/foo and git will figure it out automatically for you09:03
NoOova Hm, so i couuld fetch branch feature/OriginalBranch as origin/feature/RenamedOriginal ?09:03
jast the second step will take whatever you fetched (regardless of any <dst> part you may have specified) and merge it into the checked out branch09:04
→ craigp joined09:04
← sparetire_ left09:04
jast yes, but that's also what git does by default09:04
tobiasvl NoOova: not only could you do that, that is the default of fetch09:04
NoOova so, now i will read man of git-fetch.09:04
jast oh, wait, I missed the "Renamed" bit :)09:04
tobiasvl oh. me too09:04
NoOova Thank you guys!09:04
jast well yes, you could, but usually there's no point09:04
okay, feel free to check back if there's anything that doesn't make sense09:05
b00^wk what is a good small /easy to configure bug & issue tracker server that integrates well with git, gitolite sever?09:06
Kartagis b00^wk: locally?09:06
b00^wk yes09:06
→ mezod joined09:06
← jceb left09:07
→ King_Hual joined09:09
← pyokagan left09:09
→ m1dnight_ joined09:09
← dling left09:10
→ veganista joined09:10
→ psoo joined09:10
→ basiclaser joined09:11
← mezod left09:11
← psoo left09:11
→ marcogmonteiro joined09:12
→ mikiones joined09:12
→ Steve_Jobs joined09:13
canton7 b00^wk, !host_gui09:14
gitinfo b00^wk: There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !gitorious !rhode_code and !gerrit !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools09:14
→ dm7freek joined09:14
canton7 .trigger_edit host_gui There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !gitorious !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools09:14
gitinfo canton7: Okay.09:14
b00^wk canton7, thanks09:14
→ thevishy joined09:15
→ fooforge joined09:16
iveqy b00^wk: ticgit, trac,09:16
→ psoo joined09:16
b00^wk iveqy, ok09:16
jast !gogs09:17
gitinfo Gogs is a self-hosted platform similar to !gitlab, written in Go09:17
jast how about a link...09:17
← dm7freek left09:17
→ dm7freek joined09:18
jast .trigger_edit gogs Gogs is a self-hosted platform similar to !gitlab, written in Go, aiming to be easier to deploy. http://gogs.io/09:18
gitinfo jast: Okay.09:18
→ milesmatthias joined09:19
→ teran joined09:20
← acetakwas left09:21
→ tanuck joined09:22
iveqy I'm kind of sad that ticgit seems dead. I really would love to have distributed tickets, something like fossil have09:22
← Jetchisel left09:22
→ pedda joined09:22
→ ghostpl_ joined09:23
← dm7freek left09:23
← milesmatthias left09:24
→ jceb joined09:26
← Quevin left09:28
← pacon2 left09:28
← psoo left09:29
→ psoo joined09:29
→ pacon2 joined09:29
← BlaXpirit left09:31
← settermjd left09:31
← pantsman- left09:31
→ BlaXpirit joined09:31
→ creep joined09:31
→ settermjd joined09:31
← effi_ left09:31
→ effi joined09:32
← ashu11 left09:33
→ TyrfingMjolnir joined09:35
← dhjondoh left09:36
→ dhjondoh joined09:37
→ EminenceHC joined09:37
jakke need some inspiration here09:38
I have 2 git projects a "shared" project and a "development project09:38
→ Terabyte joined09:38
jakke the development projects extends 1 file of the shared project (python buildout, if relevant)09:38
in svn we could just do extends = http://path/through/redmine/svn/location/shared_file.cfg09:39
→ jolg42 joined09:39
jakke but in git that approach doesn't seem to work09:39
→ s8321414 joined09:39
← IIT left09:40
jakke anyone who's done this before? authentication should not be a problem09:40
bremner iveqy: aren't there several alternatives? this is old, but maybe some are still alive. http://www.cs.unb.ca/~bremner/blog/posts/git-issue-trackers/09:40
jakke yes, I could clone the shared project, but that kind of defeats the purpose09:40
← EminenceHC left09:41
→ KevinSjoberg joined09:41
→ devoldmx joined09:42
iveqy bremner: thanks, mostly defunct software there, but a few interesting things09:43
→ BuenGenio joined09:43
← fooforge left09:43
← Balliad left09:44
→ rishiraj joined09:44
→ gaoli joined09:44
→ Quevin joined09:44
← viscera left09:45
← harish_ left09:46
→ Balliad joined09:46
← m0nkmaster left09:46
← wald0 left09:47
→ hardenedapple joined09:48
→ _eddy joined09:48
_eddy hi guys so i deleted some files in my local repo09:48
ran git add .09:48
and got this warning http://kopy.io/Jgkx909:48
← ciampix left09:49
← Quevin left09:49
tobiasvl seems pretty self-explanatory but feel free to ask follow up questions09:49
→ Quevin joined09:50
_eddy does that mean git add . did add the changes to be push?09:50
if i ran git add --all will that removal those files i deleted?09:51
→ porcoesphino joined09:52
← AmR|EiSa left09:52
→ Hounddog joined09:53
← fairuz left09:53
← ashnur left09:54
← gaoli left09:54
→ CheckDavid joined09:55
← vivekananda left09:56
→ jazzzu joined09:56
→ m0nkmaster joined09:57
→ Rephiax joined09:57
← mr-kyd left09:57
← jrahmy left09:58
→ taruner joined09:59
← pacon2 left09:59
← Macaveli left09:59
→ pacon2 joined10:00
← Mega left10:00
← rishiraj left10:00
← m0nkmaster left10:00
← devoldmx left10:02
_ikke_ yes10:02
→ m0nkmaster joined10:03
→ bronson joined10:03
← m0nkmaster left10:04
→ Adib joined10:05
→ jottr joined10:05
← Yatekii left10:05
← aidalgol left10:06
→ Yatekii joined10:06
_eddy _ikke_: thanks10:06
→ otter768 joined10:06
← bronson left10:08
← Gitzilla left10:08
← Quevin left10:08
→ inamoriti joined10:09
← hyperair left10:09
← mlechner left10:09
→ Quevin joined10:09
← jceb left10:10
← jottr left10:10
→ kanuku joined10:11
← otter768 left10:11
_eddy does git commit -am "" still work so you can skip having to type git add .? i am reading this article that dates back to 2011?10:12
osse _eddy: git commit -a and git add . have always done separate things10:12
git add -a does git add -u10:12
← Takle left10:15
osse shit10:15
git commit -a does git add -u10:16
← Gizburdt left10:17
→ gaoli joined10:17
→ Takle joined10:19
→ Gizburdt joined10:22
→ encod3 joined10:22
→ jadne joined10:22
← mostlybadfly left10:22
← daito left10:24
→ bonswouar joined10:24
← Seikho_ left10:24
→ daito joined10:25
→ jargon joined10:25
→ ashnur joined10:25
→ nfk joined10:25
← porcoesphino left10:26
→ stamina joined10:27
→ beautifulmind joined10:28
→ cdown joined10:28
→ sbeex joined10:29
← daito left10:29
→ Grimlock1 joined10:30
← metastableb left10:31
← Tuna-Fish left10:31
← senkin_ left10:31
← sbeex left10:32
← Quevin left10:32
→ t4nk800 joined10:32
→ SiliconDon joined10:33
→ Adaulfo joined10:33
→ Quevin joined10:33
← t4nk800 left10:33
→ ogelami joined10:34
ogelami I have a question regarding "how its usually done", when i want to create a module for one of my repositories but i don't want it to end up in master branch, and module in my case is my debugging toolset which is written for my "main" code in master which i feel would be overkill to place in its own repository but i want to be able to have revision control over it, and it seems like the way of creating branches is to clone the main repo10:34
→ ashu11 joined10:34
← cdown left10:34
→ cdown joined10:35
← Vadimus left10:35
← paulweb515 left10:36
← Quevin left10:37
→ cllamas joined10:38
← Adaulfo left10:38
← nardev left10:38
→ doev joined10:38
tobiasvl why don't you want the debugging toolset to be on the master branch?10:38
just put it in a separate dir?10:38
→ twoface88 joined10:39
tobiasvl I think you should follow the package guidelines of the language you're using10:39
not do it with git10:39
← BuenGenio left10:39
← jstimm left10:39
→ harish_ joined10:39
tobiasvl ogelami: also I don't understand that last part. "the way of creating branches is to clone the main repo"?10:40
→ lpax joined10:40
→ Raging_Hog joined10:41
→ porcoesphino joined10:41
← ronskisika left10:41
→ Quevin joined10:42
ogelami the language is php, putting it in the master branch will then make it possible for users to execute the testfiles if i just deploy the latest rev, then i have to either delete the test files, or export everthing except the test files10:42
→ Tuna-Fish joined10:42
tobiasvl ok, not familiar with php, but every other language I use pack testsuites together with the source files10:43
but if it shouldn't be possible for users to execute the test files, why are they there? and can't you just unset +x ?10:44
ogelami oh, well so basically what i want to do is have them separately10:44
→ martinbmadsen joined10:44
iveqy ogelami: it won't you should not deploy your git repo as it is, and if you do you should set up your webserver to deny access to your test directory for example10:45
← thevishy left10:45
ogelami why is it bad to deploy the repo as it is?10:45
when all there is is the files that should be on the webserver10:45
iveqy ogelami: because you end up with these problems you've right now10:45
ogelami: and it will continue, suddently you find out that you want to minify your javascript files for example10:46
ogelami well i wont check in the minified js to the repo ofc10:47
all the things that need to be compiled happen after the export / update10:47
→ Adaulfo joined10:47
iveqy ogelami: exactly, but you want to serve the minified files to the user, but not the not-minified files, and that's yet another reason why you shouldn't deploy your worktree as is.10:47
ogelami: believe me, I've runned siter where we do deploy the worktree as is, and these problems do arise.10:48
ogelami: our solution is to fix this with configuring our webserver in a sane way, but I'm not sure that's the correct way of doing it10:48
ogelami right now we deploy the master branch, and then we sass our css10:49
and there are no files for debugging in the repo10:49
← martinbmadsen left10:49
← dsantiago left10:49
← SiliconDon left10:49
← dhjondoh left10:50
← zoso left10:50
→ SiliconDon joined10:51
← ItSANgo_ left10:51
→ Corey84 joined10:51
ogelami iveqy: i belive you, whats the structure in your company?10:51
→ thevishy joined10:52
← SiliconDon left10:52
← porcoesphino left10:52
iveqy ogelami: small < 10 developers with custom php framework10:53
← Adaulfo left10:53
ogelami same here10:53
→ SiliconDon joined10:53
ogelami so you have all your admin interfaces or debug code checked into the repo?10:53
← Polyatomic left10:54
→ metastableb joined10:54
← jambocomp left10:55
← Takle left10:55
→ Vadimus joined10:56
← iron_houzi left10:56
→ dsantiago joined10:57
→ iron_houzi joined10:58
← Akagi201 left10:58
← ghostpl_ left10:59
→ ghostpl_ joined11:00
iveqy ogelami: yes, and the admin interface is the same as the website interface11:00
ogelami: so they are integrated11:00
← SiliconDon left11:01
→ Takle joined11:01
→ SiliconDon joined11:01
← Takle left11:03
→ dhjondoh joined11:04
→ BuenGenio joined11:04
→ a_l_e joined11:05
→ Takle joined11:05
← zturner left11:05
← iron_houzi left11:05
→ hyperair joined11:06
← Gizburdt left11:06
→ agileadam joined11:06
→ dm7freek joined11:06
→ iron_houzi joined11:06
← SiliconDon left11:07
← ghostpl_ left11:07
→ ghostpl_ joined11:07
→ milesmatthias joined11:08
← Quevin left11:09
← kanuku left11:09
→ SiliconDon joined11:09
→ berz3rk joined11:09
→ Quevin joined11:09
→ endiruna joined11:10
← ghostpl_ left11:11
← dhjondoh left11:11
← Herbalist left11:12
→ ghostpl_ joined11:12
← dm7freek left11:12
← milesmatthias left11:12
→ xaa joined11:13
← Terabyte left11:13
→ Xtreme joined11:15
→ Terabyte joined11:15
Xtreme hello guys, i have a question on git. We have a main branch Master. (main development branch). Now i branched out master for a feature, and my colegue branched out master for a bugfix. (her branch was after me).11:16
← ropav left11:16
Xtreme Now, while testing, i found out, that i cannot continue on my task unless my colleague fixes her bugfix.11:16
→ mikecmpbll joined11:16
Xtreme now the issue is, how will i get her changes when she merges her code to master?11:16
→ Gavrisimo joined11:16
Xtreme do i have to branch out master again? but if i do that, my work will be lost.11:17
osse Xtreme: you can merge from master11:17
xaa hi, I try to run "git diff xxx-file-xxxx-yyyy.patch file.inc" but this is not working well. "git diff file.patch file.inc" is working as expected. any clue please ?11:17
Xtreme any advices?11:17
osse, how? pull master and then merge into my code?11:17
osse yes11:17
→ soc42 joined11:17
Xtreme okay, this is what we usually used to do. But now we are using atlassian stash. And we dont have master in our local. We just checkout the branches with stash creates for my task.11:18
so i need to do another pull request from master to my branch?11:18
osse i don't know11:18
→ daftano joined11:19
tobiasvl Xtreme: you can just merge locally without making a pull request, but yes, making a pull request from master to your branch works too11:19
osse get master somehow11:19
Xtreme okay.. i can get master, but that can break the workflow..11:20
armm, fuck it, i will get master.11:20
tobiasvl why will it break the workflow?11:20
Xtreme btw, which workflow do you advice?11:20
→ lindenle joined11:20
osse it is better to break the workflow than make the workflow break you11:20
tobiasvl I also use stash, and I recently merged master into a feature branch too. I used a pull request, but merging locally is fine as well. rebasing is usually NOT fine.11:20
→ arup_r joined11:21
← Gavrisimo left11:21
→ jottr joined11:21
← gaoli left11:21
Xtreme tobiasvl, hmm. yeah. pull request reall does sound better option. We never rebase.11:21
→ maximski joined11:21
Xtreme tobiasvl, i have one stash question. (i am stash newbie). what is that production branch option for?11:22
osse maybe cherry-pick that bug fix?11:22
Xtreme we use jira-stash-bamboo11:22
osse i thought I wanted stash, but now it sounds like I don't11:22
tobiasvl Xtreme: we don't use production branch, so I don't really know, sorry. https://answers.atlassian.com/questions/220237/stash-branching-model-vs-git-flow looks relevant11:22
osse: stash is nice and flexible11:23
osse the only reason I want stash is to auto-resolve issues in jira11:23
tobiasvl Xtreme: I'm guessing production branch is what you use for bamboo, by looking at it quickly, since it deploys11:23
Xtreme tobiasvl, no prob. thanks.11:23
osse anything more than that is in the way11:23
tobiasvl osse: in that case maybe you don't want stash ;P11:24
Xtreme osse, yeah, stash is good. but it cannot auto-resolve.. you need to still resolve it manually11:24
only benefit is, you can see the work done for that issue11:24
osse Xtreme: resolve jira issues you mean?11:24
← lindenle left11:25
tobiasvl Xtreme: are you sure that it can't? I thought it could. "smart commits"11:25
although we don't use it so I dunno11:25
it can with bitbucket and github so…11:25
osse I've written a small script we use at work to resolve jira issues via the REST API11:26
by parsing the commit messagfe11:26
Xtreme ahmm. we dont use smart commits.. but yeah, looks like you can. :) sorry.11:26
← jottr left11:26
→ dhjondoh joined11:27
Xtreme i just looked into smart commits. and nice!11:27
btw, anyone uses bamboo here?11:27
← checkItOut left11:27
← King_Hual left11:27
→ topcat joined11:27
→ Nizumzen joined11:28
→ davispuh joined11:28
← t0th_-_ left11:29
topcat do ./git/hooks follow the repo around if i push to Github and someone else clones the repo is it is solely for myself on that particular clone?11:29
tobiasvl they don't follow11:29
← iron_houzi left11:29
→ c0mrad3 joined11:29
→ zoso joined11:29
← ghostpl_ left11:30
→ t0th_-_ joined11:30
→ yn5 joined11:31
← yn5 left11:31
→ ghostpl_ joined11:31
→ Thorax15 joined11:31
→ Gizburdt joined11:33
→ iron_houzi joined11:33
← basiclaser left11:34
← jagob left11:35
→ AnxiousGarlic joined11:35
Kartagis b00^wk: are you there?,11:35
_ikke_ topcat: That would be a security issue, because other an make your computer run arbitrary code11:36
→ jds joined11:36
topcat I guess. Just wondering of a quick way to help people contributing making a PR to the master branch11:37
← maximski left11:38
← Guest50164 left11:38
→ AustinTheGrey joined11:39
→ pinuccioleffi joined11:39
_ikke_ topcat: The only thing you can do is to distribute these hooks inside the repo, and then instruct people to move them into place11:39
→ gv joined11:40
gv → Guest1049511:40
← jazzzu left11:40
→ m__ joined11:41
← DolphinDream left11:41
← ashu11 left11:42
← tpollard left11:42
→ kanuku joined11:43
← smw left11:44
→ dhjondoh1 joined11:45
→ martinbmadsen joined11:45
← pinuccioleffi left11:45
← sross07 left11:45
← dhjondoh left11:46
b00^wk Kartagis, ?11:46
Kartagis b00^wk: I found out Redmine supports git11:47
→ Embassy joined11:47
Embassy → Guest999811:47
← Gizburdt left11:47
b00^wk Kartagis, cool thanks11:48
← m__ left11:48
→ mostlybadfly joined11:49
→ dhjondoh joined11:49
← martinbmadsen left11:50
← cagedwisdom left11:50
← dhjondoh1 left11:51
→ bronson joined11:52
→ paulweb515 joined11:52
→ yn5 joined11:52
→ ams__ joined11:53
← FreezingAlt left11:53
→ FreezingAlt joined11:54
→ dharriga1 joined11:54
← dharrigan left11:54
→ sudshekhar joined11:54
→ Dragooon joined11:54
← jayeshsolanki left11:55
→ in3xes joined11:55
→ ciampix joined11:56
← paulweb515 left11:56
← bronson left11:56
→ kat92 joined11:56
→ dougsland joined11:57
← yn5 left11:57
→ smw joined11:57
← thiago left11:58
→ Gizburdt joined11:58
→ PragCypher joined11:59
← creep left11:59
→ theahindle joined12:00
← theahindle left12:00
→ CKyle joined12:00
→ mizu_no_oto joined12:00
→ maximski joined12:01
← maximski left12:01
← cdown left12:01
→ maximski joined12:02
← kat92 left12:02
→ cdown joined12:03
→ cagedwisdom joined12:03
→ arvind_k joined12:04
← zoso left12:04
arvind_k → zoso12:04
→ jagob joined12:05
← pacon2 left12:06
→ otter768 joined12:07
→ rishiraj joined12:07
→ Dudi joined12:07
← rishiraj left12:07
→ roelmonn_ joined12:08
→ rishiraj joined12:08
← in3xes left12:09
← AustinTheGrey left12:11
← roelmonnens left12:11
→ Dorf joined12:11
→ paulweb515 joined12:12
← Dudi left12:12
→ Dudi joined12:12
→ buildAI joined12:12
← otter768 left12:13
→ scientes joined12:13
← scientes left12:13
→ scientes joined12:13
← KevinSjoberg left12:13
← buildAI left12:14
← Takle left12:14
→ buildAI joined12:14
← smferris left12:14
← cyphase left12:15
→ Asiajey joined12:15
→ Takle joined12:15
← Takle left12:15
← buildAI left12:15
← maximski left12:17
→ Gavrisimo joined12:17
← PCatinean left12:18
→ maximski joined12:19
← jadne left12:19
→ cylonmath joined12:20
← kanuku left12:21
← Gavrisimo left12:22
→ Malsasa_ joined12:22
Malsasa_ → Malsasa12:22
→ KevinSjoberg joined12:22
→ in3xes joined12:22
← dhjondoh left12:23
→ bgerber joined12:25
← Guest9998 left12:25
→ fooforge joined12:26
→ Takle joined12:26
→ jadne joined12:27
← maximski left12:27
→ MagePsycho joined12:27
← settermjd left12:28
← scientes left12:29
→ cyphase joined12:29
← stamina left12:30
← epifanio left12:30
→ lindenle joined12:30
→ devoldmx joined12:30
← cagedwisdom left12:30
→ kanuku joined12:30
← kcj left12:30
→ duplicatelogon joined12:31
← ashnur left12:31
← ghostpl_ left12:32
→ bitkiller joined12:32
→ cjwilburn joined12:32
→ smferris joined12:33
→ FruitLoop joined12:33
FruitLoop → Guest9301412:34
← lindenle left12:35
→ kanuku_ joined12:35
← kanuku left12:35
← dsdeiz left12:35
→ Guest82 joined12:35
→ tier joined12:36
→ ashnur joined12:36
← AnxiousGarlic left12:36
← Takle left12:37
→ IrishPrime joined12:38
← ology left12:38
→ jxpx777 joined12:41
→ ology joined12:41
← devoldmx left12:41
← sinkensabe left12:42
→ IIT joined12:43
→ acetakwas joined12:44
← berz3rk left12:44
← IIT left12:44
← acetakwas left12:44
→ IIT joined12:44
→ plushwork joined12:46
← PragCypher left12:46
→ zivester joined12:47
plushwork I'm applying a patch from a newer version of software. Shouldn't I mark myself as a commiter?12:47
xaa hello, hmm "git diff file.patch file.inc" is working, mais "git diff zzz.patch file.inc" is not. is it possible to use git diff with different filename for the .patch and the file to patch?12:47
plushwork And how do I do that?12:47
→ cagedwisdom joined12:47
iveqy plushwork: yes, but not as author, and when you commit you're becoming the commiter12:48
← ogelami left12:48
osse plushwork: you become the committer by default12:50
→ dstarh joined12:50
→ AngryAvocado joined12:50
→ hcc23 joined12:51
→ scientes joined12:51
plushwork iveqy: oh...It just didn't show up when I did git log -1 so I though it wasn't there12:51
gitinfo set mode: +v12:51
AngryAvocado Hello there12:51
gitinfo AngryAvocado: 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.12:51
← a_l_e left12:51
AngryAvocado Hello there12:52
→ livingstn joined12:52
→ mr-kyd joined12:52
→ jelb joined12:53
← CKyle left12:53
AngryAvocado Anyone here? :D12:53
→ corey84_ joined12:53
→ PCatinean joined12:53
← jelb left12:53
→ aswen joined12:53
bremner did you read any of the text above?12:54
_ikke_ nope, it's empty12:54
→ npwo joined12:54
← npwo left12:55
→ tristanp joined12:55
j416 am I stupid or is `git checkout HEAD^ -- .` a noop? HEAD has changes and I want to make my work tree equal what is in HEAD^12:55
→ dm7freek joined12:55
← CLaxware left12:56
→ Ixfo joined12:56
dwmw2_gone → dwmw212:56
_ikke_ No, it should nod be a noop12:56
← Corey84 left12:56
grawity a regular `git checkout` will not discard uncommitted changes though12:56
→ Corey84 joined12:56
j416 I'm on 2.3.212:56
grawity try -f12:56
j416 tried -f12:56
no difference12:56
← Ixfo left12:56
osse are you in a subdir ?12:57
→ milesmatthias joined12:57
→ jty joined12:57
→ PragCypher joined12:58
← corey84_ left12:59
→ hellofunk joined12:59
→ MattHardcastle joined12:59
← fstd left13:00
← tier left13:00
AngryAvocado (Could I speak with someone privately? It seems like a problem is being solved now and I do not want to make a mess :) )13:00
← kanuku_ left13:00
→ tier joined13:00
← endiruna left13:00
→ kanuku joined13:00
← zivester left13:00
→ fstd joined13:00
← cagedwisdom left13:01
osse it's better to make a mess13:01
go ahead13:01
← plushwork left13:01
grawity if it's a Git question, ask it in #git13:01
← dm7freek left13:01
← milesmatthias left13:01
→ endiruna joined13:02
← ruukasu left13:02
→ epifanio joined13:02
AngryAvocado It matters Git GUI.13:03
It is for Git GUI.13:03
grawity could you just ask the *real* question, please13:03
→ CLaxware joined13:03
← subhojit777 left13:03
← thierryp left13:04
osse !ask13:04
gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.13:04
AngryAvocado Oh okay, sorry. I want to change the Git GUI's language. I know that it looks for the Window's language, but I cannot change it, since the language will change globally. I need to change it only for Git GUI.13:05
→ thierryp joined13:05
iveqy AngryAvocado: http://stackoverflow.com/questions/1427785/how-to-set-desired-language-in-git-gui13:06
→ evie_hammond joined13:06
→ macabre joined13:06
→ gdoteof joined13:06
iveqy AngryAvocado: it don't looks for the windows language. And if you're comfortable with changing the language for msys it should be fairly simple13:06
→ tvw joined13:07
← jadne left13:07
← epifanio left13:07
← scientes left13:07
→ mlechner joined13:09
iveqy .search git gui change language13:09
gitinfo .search: nothing found.13:10
iveqy jast: ^ broken =(13:10
→ DolphinDream joined13:10
→ jottr joined13:10
→ epifanio_ joined13:10
← BlaXpirit left13:10
→ freestyl3r joined13:10
→ jerius joined13:11
→ jceb joined13:11
AngryAvocado @iveqy I followed the solution, and it worked. Thanks!13:12
I didn't try it because I thought I would change Windows' language. My bad, next time I will search more.13:12
→ corey84_ joined13:13
← KevinSjoberg left13:14
→ EminenceHC joined13:14
← jottr left13:14
← endiruna left13:15
→ KevinSjoberg joined13:15
→ danguafer joined13:15
← Corey84 left13:15
corey84_ → Corey8413:15
→ joelm joined13:16
→ denete joined13:16
→ th3fallen joined13:17
← Guest93014 left13:17
→ devoldmx joined13:17
← monotreme_man left13:17
← mizu_no_oto left13:18
→ ErKa joined13:18
← Raging_Hog left13:19
← epifanio_ left13:19
← EminenceHC left13:19
← CLaxware left13:19
→ CLaxware joined13:19
← SiliconDon left13:21
→ FruitLoop joined13:21
FruitLoop → Guest3314113:21
← jceb left13:21
← _Vi left13:21
→ Es0teric joined13:21
← devoldmx left13:22
→ zenith_ joined13:22
→ Acidnerd joined13:22
→ lsiv568 joined13:24
→ settermjd joined13:24
→ Gama11 joined13:24
jast iveqy: I know. need to figure out what changed in the DOM...13:25
or, rather, how to extract the right bits using libxml13:25
← denete left13:25
→ danzilio joined13:26
→ dsdeiz joined13:26
← Guest82 left13:27
← seschwar left13:27
→ jakobhans joined13:28
→ seschwar joined13:28
→ phantomtiger joined13:28
← danzilio left13:29
← Guest33141 left13:29
→ mizu_no_oto joined13:30
→ devoldmx joined13:30
→ mezod joined13:30
← steele left13:31
→ mellernoia joined13:32
→ mekhami joined13:33
← ome left13:33
→ jceb joined13:33
→ _Vi joined13:34
→ martinbmadsen joined13:34
→ ghostpl_ joined13:35
→ JereZiah joined13:36
← JereZiah left13:36
→ Takle joined13:38
← lsiv568 left13:39
← zenith_ left13:39
← martinbmadsen left13:39
← Consuela left13:39
→ JereZiah joined13:39
← ErKa left13:40
→ jottr joined13:40
← jagob left13:40
→ lsiv568 joined13:40
→ ojacobson joined13:41
→ bronson joined13:41
← ology left13:41
→ totemizer joined13:41
→ zenith_ joined13:41
← jolg42 left13:42
→ rubyonrailed joined13:42
← zoso left13:42
← Takle left13:42
→ kadoban joined13:43
← ghostpl_ left13:43
← KevinSjoberg left13:43
← totemizer left13:44
← ashnur left13:44
← bronson left13:45
→ tejota joined13:46
→ liamkeily joined13:46
→ CKyle joined13:46
→ ghostpl_ joined13:47
← JereZiah left13:47
← kanuku left13:47
→ epifanio joined13:47
→ AaronMT joined13:47
← Hounddog left13:47
b00^wk Kartagis, yea, that actually looks more interesting than all those other relates refs i got here .13:48
← MattHardcastle left13:48
← harish_ left13:48
← arup_r left13:49
→ kevwil joined13:49
→ zadock joined13:49
→ ghostpl__ joined13:51
← ghostpl__ left13:51
← Dudi left13:51
← ghostpl_ left13:51
→ warfront1 joined13:51
→ shinnya joined13:52
→ pm90_ joined13:52
← tier left13:52
warfront1 So I have been working on a branch, but the master has also been updated since my initial edits. How do I bring branch up to date whilst retaining my changes13:52
osse warfront1: git merge master or git rebase master13:53
→ ashnur joined13:53
← ashnur left13:53
→ ashnur joined13:53
osse your choice13:53
warfront1 what is the difference13:53
→ blubberbop joined13:53
ChanServ set mode: +o13:53
← mtakkman left13:53
warfront1 Also what happens if there are conflicts (ie. we edited the same file)13:53
← pm90_ left13:53
qsuscs set mode: -bbb13:53
→ lpax_ joined13:54
ChanServ set mode: -o13:54
qsuscs warfront1: !eek13:54
gitinfo warfront1: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II13:54
→ pm90_ joined13:54
qsuscs and !mergerebase13:54
gitinfo [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html13:54
osse warfront1: http://sprunge.us/ENNU13:54
warfront1: how to solve conflicts is the same in both cases13:54
ChanServ set mode: +v13:54
→ iamjarvo joined13:55
osse editing the same file doesn't necessarily mean it's a conflict13:55
← markmark left13:55
→ markmarkmark joined13:55
← lpax left13:56
← liamkeily left13:56
← mizu_no_oto left13:56
warfront1 what is "upstream history"13:57
I'm reading the second article you sent me13:58
→ highcup joined13:58
osse master in your case13:58
← epifanio left13:59
→ prestorium joined13:59
← ORiON-- left13:59
→ Dougie187 joined14:00
→ zenith__ joined14:00
→ ghostpl_ joined14:00
→ Fenikkusu joined14:00
← BuenGenio left14:01
← Quevin left14:01
→ debian112 joined14:01
← cllamas left14:02
Fenikkusu I have a rather outdated branch that was never merged. How would I get a patch that includes only the changes applied to this branch?14:02
← raatiniemi left14:02
osse Fenikkusu: git diff newbranch...thatbranch14:02
← ghostpl_ left14:02
→ ghostpl_ joined14:03
nepochal_ → nepochal14:03
warfront1 sounds like merge is safer14:03
← jwhisnant left14:03
← nikio_ left14:03
← zenith_ left14:04
→ mihaicris joined14:04
→ jwhisnant joined14:04
Fenikkusu osse, wouldn't that show me the files that are changed between both branches? IE: If fileA was changed in origbranch, it would show up since it is different from currbranch?14:04
osse Fenikkusu: no14:04
Fenikkusu: it is the same as git diff $(git merge-base newbranch thatbranch) thatbranch14:05
→ tier joined14:05
warfront1 Also " git merge master" command while in my branch will merge changes from master into my branch. Not my branch into master14:05
← beautifulmind left14:06
→ ghostpl__ joined14:06
→ crestbook joined14:06
← dvaske left14:06
← ghostpl_ left14:06
→ ORiON-- joined14:06
→ liamkeily joined14:07
→ sburgess joined14:07
← craigp left14:07
→ Quevin joined14:07
← lpax_ left14:08
→ lpax joined14:08
→ otter768 joined14:08
→ dmsigu joined14:10
← ORiON-- left14:11
← Arsonide left14:12
Fenikkusu osse, Am I correct in understanding that merge-base returns the most recent common point of two branches?14:12
← thierryp left14:12
osse Fenikkusu: yes14:12
→ ignas joined14:12
← zenith__ left14:13
← otter768 left14:13
← Thorax15 left14:13
→ imanzarrabian joined14:13
→ ology joined14:13
osse Fenikkusu: here `git merge-base master relaunch` is D: http://sprunge.us/XMZB14:14
← lsiv568 left14:14
→ FruitLoop joined14:15
→ devoldmx3 joined14:15
← davispuh left14:15
→ telesto joined14:15
Fenikkusu osse, This also includes all merges and/or rebases, not just the original point at which the additional branch was created?14:16
osse yes14:16
← s8321414 left14:16
Fenikkusu osse, okay, thank you. This is exactly what I was looking for (at least it's returning the results I expected).14:16
osse Fenikkusu: it simply walks backwards from both branches until it finds something they have in common.14:16
→ endiruna joined14:17
→ s8321414 joined14:17
→ ORiON-- joined14:17
← MagePsycho left14:17
telesto I'm using this simple git workflow (http://blogs.atlassian.com/2014/01/simple-git-workflow-simple/) of working on a branch and rebasing against a staging branch to keep it up to date. However I need to merge my feature branch back into staging every evening to show my progress. After I have merged my feature branch into staging, is it safe to continue rebasing my feature branch against staging without corrupting the14:17
history?14:17
← pedda left14:17
→ ashu11 joined14:17
← devoldmx left14:18
← iamjarvo left14:18
→ lsiv568 joined14:18
→ iamjarvo joined14:19
→ ErKa joined14:19
→ lindenle joined14:19
milki yes14:19
← intellix left14:20
iveqy telesto: why do you need to merge to show your process? Why can't you just show your branch?14:20
→ knownasilya joined14:20
telesto it's to project managers and the client14:21
the staging branch gets deployed to our staging server14:21
← _Vi left14:21
telesto I'm just less comfortable with rebasing so wanted to make sure I wouldn't be creating and problems14:21
← liamkeily left14:22
← okanck_ left14:22
kadoban What will that rebase actually do? I would have suspected that that wouldn't be a good idea to try, and that you should just stick with merges.14:22
→ Deseaus joined14:23
← lindenle left14:23
← AngryAvocado left14:24
kadoban Oh hmm, nevermind. I can at least potentially see what it might do.14:24
telesto The goal of the rebase is to keep my feature branch up to date without excessive merges. And I know I can merge that back into staging without a problem. I just don't know if I can switch back to that feature and rebase again in the future14:24
osse you can rebase as many times as you want14:25
→ Dumblez0r joined14:25
← c0mrad3 left14:25
← jerius left14:25
telesto I think I'm just trying to confirm if I'm avoiding the warning I see all the time that you should never rebase commits that have been pushed to a public repository14:26
→ ome joined14:26
← Gizburdt left14:26
→ brent_ joined14:26
→ smccarthy joined14:26
→ Dumble joined14:27
← Acidnerd left14:27
← Dumble left14:27
← nixter1029 left14:27
→ liamkeily joined14:28
→ steele joined14:28
← mihaicris left14:28
→ nixter1029 joined14:28
→ jerius joined14:28
→ edude03 joined14:29
→ Acidnerd joined14:29
→ Aune joined14:29
← Dumblez0r left14:29
← jwest left14:29
← ghostpl__ left14:29
→ ghostpl_ joined14:30
← crestbook left14:30
→ zenith_ joined14:30
→ dreiss joined14:31
← ghostpl_ left14:31
→ epifanio joined14:31
← jty left14:32
→ KevinSjoberg joined14:32
→ ehmatthes joined14:32
← zenith_ left14:33
← devoldmx3 left14:33
→ ghostpl_ joined14:33
→ LBV_User joined14:33
→ telesto_ joined14:34
← telesto left14:35
→ mizu_no_oto joined14:35
→ im8bit_ joined14:35
→ Gizburdt joined14:35
→ devoldmx joined14:35
← ashu11 left14:36
→ Takle joined14:37
→ raatiniemi joined14:38
→ MLM joined14:38
→ iuves joined14:39
→ zquad joined14:40
← iuves left14:41
→ Una joined14:41
→ zenith_ joined14:41
→ bronson joined14:42
→ eutux joined14:42
← eutux left14:43
→ cavallari joined14:44
→ Ueuiu joined14:44
→ dm7freek joined14:44
← Ueuiu left14:44
→ Zoddo joined14:45
← _dv_ left14:45
→ harish_ joined14:45
← devoldmx left14:45
← endiruna left14:45
→ milesmatthias joined14:45
→ xolubi joined14:46
← bronson left14:46
→ ioicp joined14:49
→ devoldmx3 joined14:49
← dm7freek left14:50
← milesmatthias left14:50
← ioicp left14:50
→ Egl joined14:51
← Egl left14:51
→ petersr joined14:52
→ ashu11 joined14:52
← rishiraj left14:52
← s8321414 left14:52
→ cwtu joined14:52
→ s8321414 joined14:53
← cwtu left14:53
→ tritone joined14:54
→ Siso joined14:54
→ kermit joined14:56
← telesto_ left14:56
← soc42 left14:58
→ cbonobo joined14:58
→ JereZiah joined14:59
→ CEnnis91 joined14:59
→ Ankhers joined14:59
← JereZiah left14:59
→ bobmarchman joined15:00
← settermjd left15:00
→ nyexpress joined15:00
← nyexpress left15:01
→ settermjd joined15:01
→ _Vi joined15:02
→ JereZiah joined15:02
→ davispuh joined15:02
→ RaceCondition joined15:03
← JereZiah left15:03
→ EminenceHC joined15:03
→ red_horned_rihno joined15:04
← RaceCondition left15:04
← red_horned_rihno left15:04
← daynaskully left15:04
← shinnya left15:05
→ red_horned_rihno joined15:05
→ jazzzu joined15:05
← red_horned_rihno left15:05
→ jonmorehouse joined15:05
← bobmarchman left15:06
→ red_horned_rihno joined15:06
→ Spacew00t joined15:06
← hs366 left15:06
← EminenceHC left15:08
← red_horned_rihno left15:09
← jakobhans left15:09
→ hobodave joined15:09
← dsdeiz left15:09
← Trozz left15:10
← Gizburdt left15:10
→ Trozz joined15:11
→ chitopunk joined15:11
→ Gizburdt joined15:11
← dmsigu left15:11
← rchavik left15:12
→ Gamecubic joined15:12
← Silmarilion left15:13
← LBV_User left15:14
← b00^wk left15:15
← jceb left15:15
→ jadne joined15:16
→ Silmarilion joined15:16
← dreiss left15:17
→ JereZiah joined15:17
← Kulrak left15:17
→ _Atom_ joined15:17
← aswen left15:17
← JereZiah left15:17
→ subhojit777 joined15:17
→ roelmonnens joined15:18
← nehaljwani left15:19
← roelmonn_ left15:20
→ JereZiah joined15:22
← jakke left15:22
← Gizburdt left15:22
→ martinbmadsen joined15:23
→ Neozonz|Disc joined15:23
← Neozonz|Disc left15:23
→ Neozonz|Disc joined15:23
← JereZiah left15:23
→ robzilla joined15:23
← prestorium left15:24
→ JereZiah joined15:24
→ prestorium joined15:24
← JereZiah left15:24
← tristanp left15:25
← ORiON-- left15:27
← Takle left15:27
← netj left15:28
← martinbmadsen left15:28
← cdown left15:28
→ netj joined15:28
→ jstimm joined15:28
→ zturner joined15:28
→ KevinTS_ joined15:28
→ dreiss joined15:29
→ Kulrak joined15:29
← Kulrak left15:29
→ Kulrak joined15:29
← jerius left15:30
→ tristanp joined15:30
→ aswen joined15:30
← mquin left15:31
→ jerius joined15:32
→ mquin joined15:32
← jiku left15:32
→ ORiON-- joined15:32
← KevinTS left15:32
→ Takle joined15:32
← KevinTS_ left15:33
→ kpease joined15:33
← liamkeily left15:34
← xxcooljesusxx left15:34
← zadock left15:34
→ bqf joined15:35
← pooh22 left15:36
→ jontmorehouse joined15:36
← _Atom_ left15:36
→ liamkeily joined15:37
← ORiON-- left15:37
→ ethikz joined15:37
← jonmorehouse left15:37
→ pooh22 joined15:38
→ yn5 joined15:38
→ jwest joined15:38
← tejota left15:38
→ scientes joined15:39
→ editshare-ericf joined15:39
→ nehaljwani joined15:39
→ SeriousMatters joined15:39
→ jagob joined15:39
bqf i wrote a miniscule patch for a bug in git. getting gmail to play nice with the patch submitting guidelines is a complete PITA. so my options are: a) send patch as attachment, prepare for hate by the maintainers, b) forget about it and on go on with my life. is there a middle ground?15:39
← SegFaultAX left15:39
← scientes left15:39
← jadne left15:40
→ SegFaultAX joined15:40
→ scientes joined15:40
← scientes left15:40
→ scientes joined15:40
→ m0ltar joined15:40
qsuscs bqf: man git send-email15:40
gitinfo bqf: the git-send-email manpage is available at http://jk.gs/git-send-email.html15:40
→ cdown joined15:41
→ thierryp joined15:41
← Adib left15:41
bqf qsuscs: oh yeah, i tried git send-email. gmail will have none of it. "Please log in via your web browser and then try again." even when i am currently logged in to gmail through a browser session.15:41
which is too bad, seeing how git send-email looked like the easiest way forward.15:42
→ milesmatthias joined15:42
← treehug88 left15:43
qsuscs bqf: to you use 2-factor auth=15:43
← scientes left15:43
← CKyle left15:43
→ polyzen joined15:43
← jontmorehouse left15:43
qsuscs *do (wtf)15:43
→ scientes joined15:44
← Zoddo left15:44
→ Zoddo joined15:44
bqf qsuscs: i switched it off for this. and really, this is not a cry for help regarding gmail - it is more a cry for time, because i don't feel like debugging this. most other projects are fine with either pull requests or patches sent as attachments.15:44
← seschwar left15:45
bqf ... and that sounds like i want to start a political debate here. not the case. to be honest, i'm not quite sure why i came here anymore. i should just forget about it or make time to debug gmail some time later. :)15:45
← milesmatthias left15:45
← cavallari left15:45
qsuscs bqf: put on your bulletproof jacket, attach the patch and explain in the e-mail body why you couldn’t send it as you should have15:45
← twoface88 left15:46
← thierryp left15:46
→ ORiON-- joined15:46
→ AnujSharma joined15:46
bqf qsuscs: alright, will do. i added a "look into gmail blocking send-email" reminder, if that doesn't work out i'll send the patch as an attachment. i'll be sure to say "qsuscs said it was ok everyone!!!", of course.15:47
→ cllamas joined15:48
→ soc42 joined15:48
qsuscs bqf: they don’t know me on the list, so … :>15:48
→ milesmatthias joined15:48
← Xethron left15:48
bqf qsuscs: :)15:49
→ pheaver joined15:49
→ bennigraf joined15:50
→ Kicer86 joined15:51
← Malsasa left15:51
← ORiON-- left15:51
← Zoddo left15:51
→ Zoddo joined15:52
→ aartist joined15:52
→ ORiON-- joined15:53
→ PabloVidela joined15:54
→ jonmorehouse joined15:55
gitinfo set mode: +v15:55
PabloVidela hi everybody15:55
i have a question15:55
i need to add to the gitignore file the link simbolic of the ubuntu or linux system15:55
how can i add that, how can recognize that kind of file?15:56
sorry by my english xD15:56
← tristanp left15:57
← affa09 left15:58
← CheckDavid left15:58
→ thedodd joined15:59
← epifanio left15:59
→ tristanp joined15:59
← scientes left15:59
← acolson left15:59
← pm90_ left16:00
← s8321414 left16:00
→ t4nkd joined16:01
← Silmarilion left16:01
← ORiON-- left16:02
_ikke_ Do you need to ignore a symbolic link?16:02
→ pecg joined16:02
← lpax left16:02
→ roelmonn_ joined16:02
→ hobodave_ joined16:03
← pheaver left16:03
← davispuh left16:03
Seveas bqf: feel free to use my mailserver (seveas.net) as a relay, it'll only relay to vger lists specifically to avoid needing gmail :)16:04
→ affa09 joined16:04
← hobodave left16:04
→ ORiON-- joined16:04
milki :o16:05
→ LBV_User joined16:05
Seveas PabloVidela: .gitignore does not care about filetypes, only about filenames16:05
← bvi left16:06
← bket left16:06
← roelmonnens left16:06
← phantomtiger left16:06
→ bket joined16:07
← roelmonn_ left16:07
← ThomasLocke left16:07
→ Sasazuka joined16:07
→ epifanio joined16:07
→ psiloLR joined16:08
← yn5 left16:08
← aartist left16:09
→ scottschecter joined16:09
→ otter768 joined16:09
PabloVidela Seveas thanks for your answer16:10
← bb010g left16:10
PabloVidela but i see the ignore file put the extension in the final16:10
for example ignore all rar files16:10
*.rar16:10
Seveas yes, that's still part of the filename16:10
← ORiON-- left16:10
PabloVidela ok but what have the common filename in the symbolic?16:10
Seveas with filetype I mean 'directory', 'file', 'symlink', 'named pipe', 'device', 'socket'16:10
→ ORiON-- joined16:10
← hellofunk left16:11
PabloVidela ahhh ok sorry, i try to say the extension filename16:11
← dreiss left16:11
Seveas what are you trying to ignore?16:11
PabloVidela symbolic links16:11
Seveas not possible afaik16:11
PabloVidela for git what is a simbolic link?16:12
→ davispuh joined16:12
PabloVidela it's another path?16:12
Seveas a unix symlink16:12
PabloVidela ok, thanks for you help16:13
→ drbean_ joined16:13
← Siso left16:13
PabloVidela i am new in GIT16:13
← iamjarvo left16:13
Seveas !GIT16:13
gitinfo Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place. 48a8c26c625a4d3631c4f614bceb38933e74140816:13
→ jayeshsolanki joined16:14
PabloVidela ahhaahhaahhaha16:14
thanks for that! xD16:14
→ jontmorehouse joined16:14
PabloVidela i am learn something important :P16:14
Seveas :)16:14
← otter768 left16:14
PabloVidela this remember me a Richard Stallman for the word "Linux" and "GNU/Linux"16:15
← jonmorehouse left16:15
← drbean left16:15
→ jakobhans joined16:16
← tanuck left16:16
→ SoFLy joined16:17
→ Alex27121 joined16:18
← lsiv568 left16:18
← tier left16:18
← Alex27121 left16:18
← t4nkd left16:18
← Corey84 left16:18
← jargon left16:18
← vurma left16:19
→ bollullera joined16:20
← doev left16:20
→ aartist joined16:20
← thevishy left16:21
← TomyWork left16:21
→ fairuz joined16:21
→ mrgrieves joined16:22
→ bluesm joined16:22
← fairuz left16:22
← chaudhary left16:22
→ Gizburdt joined16:22
→ robbyoconnor joined16:22
mrgrieves hi, how can I just overwrite remote origin with what I have in my local repo? I want to update the remote repo with what I have on my pc16:23
qsuscs mrgrieves: !force_push16:23
gitinfo mrgrieves: If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.16:23
← robzilla left16:23
← ashu11 left16:23
→ durham joined16:24
← drbean_ left16:24
→ imachuchu joined16:24
← hyperair left16:25
→ thierryp joined16:25
→ Toba joined16:25
← Gizburdt left16:25
gitinfo set mode: +v16:25
→ JereZiah joined16:25
← smccarthy left16:26
Toba For cutting up a git repo based on sub directories, is there a 'canonical' way, or would https://github.com/samth/git-slice be my best bet? Anyone have tips?16:26
← JereZiah left16:26
mrgrieves thank you guys! push force did what I needed in this case16:27
← cdown left16:27
→ MattHardcastle joined16:27
← Takle left16:27
→ chaudhary joined16:28
→ drbean joined16:28
→ tier joined16:29
← p3lim left16:30
→ JereZiah joined16:30
→ digifiv5e joined16:30
digifiv5e → Guest8958616:30
← JereZiah left16:31
← zenith_ left16:31
→ bronson joined16:31
→ JereZiah joined16:31
← sudshekhar left16:31
← milesmatthias left16:31
← JereZiah left16:31
→ sudshekhar joined16:32
→ milesmatthias joined16:32
→ JereZiah joined16:32
← JereZiah left16:33
→ cavallari joined16:33
← t0th_-_ left16:33
→ dm7freek joined16:33
→ JereZiah joined16:33
→ t0th_-_ joined16:33
→ BlaXpirit joined16:33
← JereZiah left16:34
← aartist left16:34
→ JereZiah joined16:35
→ dc5ala joined16:35
← mizu_no_oto left16:35
← JereZiah left16:35
← bronson left16:35
→ Takle joined16:35
→ Seanmcn joined16:36
→ JereZiah joined16:36
← dm7freek left16:36
← milesmatthias left16:36
← JereZiah left16:36
→ cdown joined16:36
_ikke_ Toba: There is also filter-branch16:37
→ dm7freek joined16:37
→ JereZiah joined16:37
← sburgess left16:37
← ciampix left16:37
→ JereZiah_ joined16:38
← JereZiah_ left16:38
→ lindenle joined16:38
← Takle left16:39
→ dm7freek_ joined16:40
← ehmatthes left16:40
← Balliad left16:41
← dm7freek left16:41
← JereZiah left16:41
→ NABKMK4 joined16:42
→ zadock joined16:43
→ phantomtiger joined16:43
← epifanio left16:44
← mlechner left16:44
← mikiones left16:44
← blubberbop left16:45
→ ashu11 joined16:45
→ TomyLobo joined16:45
← dm7freek_ left16:46
← bgerber left16:46
→ r0tha joined16:46
← D-Boy left16:46
→ CheckDavid joined16:46
← imanzarrabian left16:47
→ jadne joined16:48
← lb1a left16:48
→ twoface88 joined16:49
→ epifanio joined16:50
→ milesmatthias joined16:50
→ bb010g joined16:50
→ Takle joined16:50
→ lsiv568 joined16:50
← Terabyte left16:51
→ zenith_ joined16:52
→ D-Boy joined16:52
→ EminenceHC joined16:52
→ Terabyte joined16:52
gitinfo set mode: +v16:53
→ craigp joined16:53
← rubyonrailed left16:53
→ in_deep_thought joined16:53
← craigp left16:53
→ rubyonrailed joined16:53
← zquad left16:53
Seveas Toba: git subtree might help too (git subtree split)16:54
← prestorium left16:54
→ KeiKun joined16:54
KeiKun anyone uses git for windows here?16:54
→ mtakkman joined16:54
→ einmalfel joined16:54
→ prestorium joined16:55
→ CKyle joined16:57
← bonswouar left16:57
← EminenceHC left16:57
→ gopar joined16:58
← Deseaus left16:58
← hobodave_ left16:58
→ enterprisedc joined16:58
→ hobodave joined16:59
← The_Phoenix left16:59
→ t4nk868 joined16:59
← bollullera left17:00
→ anon0239 joined17:00
→ Jackneill joined17:01
gitinfo set mode: +v17:01
t4nk868 hey guys, I have a corrupted repo that HEAD points to a repo that git doesn't think exists17:01
→ EvilPenguin joined17:01
→ pm90_ joined17:01
→ gsingh93 joined17:02
← jottr left17:02
← editshare-ericf left17:02
→ pheaver joined17:02
_ikke_ t4nk868: What is the exact error you get?17:02
→ Gizburdt joined17:02
gitinfo set mode: +v17:02
← Gizburdt left17:03
→ DrShoggoth joined17:03
→ vixterra joined17:03
→ kpease_ joined17:04
anon0239 Hello, quite a newbie here. The boss tasked me with setting up Git since we had no version control system at all here. Got a question, How would you recommend going about maintaining a production and development system for a live web application?17:04
→ iamjarvo joined17:04
← iamjarvo left17:05
← NoOova left17:05
→ Zupoman joined17:05
← Zupoman left17:05
→ Zupoman joined17:05
→ iamjarvo joined17:05
→ tyreld joined17:05
→ scientes joined17:06
← scientes left17:06
→ scientes joined17:06
← kpease left17:07
→ iliketurtles joined17:07
← scientes left17:07
→ scientes joined17:07
← scientes left17:07
→ scientes joined17:07
→ tieTYT2 joined17:07
← scientes left17:08
eXeC64 anon0239: Have two main branches, master is production, develop for the development/testing system. To start working on a bugfix/feature, create a branch off the tip of master, and work on that. To deploy for testing, merge that branch into develop. All work happens on the feature branch. Once you're satisfied it's ready, merge it into the master branch and you can delete the feature branch.17:08
→ scientes joined17:08
← scientes left17:08
→ scientes joined17:08
eXeC64 Periodically reset the develop branch to be the same as master - to stop them getting too out of sync17:08
→ aartist joined17:08
eXeC64 anon0239: A bit like this: http://nvie.com/posts/a-successful-git-branching-model/17:09
anon0239 I'm actually looking at that very same link right now, haha!17:09
eXeC64 The big difference between what I described and what that shows is they merge develop into master. If you consider develop to be an unstable amalgamation of everyone's WIP stuff you should never be merging it into master. Only ever merge completed and tested stuff into master :)17:10
It's the workflow I use at work17:10
anon0239 There's another thing I'm a bit concerned about. How exactly does deployment work with the web servers? Do you have to go through another piece of software or something? The current workflow we have for deploying is basically drag and drop all of the changed files into the application's directory on the production server17:11
and admittedly, that has caused a few issues in the past. People slip and forget critical files or deploy outdated ones17:11
→ martinbmadsen joined17:11
_ikke_ anon0239: Use a proper deployment system17:12
anon0239 We are not a tech company by any means, just internal IT developing business applications for use in the other departments :x17:12
_ikke_ Something automated, so that it does the same steps every time17:13
anon0239 Any recommendations for PHP in particular?17:13
inb4 gross, php17:13
← topcat left17:13
_ikke_ I use it myself17:13
but I got to go17:13
eXeC64 anon0239: You can use change hooks to trigger something to happen when changes are pushed to a repo. So, the production server may have a git repo somewhere that on receiving changes, runs a script that stops your application, copies the new files in place, then restarts it.17:13
There's a lot of approaches17:13
← th3fallen left17:13
_ikke_ I would not use hooks for deployment imo17:14
→ th3fallen joined17:14
eXeC64 I've never set up automatic deployment myself tbh, so don't consider me an expert17:14
I imagine this is a solved problem though, so I'd google a bit about the different approaches available17:14
anon0239 Yeah, tbh, given our dev process, I wouldn't want it to be fully automated. At least a button push to start the deploy17:15
eXeC64 what you really *dont* want to do is just have a git repo in your /var/public_http directory17:15
anon0239 Haha, I can imagine that'd be bad17:15
eXeC64 since the internals of git (i.e. all your data, including sensitive files) would be exposed at example.com/.git/17:15
→ MechtiIde joined17:16
eXeC64 it happens more often than you'd expect17:16
← freimatz left17:16
← ORiON-- left17:16
← Guest89586 left17:16
→ Guest89586 joined17:16
Guest89586 → daynaskully17:16
← martinbmadsen left17:16
eXeC64 Anyway, I've got to dash now. Good luck!17:16
anon0239 You could probably configure htaccess to deny for .git17:16
Thanks!17:16
← psoo left17:17
← twoface88 left17:17
→ Alex27121 joined17:17
← t4nk868 left17:18
← cbonobo left17:18
→ ORiON-- joined17:18
→ cbonobo joined17:18
→ evia joined17:18
→ thevishy joined17:19
→ basiclaser joined17:19
→ lbv-user joined17:20
← cdown left17:21
→ Hestil joined17:21
→ Noldorin joined17:21
→ cdown joined17:21
← Es0teric left17:22
→ Arsonide joined17:22
← LBV_User left17:22
→ denete joined17:22
← danjordan left17:22
← lbv-user left17:23
→ m0viefreak joined17:23
→ LBV_User joined17:23
→ nikio_ joined17:23
← lsiv568 left17:23
→ joel_falcou joined17:23
→ robarelli joined17:24
→ hyperair joined17:26
← iliketurtles left17:26
← stylo_ left17:26
← Cust0sL1men left17:26
→ Es0teric joined17:26
→ craigp joined17:26
→ stylo joined17:27
→ Lady_Aleena joined17:27
← edude03 left17:27
← zackiv31 left17:28
← hardenedapple left17:28
← pm90_ left17:29
Lady_Aleena Hello. I am trying to use git to upload files to my GitHub repository. When I did "git add index.pl" I got the error "fatal: Not a git repository (or any of the parent directories): .git". If I can't add files with "git add", how do I add files?17:29
← robarelli left17:29
→ ropav joined17:29
→ pm90_ joined17:29
← ORiON-- left17:30
Lady_Aleena I don't want to add EVERYTHING in the directory just certain files and directories.17:30
← ghostpl_ left17:30
→ vurma joined17:30
johtso okay, I'm in a bit of a pickle with a lost stash.. I popped it in sourcetree and it wasn't applied and the stash disappeared. when I was trying to apply it from the command line I was just getting a message saying that it was auto-merging something non relevant and there was a conflict17:31
← sudshekhar left17:31
canton7 Lady_Aleena, as the error message says, you're not in a git repository17:31
do you know what a git repository is?17:31
← cllamas left17:31
johtso now I'm running commands to try and find a dangling stash commit, and I'm seeing various "fatal: unable to parse commit" and "error: Could not read" errors..17:31
← pecg left17:31
Lady_Aleena canton7, is there a way to add files to my GitHub repository without having a repository on my computer?17:32
canton7 Lady_Aleena, no. that's not how git works17:32
read !book17:32
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable17:32
→ sudshekhar joined17:32
johtso so one question, does anyone know if there's a way of finding what REFs sourcetree recently popped?17:32
and do those error messages indicate some kind of curruption?17:32
Lady_Aleena Okay, it looks like I have no choice but to use the web interface and copy and paste them.17:32
johtso and.. what's the best way forward from here? :(17:32
← MattHardcastle left17:33
canton7 Lady_Aleena, or you can create a local git repo, the way you're supposed to do it :P17:33
→ jonmorehouse joined17:33
Lady_Aleena canton7, I don't want anything that happens on GitHub to be connected to my local files.17:34
→ mihaicris joined17:34
canton7 ... I think you should probably read up on git a bit before trying to use it17:34
← mikecmpbll left17:34
kpease_ → kpease17:34
tbsaunde Lady_Aleena: but you want to put some of your local files on github17:35
← SoFLy left17:35
Lady_Aleena canton7, it looks like I won't be using git. I will have to create the repository one file at a time on GitHub's site.17:35
kpease → kpease_17:35
← liamkeily left17:36
→ edude03 joined17:36
→ ghostpl_ joined17:36
canton7 Lady_Aleena, that's like trying to drive a car while refusing to sit in the driver's seat17:36
Lady_Aleena tbsaunde, yes I do, however, it looks like git won't work the way I was hoping it would.17:36
canton7 you're deliberately choosing the very painful path, for no good reason17:36
Lady_Aleena If GitHub had FTP or SFTP I would be able to use FileZilla to upload the files.17:37
← jontmorehouse left17:37
canton7 github isn't a file hosting site17:37
← mellernoia left17:37
→ skylite joined17:37
→ RootedBox joined17:37
canton7 it's a *git repository* hosting site17:37
it's not meant for arbitary file hosting. that's not the point.17:37
→ ORiON-- joined17:37
johtso I've found a way to see a log of sourcetree's commands.. and the offending command that nuked my stash does not have the ref in the output..17:38
canton7 it's meant to host *git repositories*. If you refuse to work with git repositories, why on earth as you using Github?17:38
→ grazfather joined17:38
→ Sam-T joined17:38
← zturner left17:38
johtso it just says auto-merging.. conflict.. and then it nuked the commit17:38
→ zturner joined17:38
canton7 it should leave the index in a conflicted state17:38
ldlework Lady_Aleena: you're extremely confused17:38
canton7 .. and the stash don't be popped - it will remain stashed17:38
grazfather is there a way to chain aliases? e.g. I have a nice oneline log at `git hist`. How do I make a second alias like `git hista` which just does `git hist --all`?17:39
gitinfo set mode: +v17:39
johtso canton7: my stash commit definitely disappeared17:39
← settermjd left17:39
canton7 johtso, are you sure it isn't in 'git stash list'?17:39
zturner Is there any way to make git reject a commit that has whitespace errors? core.whitespace only seems to make it highlight them in diffs17:39
canton7 zturner, man githooks17:39
gitinfo zturner: the githooks manpage is available at http://jk.gs/githooks.html17:39
← jwhisnant left17:39
→ nour__ joined17:39
→ mikecmpbll joined17:40
qsuscs anon0239: !deploy, or jenkins seems to be popular17:40
gitinfo anon0239: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html17:40
PabloVidela hi everybody17:40
qsuscs or travis17:40
PabloVidela a question17:40
i put in the ignore file17:41
→ jwhisnant joined17:41
← ki0_ left17:41
PabloVidela *.log17:41
← tier left17:41
→ tier_ joined17:41
qsuscs zturner: IIRC there is a sample in .git/hooks/pre-commit.sample17:41
PabloVidela how can i see in the command git the ignore files?17:41
← jerius left17:41
← jonmorehouse left17:41
→ doev joined17:41
← Vadimus left17:42
→ zackiv31 joined17:42
→ sin3t joined17:42
→ Gizburdt joined17:42
→ Embassy2 joined17:43
johtso how do I show git stash list with the refs of the commits?17:43
grazfather is there a way to chain aliases? e.g. I have a nice oneline log at `git hist`. How do I make a second alias like `git hista` which just does `git hist --all`?17:43
qsuscs grazfather: !tias17:43
gitinfo grazfather: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.17:43
johtso I'm worried it's going to nuke more commits so want to make sure I have a copy of the refs17:43
anon0239 gitinfo: Thanks!, I'll look at that right now17:43
gitinfo anon0239: you're welcome, but please note that I'm a bot. I'm not programmed to care.17:43
grazfather I tried the obvious way17:43
anon0239 Well, that's pretty funny17:44
grazfather no bueno17:44
MTecknology I'm doing something dumb here. I just want to create a new branch that (for the moment) is identical to the other. warning: remote HEAD refers to nonexistent ref, unable to checkout.17:44
PabloVidela i have *.log in the ignore files, but if a put "git add ." this add me the log files!!!17:44
MTecknology warning: remote HEAD refers to nonexistent ref, unable to checkout.17:44
sorry, keep trying to paste the link .. http://dpaste.com/1YKTR0B17:44
qsuscs grazfather: idea: peek into the config file (likely ~/.gitconfig), is the definition of the alias using the other one before or after that one?17:44
kpease_ → kpease17:44
→ eletuchy joined17:45
← denete left17:46
← prestorium left17:46
← PragCypher left17:46
kpease → kpease_17:46
→ bronson joined17:47
→ prestorium joined17:47
← phantomtiger left17:47
→ King_Hual joined17:47
← bennigraf left17:47
→ iliketurtles joined17:48
qsuscs MTecknology: paste git ls-remote -h origin and/or git branch -a please17:48
→ ParsectiX joined17:49
← EvilPenguin left17:49
← doev left17:50
grazfather qsuscs: After. Expansion of alias 'hista' failed; 'hist' is not a git command. Not too big of a deal I can just make it a bash alias17:50
→ moskiteau_ joined17:50
→ smccarthy joined17:51
qsuscs grazfather: which version of git do you run?17:51
→ Literphor joined17:51
MTecknology qsuscs: I did 'git checkout prod; git push -u origin prod; git checkout -b test; git push -u origin test' and it started behaving correctly. With git branch -a, any 'remotes/origin/*' is displayed in red. I'm not sure if that's normal. http://dpaste.com/2YK8XVZ17:51
→ MacWinner joined17:51
← MacWinner left17:51
grazfather 2.3.017:51
← Zoddo left17:51
← moskiteau_ left17:51
→ lsiv568 joined17:51
← bronson left17:52
← mtakkman left17:52
MTecknology looks like that is normal17:52
qsuscs: thanks! :)17:52
→ ckruczek joined17:53
← Gizburdt left17:53
← ome left17:53
← iliketurtles left17:53
johtso Is it not possible to see stashes in the reflog?17:54
→ moskiteau joined17:54
moskiteau hello17:54
→ Gizburdt joined17:55
→ Xethron joined17:55
← Gizburdt left17:55
moskiteau I have a big git project where there is multiple apps and plugins in it. I would like to divise it but still keep the history of commits. Is there any way?17:55
← aartist left17:56
kpease_ → kpease17:57
→ baweaver joined17:57
← ethikz left17:57
← zenith_ left17:57
→ iliketurtles joined17:58
grazfather moskiteau: Git filter-branch17:58
← SeriousMatters left17:59
← cavallari left17:59
← subhojit777 left17:59
moskiteau git filter-branch --prune-empty --index-filter 'git rm --cached --ignore-unmatch DIR_1/* DIR_2/*' HEAD17:59
thanks17:59
→ jceb joined17:59
← Una left18:01
→ sparetire_ joined18:01
← jaznow left18:02
→ cavallari joined18:02
→ irqq_ joined18:03
→ Oebele joined18:04
← CKyle left18:04
→ jottr joined18:05
→ tmager joined18:05
← baweaver left18:05
← irqq left18:05
→ irqq joined18:06
→ EminenceHC joined18:06
kpease → kpease_18:06
→ Trudko joined18:07
← aswen left18:07
← ParsectiX left18:07
→ irqq__ joined18:08
→ ParsectiX joined18:08
→ jerius joined18:09
← scientes left18:09
→ hahuang65 joined18:09
← irqq_ left18:09
→ otter768 joined18:10
← jakobhans left18:10
← irqq left18:11
→ Una joined18:11
→ RaceCondition joined18:12
→ KevinTS joined18:12
→ CKyle joined18:12
→ jonmorehouse joined18:12
← iliketurtles left18:14
← Lady_Aleena left18:14
→ iliketurtles joined18:14
→ jontmorehouse joined18:14
← KevinTS left18:14
← otter768 left18:14
← RaceCondition left18:15
← grazfather left18:16
← EminenceHC left18:16
→ grazfather joined18:16
← Es0teric left18:16
→ RaceCondition joined18:16
→ Es0teric joined18:16
← jadne left18:17
→ jaznow joined18:17
← jaznow left18:17
← inamoriti left18:17
← im8bit_ left18:18
← jonmorehouse left18:18
← Embassy2 left18:18
← Es0teric left18:18
gitinfo set mode: +v18:19
← petersr left18:19
johtso is it possible to see a reflog that includes operations on stashes?18:19
→ Es0teric joined18:20
← jottr left18:20
← ropav left18:20
← craigp left18:21
→ ropav joined18:21
ojacobson the stash is stored almost entirely in the reflog for refs/stash18:21
so, mostly no, because things like 'git stash pop' _destroy_ reflog entries :)18:21
← _Vi left18:23
← tmager left18:23
→ govg joined18:23
→ berz3rk joined18:25
→ Embassy2 joined18:25
→ robarelli joined18:25
kpease_ → kpease18:25
→ phantomtiger joined18:26
← RaceCondition left18:27
→ Gizburdt joined18:28
← ology left18:28
← Una left18:28
→ imanzarrabian joined18:29
kpease → kpease_18:29
→ dm7freek joined18:29
← epifanio left18:29
← imanzarrabian left18:29
← thibaultcha left18:30
← robarelli left18:30
← marcogmonteiro left18:30
→ thibaultcha_ joined18:30
← PCatinean left18:31
← Embassy2 left18:31
→ sentriz joined18:32
← dm7freek left18:34
→ cavallari1 joined18:35
→ liamkeily joined18:35
← AnujSharma left18:37
thibaultcha_ → thibaultcha18:37
→ craigp joined18:37
→ ki0 joined18:38
← cavallari left18:39
→ cavallari joined18:39
→ Embassy2 joined18:39
← cavallari1 left18:40
← iliketurtles left18:40
← tvw left18:40
→ ItSANgo joined18:41
← nilg left18:42
← ki0 left18:42
← sentriz left18:43
← ashu11 left18:44
← ropav left18:44
← ORiON-- left18:44
← thierryp left18:44
← prestorium left18:45
→ scientes joined18:45
← scientes left18:45
→ scientes joined18:45
→ mikiones joined18:45
← Takle left18:45
→ ORiON-- joined18:46
→ bronson joined18:46
→ zenith_ joined18:46
→ Takle joined18:46
← Takle left18:46
→ ropav joined18:47
← roentgen left18:47
→ roentgen joined18:48
← irqq__ left18:48
← roentgen left18:48
→ roentgen joined18:48
← kpease_ left18:49
→ denete joined18:49
← denete left18:49
→ kpease joined18:50
→ denete joined18:50
→ nilg joined18:50
← mikiones left18:50
← encod3 left18:50
← ORiON-- left18:50
← denete left18:50
→ ORiON-- joined18:51
← Dragooon left18:51
→ Lovich-- joined18:51
→ dreiss joined18:51
→ denete joined18:51
← tier_ left18:51
→ regedit joined18:52
← Xtreme left18:52
← lsiv568 left18:52
← Lovich left18:52
→ oojacoboo joined18:53
← liamkeily left18:53
← ropav left18:53
→ pantsman- joined18:53
→ lsiv568 joined18:54
→ tier joined18:54
← roentgen left18:54
← Lovich-- left18:55
← Gizburdt left18:55
→ roelmonnens joined18:55
→ crestbook joined18:55
← Xethron left18:55
→ Gizburdt joined18:57
← tier left18:57
← lamont left18:57
→ tier joined18:57
→ lamont joined18:57
← zadock left18:58
← craigp left18:58
← dc5ala left18:59
← ghostpl_ left18:59
→ kyugyi joined18:59
→ tier_ joined18:59
→ zenith__ joined19:00
→ lpax joined19:00
→ craigp joined19:00
→ bronson_ joined19:00
← kyugyi left19:00
→ martinbmadsen joined19:00
→ Smashcat joined19:01
← danguafer left19:01
→ JSharpe joined19:01
Smashcat Hi, got a problem with a git repo, with a remote on github. When I try to push updates, it throws an error "Updates were rejected because a pushed branch tip is behind its remote counterpart". This is wrong in itself, but attempting to use "git pull" I get no updates. But the same error when attempting to push again.19:02
← bronson left19:02
← soc42 left19:02
→ tanuck joined19:02
Smashcat Is it best to just use the -f force flag to push updates to github?19:02
kadoban Smashcat: Well, sounds like it's behaving consistently then, why do you doubt the truth of what it says?19:02
Smashcat Because I'm the only person making changes to that repo. And I know there are no other commits.19:03
kadoban Smashcat: Sounds like you wouldn't be forcing updates, you'd be forcing….the opposite of updates.19:03
← zenith_ left19:03
← tier left19:03
→ _Vi joined19:03
Smashcat So anyway, best to use -f force?19:03
← Gizburdt left19:03
→ kyugyi joined19:03
← lsiv568 left19:03
← ORiON-- left19:03
→ nour_ joined19:03
kadoban Smashcat: Well, see what it thinks is new on the remote that you don't have. git log ^HEAD @{u} or something19:03
← kyugyi left19:04
→ kyugyi joined19:04
→ Gizburdt joined19:04
→ ORiON-- joined19:04
← kyugyi left19:04
kadoban Smashcat: No, I wouldn't advise that. If you don't know what's going on, using '-f' is like smashing it with a sledgehammer because the circle block won't go through the square spot on the toy.19:04
Smashcat But using -f will ensure the remote is the same as my local copy right?19:05
anon0239 You mean that isn't what you're supposed to do? Where has my childhood gone19:05
← martinbmadsen left19:05
qsuscs oh just !visualize it19:05
gitinfo You can visualize whole repo graph with gitk GUI viewer (gitk --all HEAD) or !lol for terminal view (git log --oneline --graph --decorate --all)19:05
kadoban has lost hope that his advice is going to result in a useful result, and wanders off19:05
Smashcat :)19:05
→ MacWinner joined19:06
qsuscs Smashcat: also, !best19:06
gitinfo Smashcat: [!bestway] You want to know the best way to do X? If you can give us a proper definition of "best", we'll give you a proper way to do X ;)19:06
kadoban anon0239: :) I would imagine it's probably fun that way at least, haha.19:06
Smashcat git log ^HEAD shows nothing, btw19:06
← nour__ left19:07
← milesmatthias left19:07
→ rath joined19:07
→ boombatower joined19:08
← boombatower left19:08
→ boombatower joined19:08
→ milesmatthias joined19:08
← ORiON-- left19:09
→ editshare-ericf joined19:09
→ Barryd joined19:09
→ StefanLehmann_ joined19:09
→ yn5 joined19:09
← c74d left19:09
gitinfo set mode: +v19:10
ckruczek Smashcat: Do a 'git remote update' and than 'git log ^HEAD @{u}' does this show anything?19:10
→ ORiON-- joined19:10
← sokoll left19:10
← devoldmx3 left19:10
← in_deep_thought left19:10
Smashcat Ah right the update is failing with {url} not found: did you run git update-server-info on the server?19:11
← StefanLehmann left19:11
← BombStrike left19:11
→ c74d joined19:11
Smashcat I'll start a new repo - cheers :)19:11
kadoban Smashcat: That's not the command I suggested.19:11
← boombatower left19:11
→ Maerc joined19:11
← Asiajey left19:12
→ boombatower joined19:12
← boombatower left19:12
→ boombatower joined19:12
→ mizu_no_oto joined19:12
← zenith__ left19:12
ckruczek well starting a new repo would solve the problem if you encounter it next time. solving the real problem and not only the symptoms would be the choice :)19:13
→ roentgen joined19:13
→ BombStrike joined19:13
← yn5 left19:13
→ sokoll joined19:14
Smashcat Yeah :) Usually use svn. Someone wanted this project moved to git, so was just pushing everything, so the remote is empty at the moment.19:14
→ lsiv568 joined19:14
← craigp left19:15
→ paulweb5151 joined19:15
Remram Should I always use annotated tags?19:15
Seveas no19:15
ckruczek please dont try to adapt your svn knowledge to git, you will fail.19:15
← paulweb515 left19:16
← oojacoboo left19:16
Remram Should I always use lightweight tags?19:16
qsuscs Seveas: just because you don’t …19:16
← lsiv568 left19:16
Seveas no19:16
qsuscs Remram: depends. what do you intend?19:16
Seveas you should use what's appropriate at the moment.19:16
Remram What should I do #git?19:16
Smashcat ckruczek: I'm not :)19:16
Remram I don't "intend" anything other than adding a tag19:16
Seveas Quickly tagging a commit to revert to after experimenting doesn't need to be annotated19:16
ckruczek Smashcat: good boy :P19:16
Remram no this is an actual tag that will be published19:16
Seveas annotating (and signing) release tags is more common19:16
Remram we've reached a milestone, we'll create releases from this version19:16
Seveas but not everyone does it. Do whatever tickles your fancy :)19:17
→ jottr joined19:17
Seveas and don't listen to qsuscs, he's just grumpy because I haven't yet fixed all the bugs he reported :)19:17
Remram I've always used annotated tags but I don't know why19:17
→ liamkeily joined19:17
→ tmager joined19:17
← tmager left19:17
qsuscs Seveas: thou shalt be excused19:17
Remram: because everyone except Seveas recommends annotated tags for releases19:18
ckruczek lol19:18
→ thiago joined19:18
→ jaznow joined19:18
← paulweb5151 left19:18
Remram qsuscs: what is the rationale behind this, except from everyone says so?19:18
ckruczek why wouldnt you use annotated tags for releases?19:18
Remram ckruczek: why would you?19:18
← thiago left19:18
→ thiago joined19:18
← Gizburdt left19:18
→ paulweb515 joined19:18
Seveas exactly :)19:18
→ osxi joined19:19
ckruczek sorry I meant qsuscs Remram19:19
Remram I sign my own tags but in this case they will probably not be a signature19:19
→ metts joined19:19
→ Gizburdt joined19:19
← anon0239 left19:19
Seveas The only sensible rationale so far is signing release tags. Other than that, I'm on "meh".19:19
And since I don't sign releases anyway, "meh" is still where I'm at19:19
qsuscs Seveas: you should.19:20
Seveas why?19:20
qsuscs just to make git describe workout without further arguments19:20
Seveas hm. That's actually a decent point.19:20
qsuscs Remram: there you go.19:20
Remram git describe doesn't use lightweight tags without --tags19:20
that's a good reason19:21
is that the only reason?19:21
← tritone left19:21
← jottr left19:21
qsuscs hmm what does the !book say on tags?19:21
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 !parable19:21
→ ghostpl_ joined19:21
Seveas I think github only shows releases for annotated tags19:21
qsuscs Annotated tags, however, are stored as full objects in the Git database. They’re checksummed; contain the tagger name, e-mail, and date; have a tagging message; and can be signed and verified with GNU Privacy Guard (GPG). It’s generally recommended that you create annotated tags so you can have all this information; but if you want a temporary tag or for some reason don’t want to keep the other19:22
Seveas but that may not be true, and is only televant for github anyway19:22
qsuscs information, lightweight tags are available too.19:22
← ghostpl_ left19:22
Remram oh yeah, date and author19:22
→ tritone joined19:22
→ baweaver joined19:22
← jaznow left19:22
→ ology joined19:23
← Trudko left19:23
← tanuck left19:23
← metts left19:24
→ craigp joined19:24
→ encod3 joined19:24
→ erandros joined19:25
← Kulrak left19:26
← bronson_ left19:26
← Briman|off left19:26
← teran left19:26
→ oojacoboo joined19:26
→ liamonade joined19:26
→ martinbmadsen joined19:27
← SegFaultAX left19:27
← Aune left19:27
← paulweb515 left19:27
← liamkeily left19:27
← ORiON-- left19:28
← CLaxware left19:28
← cdown left19:28
→ cdown joined19:29
→ Briman|off joined19:29
→ Lovich joined19:29
→ SegFaultAX joined19:29
→ metts joined19:30
← mrgrieves left19:31
← tritone left19:31
← nilg left19:32
← jayeshsolanki left19:32
→ CLaxware joined19:32
→ tritone joined19:32
← ology left19:33
→ ropav joined19:33
← cdown left19:34
← metts left19:34
← ser_berry left19:35
→ ORiON-- joined19:35
→ shudon joined19:35
← CKyle left19:35
shudon hi all :) slightly OT question: when NOT using git, what command-line diff tool produces the fanciest output? i like colordiff, but if i have a line that is changed, but only 1 byte in 100 is changed, i would like that portion to be highlighted (as best as it can tell, anyway.) any recommendations? :D19:36
← c74d left19:36
← eletuchy left19:36
→ sr_berry joined19:36
→ eletuchy joined19:37
→ durham_ joined19:37
sr_berry → ser_berry19:37
qsuscs shudon: git diff19:37
Seveas shudon: wdiff + colordiff?19:37
← nixter1029 left19:37
← Hello71 left19:37
shudon checks19:37
Seveas or git diff19:38
← ams__ left19:38
← DSH105 left19:38
Seveas it works for comparing random files too19:38
→ c74d joined19:38
→ ojacobson_ joined19:38
← duderonomy left19:38
← martinbmadsen left19:38
→ leolrrj joined19:38
→ ki0 joined19:38
→ liam1 joined19:38
shudon oh, neat19:38
→ jottr joined19:38
← edenist left19:39
← blackjid left19:39
← CheckDavid left19:39
← Fissure left19:39
← Klumben left19:39
← dreiss left19:39
← durham left19:39
← neunon left19:39
← johtso left19:39
← bandroidx left19:39
→ Kulrak joined19:40
← Kulrak left19:40
→ Kulrak joined19:40
→ nixter1029 joined19:40
→ Klumben joined19:40
← liamonade left19:40
← Gizburdt left19:40
→ Hello71 joined19:40
→ ams__ joined19:40
→ DSH105 joined19:40
→ edenist joined19:40
← KeiKun left19:40
→ Gizburdt joined19:40
→ bandroidx joined19:40
→ neunon joined19:40
← leolrrj left19:40
shudon with wdiff, there doesn't seem to be a way for it to get diff-style output. it seems to print out the entire "merged" input with annotations as to the individual changes. is there any way to increase the signal-to-noise ratio?19:40
oh wait... i think it has an option for it...19:41
← ojacobson left19:41
→ KeiKun joined19:41
← PaulCapestany left19:41
→ dreiss joined19:41
→ blackjid joined19:41
→ Fissure joined19:41
shudon lol... i tried diff $1 $2 | wdiff | colordiff19:41
→ NosBit joined19:42
shudon but colordiff goes back to traditional line-based highlighting in this case19:42
→ johtso joined19:42
← NosBit left19:42
← erandros left19:42
shudon wdiff -d that is19:42
→ PaulCapestany joined19:42
→ jxpx777_ joined19:42
← AaronMT left19:43
← ki0 left19:43
← evia left19:43
← ser_berry left19:43
← PaulCapestany left19:43
→ AaronMT joined19:43
→ PaulCapestany joined19:44
→ Exhem joined19:44
→ chrisshattuck joined19:44
← StuartMI left19:44
→ skirk joined19:45
← KeiKun left19:45
→ ser_berry joined19:45
→ thierryp joined19:45
→ KeiKun joined19:45
shudon Seveas: wdiff doesn't seem to do anything to avoid confusion: https://pastebin.mozilla.org/882632619:46
oh well, i still think it's my best option. thanks guys :)19:46
← lpax left19:46
← Exhem left19:46
← jxpx777 left19:46
→ JereZiah joined19:47
→ jonmorehouse joined19:47
→ lpax joined19:48
← jontmorehouse left19:48
← JereZiah left19:48
← jason237 left19:48
← CLaxware left19:48
→ warrickFL joined19:48
← skirk left19:48
→ JereZiah joined19:48
← JereZiah left19:49
← Gizburdt left19:49
← thierryp left19:49
→ CLaxware joined19:49
→ Gizburdt joined19:49
← Smashcat left19:50
→ Viy joined19:50
← PaulCapestany left19:51
← nnyk left19:53
→ PaulCapestany joined19:53
← Viy left19:53
← Maerc left19:54
← chrisshattuck left19:54
← Hello71 left19:56
→ m8 joined19:56
→ ManikM joined19:56
← sarbs left19:57
→ Hello71 joined19:57
← axisys left19:57
← DSH105 left19:57
← edenist left19:57
← reinrag left19:57
← SleePy left19:57
← roger_raymond left19:57
→ aush joined19:58
← Klumben left19:58
→ DSH105 joined19:58
→ sarbs joined19:58
c74d → Guest7869619:58
← Guest78696 left19:58
→ StuartMI joined19:58
→ devoldmx joined19:59
← johtso left19:59
→ reinrag joined19:59
→ c74d3 joined20:00
→ SleePy joined20:00
← SleePy left20:00
→ roger_raymond joined20:00
← milesmatthias left20:00
→ SleePy joined20:00
→ edenist joined20:00
→ Tekilla joined20:00
→ JereZiah joined20:00
→ Tekila_ joined20:00
← Tekilla left20:01
→ milesmatthias joined20:01
← scientes left20:01
← JereZiah left20:01
→ Klumben joined20:01
← IrishPrime left20:01
→ bronson joined20:01
→ johtso joined20:02
→ thierryp joined20:03
← rubyonrailed left20:03
→ skylite_ joined20:03
→ in_deep_thought joined20:03
→ settermjd joined20:04
→ devoldmx3 joined20:04
← ignas left20:04
→ EminenceHC joined20:04
← Gizburdt left20:04
← baweaver left20:04
→ Gizburdt joined20:05
→ MagePsycho joined20:05
← milesmatthias left20:05
→ paulweb515 joined20:05
→ yn5 joined20:05
← Davey left20:05
← c74d3 left20:06
→ bgerber joined20:06
→ ncd|leeN joined20:06
← skylite left20:06
← Literphor left20:06
← MagePsycho left20:06
→ c74d joined20:06
→ erandros joined20:07
← erandros left20:07
→ wanderer101012 joined20:07
← devoldmx left20:08
→ Davey joined20:08
→ teran joined20:08
→ baweaver joined20:09
← EminenceHC left20:09
← wanderer101012 left20:09
→ wanderer101010 joined20:09
← leeN left20:09
→ MagePsycho joined20:10
← settermjd left20:10
→ jolg42 joined20:10
← nour_ left20:11
← tristanp left20:11
→ otter768 joined20:11
← Jackneill left20:12
→ irqq joined20:12
→ milesmatthias joined20:13
→ JereZiah joined20:14
← JereZiah left20:15
← tieTYT2 left20:15
ajf- How can I ammend my commits if I have changed my user name and email ?20:15
← otter768 left20:15
→ DolphinDreamm joined20:15
_ikke_ ajf-: how many commits?20:15
→ JereZiah joined20:16
ajf- _ikke_: 220:16
→ scientes joined20:16
← scientes left20:16
→ scientes joined20:16
→ Takle joined20:16
← JereZiah left20:16
← roelmonnens left20:16
← lqi left20:16
← scientes left20:17
← in_deep_thought left20:17
_ikke_ git filter-branch --env-filter can do it, but I'm not sure if you're supposed to give it a script20:18
← Takle left20:18
← m1dnight_ left20:18
→ Uqwp joined20:18
→ dm7freek joined20:18
ajf- I need a --bare clone for that?20:18
kadoban I guess you could use filter-branch, but that sounds like overkill… you could --amend --reset-author I guess, but that's only one commit. If it was me, I'd probably just undo the commits and make them again, like 'git reset --soft HEAD~2' I guess and then commit what I want. I think --soft I the one I mean, not sure though.20:18
← mihaicris left20:19
→ scientes joined20:19
← scientes left20:19
→ scientes joined20:19
→ m1dnight_ joined20:19
← scientes left20:19
← aush left20:19
← mnathani__ left20:20
→ endiruna joined20:20
→ in_deep_thought joined20:20
→ mnathani_ joined20:20
gitinfo set mode: +v20:21
iveqy ajf-: I should have used rebase -i20:21
→ jason237 joined20:21
→ scientes joined20:21
← scientes left20:21
→ scientes joined20:21
RootedBox Would anyone know where to find support for installing something like this https://github.com/Cyerus/phpbb-ext-evesso20:21
Seveas RootedBox: #phpbb perhaps?20:22
→ lsiv568 joined20:22
← absk007 left20:22
← Uqwp left20:22
RootedBox No support for extentions there :(20:22
← lsiv568 left20:22
iveqy RootedBox: but they should be able to help you better than we can. We know git, not phpbb..20:23
kadoban RootedBox: Heh, well I'm pretty sure we don't support PHP here either.20:23
→ lsiv568 joined20:23
RootedBox rgr thanks for ur time20:23
→ anchorite joined20:23
← dm7freek left20:23
iveqy RootedBox: have you read how to ask questions the smart way?20:23
qsuscs yes, and nobody in here likes php anyway, right? rrrrright?20:23
← Gama11 left20:24
iveqy qsuscs: ;)20:24
qsuscs glares at some people who know they are being glared at20:24
kadoban lol, poor iveqy20:24
← Arsonide left20:24
→ netcarver joined20:24
qsuscs there’s a nuthouse some kilometers away …20:24
it’s on an island even20:25
ajf- RootedBox: i'd say in the repository20:25
iveqy qsuscs: well, we're almost neighbours, just some waters in between :)20:25
→ Bueza joined20:25
← Bueza left20:26
→ WaReZ joined20:26
qsuscs if you count rivers …20:26
→ tieTYT2 joined20:27
← tieTYT2 left20:27
qsuscs but well, there’s the öresund bridge20:27
→ teran_ joined20:27
→ Qoxv joined20:27
← stylo left20:28
→ stylo joined20:28
iveqy qsuscs: yeah, problem is, the bridge stop halfway20:28
Seveas I love php20:28
someone needs to be the bad example20:28
qsuscs Seveas: well you are dutch. you are excused for almost everything.20:29
← skylite_ left20:29
_ikke_ is he?20:29
→ danzilio joined20:29
qsuscs i think so20:29
→ gebjgd joined20:29
iveqy qsuscs: they try really hard to market it as the Öresund connection, (since it's a bridge and a tunnel) but they don't really succeed...20:29
Seveas qsuscs: I didn't know the dutch have htat much power :)20:29
← jerius left20:29
_ikke_ whistles20:29
← danzilio left20:29
→ tanuck joined20:30
← teran left20:30
_ikke_ Seveas: oooh20:30
qsuscs iveqy: well i’m from the very southern end of germany, i dunno what they’re doing up there :320:30
← tanuck left20:30
_ikke_ Seveas: Aparently you have sent me mail20:30
→ danzilio joined20:30
← Grimlock1 left20:30
Seveas _ikke_: that may be true. I have been known to send mail.20:30
← bgerber left20:30
← Dorf left20:30
Seveas qsuscs: oh, you're bavarian? That explains so much....20:30
_ikke_ Seveas: git rev-list --bisect --first-parent20:31
qsuscs Seveas: i take that as an insult20:31
south-WEST20:31
iveqy qsuscs: I'm from the southern tip of Sweden. Btw. how come a whois on you tell that you're from latvia?20:32
qsuscs iveqy: that’s the freenode server i’m connected to20:32
my IP should report as french, that’s because my server is in roubaix20:33
_ikke_ qsuscs: nice, ipv620:33
qsuscs: OVH?20:33
→ jaznow joined20:33
qsuscs surprisingly20:33
→ Takle joined20:33
qsuscs _ikke_: yes, via another guy (whom i pay 3.50€ per month for this beast of a VPS)20:33
_ikke_ ah ok20:33
qsuscs (beast in the negative sense)20:33
→ bgerber joined20:33
iveqy qsuscs: how international :)20:33
← einmalfel left20:34
← rath left20:34
← pheaver left20:34
_ikke_ I'm connected to freenode in frankfurt aparently20:34
→ cavallar1 joined20:34
qsuscs well, i wouldn’t bother if they(tm) made the EU a “real” state on its own …20:34
← RootedBox left20:34
→ epifanio joined20:35
qsuscs then again, i don’t approve what they(tm) are deciding, so …20:35
→ rubyonrailed joined20:35
→ ology joined20:35
→ vreo joined20:35
qsuscs i can’t wait for the next parliament election (which will be my first one)20:35
← cavallar1 left20:36
← pm90_ left20:36
← jaznow left20:37
→ cavallar1 joined20:38
← cavallar1 left20:38
→ ki0 joined20:39
→ Balliad joined20:40
← vreo left20:40
→ Literphor joined20:41
← devoldmx3 left20:41
→ cagedwisdom joined20:41
← scottschecter left20:42
← danzilio left20:43
→ pm90_ joined20:43
→ yahosi joined20:43
gitinfo set mode: +v20:44
yahosi I've been working on a feature branch and have diverted by 19 commits from master...ive got an open pull request but they want me to sync before they do the pull20:44
← ki0 left20:44
→ stuivi joined20:44
yahosi i was curious what my best option here is? should i merge or rebase?20:44
← stuivi left20:45
→ duderonomy joined20:45
→ stuivi joined20:45
← Gizburdt left20:45
← TomyLobo left20:46
→ mikiones joined20:46
iveqy yahosi: probably rebase20:47
yahosi is that still true if there are conflicts?20:47
iveqy yahosi: it depends on the project of course and you could read more at !merge_vs_rebase20:47
gitinfo yahosi: [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html20:47
→ nnyk joined20:47
→ ruukasu joined20:48
← ruukasu left20:48
→ ruukasu joined20:48
iveqy yahosi: I would say so20:48
→ ciampix joined20:48
→ pheaver joined20:48
→ Gizburdt joined20:48
← craigp left20:48
yahosi interesting ok thanks ill take a look20:48
having a hrad time wrapping my head around whats best20:48
Seveas qsuscs: a cow-orker of mine once told me that they were building three new insane asylums in Germany. One in Berlin, one in Hamburg, and they'll just put a roof over Bayern.20:49
← freestyl3r left20:49
qsuscs Seveas: and they don’t even have all of it20:49
← m0ltar left20:49
← jolg42 left20:50
← mikiones left20:50
← Gizburdt left20:50
→ Gizburdt_ joined20:51
← mizu_no_oto left20:51
← MechtiIde left20:51
← phantomtiger left20:52
← DolphinDream left20:52
← ParsectiX left20:52
← IIT left20:53
← bronson left20:53
→ ParsectiX joined20:53
→ tier joined20:53
← DolphinDreamm left20:54
→ settermjd joined20:55
← baweaver left20:55
← pheaver left20:56
← tier left20:56
← tier_ left20:56
← mekhami left20:57
← vurma left20:57
Rastus_Vernon → rvernon20:57
rvernon → Rastus_Vernon20:57
→ tpollard joined20:57
← AaronMT left20:57
→ aarobc joined20:58
← jceb left20:58
→ craigp joined20:59
→ Grimlock1 joined20:59
→ fatalhalt joined20:59
← Oebele left20:59
← sdothum left20:59
← Literphor left21:00
← t0th_-_ left21:00
← endiruna left21:01
→ tieTYT2 joined21:01
← PabloVidela left21:01
→ sdothum joined21:02
← craigp left21:03
← polyzen left21:03
→ Literphor joined21:04
← Gizburdt_ left21:04
→ wethu joined21:04
← regedit left21:05
← Balliad left21:05
← cavallari left21:05
← cebor left21:05
← duderonomy left21:05
← jwhisnant left21:06
→ Gizburdt joined21:06
← berz3rk left21:06
← irqq left21:07
← psiloLR left21:07
grepper Hi. I'm new to git from svn. I imported my svn repo sucessfully, and now want to create a new tag 'tovid-0.35-release' from the state at tag 'tovid-0.35'. So I did: git checkout tags/tovid-0.35; git tag tovid-0.35-release; git checkout tags/tovid-0.35-release. Then I ran ./setup.py to create the release files. Does this seem okay so far? After that I am confused :(21:08
→ bronson joined21:08
→ pheaver joined21:08
_ikke_ grepper: A tag in git is not the same as in svn21:08
→ pacon2 joined21:08
_ikke_ grepper: a tag in git points to a single commit, and does not change again21:08
→ endiruna joined21:09
_ikke_ grepper: so if you want the release files part of the tag, create the tag only after you have comitted them21:09
grepper it doesn't point to the 'state' at that commit? That is what I am wanting21:09
_ikke_ It does21:09
grepper okay ..21:09
_ikke_ But in svn, a tag is a special named branch, where you can commit on21:09
grepper: What are you confused about?21:10
grepper git status shows 'HEAD detached from tovid-0.35'21:10
→ dsdeiz joined21:10
_ikke_ yes21:10
→ codefo joined21:10
grepper so now that I have created to the files how to I switch to tovid-0.35-release so I can commit them ?21:10
kadoban Detached head means you're not on a branch. If you checkout a tag, you're not on a branch anymore, because being on a branch would mean that when you commit, it would update that branch…but a tag isn't updateable.21:10
← mr-kyd left21:11
grepper okay, now I am really confused :P21:11
← denete left21:11
grepper So how would I accomplish what I need to do?21:11
_ikke_ grepper: Can you tell us what you want to achieve?21:11
kadoban grepper: You don't switch to a tag and then make commits that update the tag. You make commits and then when it's the version you want, you tag a particular commit.21:12
→ Bootinbull joined21:12
_ikke_ Like I said, tags don't get updated. Once you tagged a commit, that's the final state you get21:12
grepper right, but I wanted to start at a certain point in time, not HEAD but the point of the tag21:12
_ikke_ grepper: create a branch21:12
→ cebor joined21:13
→ craigp joined21:13
_ikke_ git checkout -b tovid-0.35-release tags/tovid-0.3521:13
On that branch, you can do work21:13
grepper oh21:13
_ikke_ And I'd remove the tag to prevent confusion: git tag -d tovid-0.35-release21:13
grepper okay, so then a new 'branch' tovid-0.35 will show up in branches/ ?21:14
_ikke_ The new branch is tovid-0.35-release21:14
grepper right21:14
ncd|leeN → leeN21:15
grepper my branches now are mainly obsolete code retained in case someone wanted to further develop them, so I didn't want to add the release there, but if that is the git way ...21:15
→ polyzen joined21:15
← Tekila_ left21:15
→ Tekilla joined21:15
iveqy grepper: svn branches and git branches are not the same at all. You use branches a lot more in git21:16
→ danzilio joined21:16
← bgerber left21:16
iveqy grepper: and a tag points to a commit. So usually a release result in a tag21:16
← iamjarvo left21:16
← danzilio left21:17
kadoban grepper: git is pretty flexible, so it's hard to nail down "the git way", but yeah that's closer. You might be interested in looking at 'git-flow' which is a separate tool that kind of imposes a structure. Most people don't use it exactly, but something based on the workflow isn't bad.21:17
iveqy it's first when you need to base other commits on that release (for example security patches) that you need to create a branch21:17
grepper so I would then tag the branch as well ... can I name the tag the same as the branch ?21:17
iveqy grepper: I sugger !book !talks, I specially recommend Jesica Kerrs talk21:17
gitinfo grepper: 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 !parable21:17
grepper: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)21:17
→ danzilio joined21:17
grepper thanks21:17
← Gizburdt left21:18
kadoban grepper: When the branch is what state you want, I merge it into my "published" branch, and then tag that v1.0.0, whatever. You probably can have a tag the same name as a branch, but don't. Then it gets confusing, what does 'git checkout the_name' do? The branch or the tag?21:18
← sin3t left21:18
kadoban (I'm sure there's an answer to that question, but whatever, it's still confusing…or maybe it just yells at you and makes you be specific, I dunno)21:19
→ sin3t joined21:19
← jottr left21:19
grepper At present I only have a tag tovid-0.35.21:19
← Qoxv left21:19
→ teran__ joined21:20
← teran_ left21:20
← Briman|off left21:20
→ Briman joined21:20
grepper well, *0.3{2,3,4,5}21:20
Briman ...are names with pipes in them +b here or something?21:20
← xolubi left21:20
→ szymek joined21:20
← yn5 left21:21
← ParsectiX left21:21
Briman → Briman|off21:21
canton7 Briman, can't see any bans that stupid :P the ban list does need a good clear-out though21:21
Briman|off → Briman21:21
← netcarver left21:21
← ropav left21:21
→ ParsectiX joined21:21
grepper _ikke_: do I switch back to HEAD before running "git checkout -b tovid-0.35-release tags/tovid-0.35" ?21:21
gitinfo set mode: +v21:21
Briman it wasn't letting my bouncer auto-nick from Briman|off to Briman21:22
szymek hi, can you give some use cases of git cherry-pick? when i should use this command and when not?21:22
→ Orbitrix joined21:22
Briman nor would it let me manually /nick21:22
→ bgerber joined21:22
← Orbitrix left21:22
Briman worked fine until now...21:22
grouping my off nick worked though21:22
→ Orbitrix joined21:22
Briman was telling me "#git: cannot change nickname while banned in channel"21:22
← pm90_ left21:23
canton7 aaah, I'm guessing Briman|off isn't linked to your nickserv registration21:23
_ikke_ grepper: You are always on HEAD21:23
→ caegn joined21:23
iveqy szymek: when you screwed things up? Or maybe when you need to apply a security fix to multiple branches21:23
kadoban Briman: I think I used to get that message too, wasn't to do with | though. Sounds like a mistake to use names like that though, it just annoys people. And nobody expects "I'm logged into IRC" to mean "I'm staring at the screen NOW", so who cares?21:23
canton7 that's the message I get when I try and do stuff in here while not signed into nickserv21:23
_ikke_ szymek: Most of the time, it's used to back/forward-port features21:23
→ axl_ joined21:23
← jxpx777_ left21:23
← ckruczek left21:24
← Literphor left21:24
← agileadam left21:24
szymek this command creates a new commit which affects on searching commits via git branch --contains {commit}21:24
a think that is a minus of cherry-pick21:25
← joel_falcou left21:25
→ teran joined21:25
grepper _ikke_: well it says 'HEAD detached from tovid-0.35'. Can I run the command from that state ?21:25
iveqy szymek: it's impossible to not create a new commit21:25
canton7 Briman, so yeah, make sure all your nicks are identified with nickserv21:25
_ikke_ grepper: Yes, it only means that HEAD is not pointing to a branch, but to a commit. Checking out a branch wil let HEAD point to a branch again21:26
Briman that's weird that i never had a problem until now21:26
maybe i got d/c'd while nicked to off...21:26
grepper okay, thanks :)21:26
← Cata|Work left21:26
_ikke_ Briman: Has to do with spam prevention21:26
szymek iveqy: i know it21:26
Briman yeah makes sense21:26
szymek but it may be problematic21:26
→ __TheDodd__ joined21:27
← teran__ left21:27
→ roelmonnens joined21:27
← stuivi left21:27
← thedodd left21:28
→ metts joined21:29
→ yqt joined21:30
szymek When it can be useful to use "contains" and "merged" flags? Can you give some use cases - again?21:30
← Neozonz|Disc left21:30
→ Literphor joined21:30
→ Neozonz|Disc joined21:31
→ mikiones joined21:31
← roelmonnens left21:31
← tritone left21:32
← ciampix left21:32
← LBV_User left21:33
← ojacobson_ left21:33
← ManikM left21:34
→ jaznow joined21:34
← dstarh left21:34
→ mizu_no_oto joined21:34
← SegFaultAX left21:35
← Hestil left21:36
← Neozonz|Disc left21:37
_ikke_ szymek: --contains if you want to find out which branches contain that specific commit21:37
→ ojacobson joined21:37
_ikke_ --merged to see which branches got merged (are reachable) form the current branch21:37
← ParsectiX left21:38
→ SegFaultAX joined21:38
→ hellofunk joined21:38
→ ParsectiX joined21:38
← jaznow left21:38
→ duderonomy joined21:39
← mariuscc left21:39
→ vreo joined21:39
← fooforge left21:39
← jason237 left21:39
← MagePsycho left21:40
← cjwilburn left21:40
→ Anarchos joined21:40
← endiruna left21:41
← Takle left21:41
Anarchos i did a "git checkout branch" ; and i erased mistakenly a folder. how to revert it ?21:41
← thevishy left21:41
← Mannequin left21:42
szymek that is what I knew ;)21:43
i am looking for a another use cases21:43
polyzen is there a way to do a git stash pop and keep deleted files deleted?21:43
← kermit left21:43
szymek like removing unused branches which are merged e.g. into master branch21:43
polyzen CONFLICT (modify/delete): .vim/vimrc deleted in Stashed changes and modified in Updated upstream. Version Updated upstream of .vim/vimrc left in tree.21:43
← Grimlock1 left21:43
→ pm90_ joined21:44
→ kermit joined21:44
← pm90_ left21:44
← jonmorehouse left21:44
polyzen it's a headless server, so i do a `git clone --no-checkout`, and then checkout the files i do want there21:44
→ jontmorehouse joined21:44
polyzen perhaps i should use a branch instead21:44
→ APerson_ joined21:45
→ pm90_ joined21:45
→ yosito joined21:45
_ikke_ Anarchos: How did you erase that folder?21:46
→ psoo joined21:46
← ology left21:46
→ rpg joined21:46
_ikke_ Anarchos: "git checkout branch" would not remove anything that's not tracked21:46
Anarchos _ikke_ with rm.21:46
_ikke_ Anarchos: Was that folder tracked?21:47
→ t0th_-_ joined21:47
Anarchos i get it from the "git checkout V8.4pl5" V8.4pl5 being the branch i am interested in.21:47
← Lunatrius left21:48
_ikke_ so V8.4pl5 contains the folder you want?21:48
← Spacew00t left21:48
→ Lunatrius joined21:48
← brent_ left21:48
Anarchos _ikke_ yes21:48
→ psoo_ joined21:48
→ Spacew00t joined21:48
→ brent_ joined21:48
Lunatrius → Guest1192821:49
← duderonomy left21:49
← ParsectiX left21:49
← anchorite left21:49
_ikke_ git checkout V8.4pl5 -- path/to/folder21:49
This will overwrite what's in your worktree21:49
Anarchos _ikke_ thanks a lot21:50
_ikke_ (only that directory)21:50
→ duderonomy joined21:50
← howlymowly left21:50
← psoo left21:51
→ mekhami joined21:51
← pheaver left21:51
→ ColdKeyboard joined21:51
← marvinpinto left21:52
← sitaram left21:52
→ howlymowly joined21:52
→ jwhisnant joined21:53
→ marvinpinto joined21:53
→ sitaram joined21:53
→ pheaver joined21:53
→ Takle joined21:53
→ EminenceHC joined21:53
← mquin left21:54
FreezingAlt → FreezingCold21:54
→ mquin joined21:55
→ clarkpan joined21:55
← caegn left21:55
→ xolubi joined21:55
← axl_ left21:55
← lsiv568 left21:56
→ btree joined21:57
← Anarchos left21:57
→ toothrot joined21:57
← PeterBooker left21:57
← thierryp left21:58
← EminenceHC left21:58
→ Gizburdt joined21:58
← Spacew00t left21:59
→ PCatinean joined21:59
← clarkpan left22:00
→ isifreek joined22:00
→ jakobhans joined22:00
→ cdown joined22:00
isifreek is it possible to cherry pick from a branch that has no common base with my current branch?22:00
kadoban isifreek: sure22:00
Joseph__Silber I stupidly did `git reset --hard HEAD~1` with uncommitted changes in my working directory. Any way of getting it back?22:00
← yosito left22:00
isifreek kadoban: sketchy at all?22:01
← Dougie187 left22:01
← wethu left22:01
kadoban isifreek: ehhh…probably sketchier the more unrelated they are. if the commit has changes to files that are almost exactly the same, it should be fine22:01
← APerson_ left22:01
← duplicatelogon left22:02
isifreek kadoban: there a significant changes (e.g. one file has around 100 new lines of a couple thousand)22:02
kadoban isifreek: I believe cherry-pick works a lot like a patch, so if a patch would work, cherry-pick should too, if that helps22:02
← edude03 left22:03
→ Ykfk joined22:03
← dsdeiz left22:04
isifreek kadoban: im terribly sure how to tell when a patch would work, unfortunately. how exactly does it work? does it basically grep from the line then make changes there, or does it expect the line to be somewhat near the original line num?22:04
not terribly*22:04
← bgerber left22:04
→ gfixler joined22:04
kadoban isifreek: I'm not much of an expert either, but a patch usually has some context and line numbers, and if it all matches exactly it goes perfectly, but if not it still tries to figure it out22:05
← macabre left22:05
← wedgie left22:05
← gebjgd left22:06
→ mingwandroid joined22:06
← btree left22:07
→ dm7freek joined22:07
→ clarkpan joined22:07
→ wethu joined22:07
← t0th_-_ left22:08
← craigp left22:08
isifreek kadoban: ok, ill give it a try, thanks22:09
← PCatinean left22:09
→ jottr joined22:09
→ craigp joined22:09
← steele left22:09
→ pingupingu joined22:10
← CEnnis91 left22:10
→ steele joined22:10
→ robzilla joined22:11
← warfront1 left22:12
→ otter768 joined22:12
← dm7freek left22:12
→ martinbmadsen joined22:12
← highcup left22:13
_ikke_ Joseph__Silber: sorry, bad news.22:13
Joseph__Silber: Unless you have a copy somewhere22:13
Joseph__Silber Yeah. Figured as much.22:13
_ikke_ Joseph__Silber: ie. undo buffers from editors22:13
Joseph__Silber Luckily most of today's work was in new untracked files.22:13
→ APerson_ joined22:14
_ikke_ :-/22:14
ah ok22:14
yeah, that's good22:14
← crose left22:14
_ikke_ Joseph__Silber: You did not git add thoses changes before you reset --hard them, right?22:14
Joseph__Silber No. Otherwise they would be lost too.22:14
→ sentriz joined22:14
Joseph__Silber :)22:14
_ikke_ I mean the changes you did loose22:15
Joseph__Silber No22:15
_ikke_ tough luck then22:15
Joseph__Silber What good would adding them to the index have done me?22:15
_ikke_ Joseph__Silber: Then there would be blobs22:15
with the contents22:15
Joseph__Silber Oh right!22:15
← jontmorehouse left22:16
← robzilla left22:16
← otter768 left22:17
wethu Hey, how come when i do a `git status` on a branch i get "Your branch is up-to-date with origin/branch. however when i do a `git pull` there was changes..22:17
→ AustinTheGrey joined22:17
→ bhavul joined22:17
← isifreek left22:17
_ikke_ wethu: git status does not connect to the remote22:17
wethu ah22:17
_ikke_ it only tells you what you have locally22:17
origin/branch is a local branch that is used to track what you have from the remote repository22:18
← thiago left22:18
← psoo_ left22:19
wethu yeah, cool. i had no changes to that local branch, so that make sense22:19
← ag4ve_ left22:19
iveqy Joseph__Silber: when you do mistakes like that, you can often find your work in your texteditors backup files22:19
wethu wouldn't mind finding out if i can check if remote has changes with my local branch, without pulling those changes22:19
iveqy Joseph__Silber: if you've setup your texteditor to have sane settings that is22:20
wethu: use git fetch22:20
Joseph__Silber I'm using ST3. I don't think it keeps any backups of saved and closed files.22:20
← danzilio left22:20
← gopar left22:20
→ danzilio_ joined22:20
iveqy wethu: that will fetch all changes but not merge them. You can also use git ls-remote to get info about the state of the remote22:20
← neanderslob left22:20
wethu iveqy: Thanks, ls-remote sounds like what ill want22:21
← cbonobo left22:21
→ s8321414 joined22:21
→ cbonobo joined22:21
← kermit left22:21
iveqy Joseph__Silber: I've no idea of what ST3 are, but if it's a good enviroment I suggest you figure out on how to do it. Else I suggest you change development enviroment if you can. Having backups taken to a seperate directory have saved me a lot of times22:21
_ikke_ iveqy: SublimeText 322:21
wethu if changes are fetched but not merged from the remote repo's branch, to my local branch, where do those changes exist? on the branch but not staged ?22:22
→ kermit joined22:22
← jazzzu left22:22
Joseph__Silber iveqy, or I can just stop being stupid and not reset --hard with uncommitted changes ^^22:22
iveqy _ikke_: thanks, at least that has a reputation to be somewhat sane22:22
Joseph__Silber How's that for a thought22:22
_ikke_ wethu: That's where the remote tracking branch comes in22:22
wethu ahh22:22
→ ropav joined22:22
wethu thanks22:22
iveqy Joseph__Silber: of course. The thing is, files dissappear for stupid reasons. My favorite is when I did a infinity loop in PHP, I'd to kill the PHP deamon and it ate my file =(22:23
I didn't know PHP could do that22:23
Joseph__Silber Really? Wow!22:23
iveqy it was before I've learned using version control. Vim really saved me that time22:24
← ojacobson left22:25
← APerson_ left22:26
→ baweaver joined22:26
_ikke_ Never had those kind of issues22:26
← ropav left22:27
→ Nuck joined22:27
← clarkpan left22:28
← editshare-ericf left22:28
→ clarkpan joined22:29
→ btree joined22:29
→ acetakwas joined22:30
← Acidnerd left22:30
← Ykfk left22:30
→ dsdeiz joined22:30
← clarkpan left22:31
→ aswen joined22:32
→ pnje joined22:32
→ ahr3n joined22:32
← Takle left22:32
→ madewokherd joined22:32
← kevwil left22:33
→ wedgie joined22:33
← wedgie left22:33
→ wedgie joined22:33
→ Consuela joined22:33
← milesmatthias left22:33
→ milesmatthias joined22:34
← WaReZ left22:34
grepper okay, so I created a tovid-0.35-release branch, switched to it, made changes and tagged it, and commited them. What would be the command from here to push them to the server ?22:35
← jagob left22:36
→ Takle joined22:36
← m8 left22:36
kadoban grepper: Hopefully you don't mean in that order. If you made changes, tagged it, /then/ commited the changes, the tag probably doesn't mean what you think it means.22:36
← smccarthy left22:36
← Literphor left22:36
grepper er, yeah, I tagged last22:37
kadoban Okay good22:37
← zackiv31 left22:37
→ Gitzilla joined22:38
← Consuela left22:38
← milesmatthias left22:38
→ Consuela joined22:38
← davispuh left22:39
grepper I get confused after using svn, because git status shows me on tovid-0.35-release, but there are still files around from HEAD. Its going to take some getting used to.22:39
kadoban HEAD is just…the current commit, the commit that would be the parent if you commited now.22:40
← baweaver left22:40
grepper okay, different terms then. maybe I mean files from 'trunk' ?22:41
← jakobhans left22:42
grepper ie. that have been commited since 0.3522:42
Briman if you "switch" to that tag, they will go away22:42
→ opdavies joined22:42
→ HelloShitty- joined22:42
Briman or checkout; can't remember command-line terminology.22:42
grepper hm, maybe I messed up, I thought I had already switched22:42
Briman i'm used to tortoisegit which has one option for a number of switch commands22:42
kadoban I forget what trunk means, I haven't used svn is far too long.22:43
Briman you'd use the checkout command to checkout a certain tag22:43
grepper I used git checkout -b tovid-0.35-release tags/tovid-0.3522:43
→ jontmorehouse joined22:43
polyzen is there a way to do a git stash pop and keep deleted files deleted?22:43
grepper so I thought I had done that already, but the files are still there22:43
Briman i believe that makes a new branch at that tag22:43
you'd have to then switch to the new branch22:44
grepper oh, damn, so I didn't switch to it yet22:44
kadoban Briman: Naw, it switches to the branch at the same time.22:44
Briman i thought you had to explicitly specify that22:44
kadoban grepper: I'm not really sure what's going on…what exactly is the issue? What does 'git status' say? 'git branch'?22:44
Briman: You're probably thinking of 'git branch', which just creates a branch but doesn't switch to it, if you call it a certain way.22:45
grepper kadoban: yeah, it says tovid-0.35-release22:45
Briman oh, yeah22:45
nevermind22:45
as long as you committed the new files to master/HEAD and not tovid-0.35-release/HEAD, they shouldn't be there22:45
but if you committed them to the branch itself then they'll stay there...22:45
but will advance the HEAD past the tag22:45
← Kicer86 left22:46
kadoban If they're uncommited changes, git will let them just float around as much as it can, but it'll stop you if it can't switch branch without overwriting them or something.22:46
grepper well, the files were already in HEAD or trunk or whatever before I switched22:46
→ Hestil joined22:46
grepper so they shouldn't be there22:46
they were commits SINCE 0.35 that I imported from the old repo22:47
← hobodave left22:47
kadoban grepper: Why not? And I'm still not sure what you mean by "HEAD or trunk". Do you mean some other branch, like perhaps master?22:47
grepper yes, perhaps master is the term I need22:47
← kermit left22:48
grepper if I switch to an older branch like I have, those files should not be there, right ?22:48
← codefo left22:48
← szymek left22:48
kadoban If you made a new branch, created new files and commited them to that new branch, they shouldn't be on other branches yet, unless you did merges or something obviously.22:48
→ paul424 joined22:49
→ jaznow joined22:49
grepper no its the opposite, I'm in the new branch (tagged months ago) that should not contain recent files, but it does22:49
→ t0th_-_ joined22:50
← th3fallen left22:50
← Hestil left22:51
kadoban I don't know the answer to that…you'd probably have to !repro or something, I'm not clear on what's going wrong. Back in a little while, I gotta take care of some stuff.22:51
gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.22:51
← Gizburdt left22:51
→ jazzzu joined22:52
← FreezingCold left22:54
→ FreezingCold joined22:55
→ clarkpan joined22:55
← osxi left22:56
← aswen left22:56
→ fairuz joined22:57
← pantsman- left22:57
← fairuz left22:57
← netj left22:57
← rubyonrailed left22:57
→ netj joined22:58
← btree left22:58
→ thierryp joined22:58
→ baweaver joined22:58
→ CheckDavid joined22:59
→ acetakwas_ joined22:59
← stylo left23:00
→ HowdyHowdy joined23:00
→ kermit joined23:01
← danzilio_ left23:01
← AustinTheGrey left23:03
← acetakwas left23:03
← thierryp left23:04
← basiclaser left23:04
← FreezingCold left23:04
← HowdyHowdy left23:05
← acetakwas_ left23:05
→ ciampix joined23:05
← livingstn left23:05
→ stylo joined23:05
→ ome joined23:06
← stylo left23:07
→ stylo joined23:07
← Takle left23:07
← rpg left23:07
← zapb_ left23:09
→ thierryp joined23:10
→ raijin joined23:10
grepper oh, crap, its actually right. Didn't realize I had future proofed by commited a few files I didn't need yet. Sorry for the noise.23:11
→ bgerber joined23:12
← chitopunk left23:12
→ weiyang joined23:13
→ myyst joined23:13
grepper so what is the command I need now to push the new branch tovid-0.35-release changes to the server ? "git push origin tovid-0.35-release" ?23:13
→ rubyonrailed joined23:14
← Zupoman left23:15
→ zapb_ joined23:15
← sess left23:15
← myst left23:16
← jottr left23:18
← HelloShitty- left23:19
→ ology joined23:19
← NightQuest left23:20
→ APerson_ joined23:20
← jaznow left23:20
← opdavies left23:20
→ Motoko joined23:21
← polyzen left23:22
← sentriz left23:22
→ ropav joined23:23
← bronson left23:23
← clarkpan left23:24
← Nizumzen left23:24
← zapb_ left23:25
→ zapb_ joined23:26
← KeiKun left23:26
→ jottr joined23:27
→ m0ltar joined23:27
→ clarkpan joined23:27
← ropav left23:28
→ lsiv568 joined23:28
→ bronson joined23:28
→ macabre joined23:32
→ BuenGenio joined23:32
← paul424 left23:34
→ s8321414_ joined23:34
← bhavul left23:34
← s8321414 left23:34
← pm90_ left23:34
→ milesmatthias joined23:34
← mizu_no_oto left23:34
← APerson_ left23:36
→ opdavies joined23:36
← bgerber left23:36
← Lovich left23:37
→ Lovich-- joined23:37
→ whitby joined23:37
← milesmatthias left23:38
← hyperair left23:39
grepper I'll take that as a yes :)23:39
← pacon2 left23:39
Toba taking silence as a yes, bold23:39
← ixian left23:40
→ ixian joined23:40
→ tritone joined23:40
→ CEnnis91 joined23:41
→ Literphor joined23:42
→ th3fallen joined23:42
← metts left23:42
→ EminenceHC joined23:42
→ dannymic_ joined23:43
← dannymichel left23:43
← ErKa left23:43
← Seanmcn left23:44
→ MattHardcastle joined23:46
→ bhavul joined23:46
→ blackstar joined23:46
→ mmoretti joined23:47
← EminenceHC left23:47
← taruner left23:48
← mmoretti left23:48
← vreo left23:48
→ DolphinDream joined23:49
← Sam-T left23:50
grepper heh, worked out okay methinks :)23:51
grepper is no longer a stupid git23:51
→ jason237 joined23:52
→ cvanball joined23:53
→ ropav joined23:54
← cvanball left23:55
→ dm7freek joined23:56
← liam1 left23:56
→ tier joined23:57
→ DrHouse|DellM650 joined23:57
→ osxi joined23:57
← ropav left23:58
→ cvanball joined23:59
← imachuchu left23:59
← Bootinbull left23:59
→ dm7freek_ joined23:59

Logs Search ←Prev date Next date→ Channels Documentation