Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-12

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 Rodya_ joined #git
00:01 rromans left #git
00:02 ethereality82 left #git
00:02 romerocesar joined #git
00:04 githogori joined #git
00:06 junhao joined #git
00:13 romerocesar joined #git
00:14 pneuma joined #git
00:15 tristanp_ joined #git
00:16 fstd joined #git
00:19 pur3eval joined #git
00:19 tristanp joined #git
00:26 stantonk joined #git
00:28 phanimahesh joined #git
00:30 jstimm joined #git
00:32 turnstileJumper joined #git
00:37 stantonk joined #git
00:37 sagerdearia joined #git
00:40 nmz787_i1 left #git
00:45 Electrometro joined #git
00:46 phanimahesh joined #git
00:47 mellernoia joined #git
00:47 ekinmur joined #git
00:47 ejb joined #git
00:48 jaggz left #git
00:49 mwhooker joined #git
00:53 BombStrike joined #git
00:54 moei joined #git
00:55 catag87 joined #git
00:56 catag87 joined #git
00:58 qpdb joined #git
00:59 jstimm_ joined #git
01:02 liuzhen joined #git
01:03 romerocesar joined #git
01:04 The_Wood_ joined #git
01:04 The_Wood_ left #git
01:04 The_Woodsman joined #git
01:05 NeXTSUN joined #git
01:06 The_Woodsman i just ran git rebase -i master from a branch. I was told error: could not apply <commit number>. (This is my first time using rebase). Usually when there are merge conflicts I see a list of problematic files, but now there is not list of conflicting files, and I'm not sure how to get the changes from that commit into my project. does anyone have experience in this sort of situation? thanks
01:08 medeirosthiiago joined #git
01:11 livingstn joined #git
01:12 durham_ joined #git
01:12 phanimahesh joined #git
01:12 jstimm joined #git
01:15 darkbit joined #git
01:15 _u2pop_ joined #git
01:15 _u2pop_ left #git
01:16 ochorocho__ joined #git
01:17 fuchstronaut joined #git
01:18 shaggycat joined #git
01:18 shgysk8zer0 joined #git
01:21 pks joined #git
01:21 MaximusColourum joined #git
01:21 zacts joined #git
01:22 jimi_ joined #git
01:24 bonks joined #git
01:24 catag87 joined #git
01:29 bonks Hi guys, I have a branch which is 10 commits ahead of remote. It does not overlap files with the other commits and I want to push them to remote. What is the best way to do this? If I branch of commit 9, it includes commits 1-8
01:30 cdg joined #git
01:30 stantonk joined #git
01:31 Darren_ joined #git
01:33 tjone270 joined #git
01:34 romerocesar joined #git
01:35 Limes_ joined #git
01:36 sangy joined #git
01:37 phanimahesh joined #git
01:38 mehola joined #git
01:38 Lyqyd joined #git
01:39 fracting joined #git
01:39 githogori joined #git
01:46 Dougie187 joined #git
01:46 tristanp_ joined #git
01:52 Limes__ joined #git
01:56 HoierM_ joined #git
01:57 phanimahesh joined #git
01:58 cuebix-wk joined #git
01:58 boombatower joined #git
01:58 Ph_ joined #git
01:59 stantonk joined #git
02:00 boombatower joined #git
02:01 espindola joined #git
02:03 jstimm joined #git
02:03 bonks Quiet night? :D
02:04 drodger joined #git
02:04 romerocesar joined #git
02:04 Goplat joined #git
02:05 Literphor joined #git
02:07 jstimm joined #git
02:07 githogori joined #git
02:09 drodger joined #git
02:10 catag87 joined #git
02:13 githogori joined #git
02:15 drodger joined #git
02:16 djapo joined #git
02:16 cq11 joined #git
02:17 djapo hello i rename my remotes and now HEAD wants to point to the wrong master in the wrong remote
02:17 david007 joined #git
02:17 djapo how can i have it point to the right master in the right remote
02:19 ojacobson if you have a repro case for `git remote rename` leaving references to the old name around (eg. in upstreams, or in refs/ somewhere), file a bug report on the mailing list
02:19 hexagoxel joined #git
02:19 djapo git remote set-head remote master
02:19 ojacobson if you edited them in .gitconfig, well, that's what git remote rename is for. Depending on what, specifically, you're seeing, I can probably tell you how to correct - but I need a !transcript
02:19 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
02:19 djapo would that do it
02:19 djapo ?
02:20 phanimahesh joined #git
02:20 djapo http://codepad.org/EqxBjciz
02:22 stonerfish joined #git
02:23 thiago joined #git
02:25 djapo basically, my zsh git plugin no longer recognizes that im in the master branch
02:25 djapo for this git project for others it does
02:26 dsantiago joined #git
02:26 djapo and git branch says (HEAD detached at origin/master)
02:30 djapo and git branch -v Allowed None for the value of cache.get_or_set().
02:30 githogori joined #git
02:31 zivester joined #git
02:32 Darren_ joined #git
02:33 djapo ha, fixed it.
02:33 arescorpio joined #git
02:34 romerocesar joined #git
02:40 phanimahesh joined #git
02:40 crayon joined #git
02:41 githogori joined #git
02:42 chachasmooth joined #git
02:42 cq11 joined #git
02:44 jstimm_ joined #git
02:45 d4rklit3 joined #git
02:47 phanimahesh joined #git
02:47 jhass joined #git
02:48 nnyk_ joined #git
02:48 githogori joined #git
02:48 livingstn joined #git
02:49 ejb joined #git
02:49 thiago joined #git
02:50 Gamecubic joined #git
02:50 interne7y joined #git
02:52 phanimah1sh joined #git
02:55 justanotheruser joined #git
02:56 zacts joined #git
02:57 Dougie187 left #git
03:02 zacts joined #git
03:02 cq11 joined #git
03:04 romerocesar joined #git
03:06 a_thakur joined #git
03:15 romerocesar joined #git
03:17 SwiftMatt joined #git
03:17 shgysk8zer0_ joined #git
03:17 ochorocho__ joined #git
03:18 shgysk8zer0_ joined #git
03:18 fuchstronaut joined #git
03:18 treaki_ joined #git
03:20 efdetonator joined #git
03:21 hepkatt joined #git
03:21 isxek joined #git
03:24 mehola joined #git
03:30 DaSea joined #git
03:33 a_thakur_ joined #git
03:34 DaSea left #git
03:37 devbug joined #git
03:37 cq11 joined #git
03:40 a_thakur joined #git
03:45 romerocesar joined #git
03:45 zumba_ad_ joined #git
03:45 pur3eval joined #git
03:46 hk238 joined #git
03:54 cq11 joined #git
03:56 ramsub07 joined #git
03:57 diogenese joined #git
03:59 fracting joined #git
03:59 a_thakur joined #git
03:59 phanimahesh joined #git
04:05 romerocesar joined #git
04:05 aidalgol joined #git
04:09 dsantiago joined #git
04:12 mwhooker joined #git
04:13 anu0 joined #git
04:15 romerocesar joined #git
04:17 SwiftMatt joined #git
04:34 xaviergmail joined #git
04:34 madprocess joined #git
04:36 d4rklit3 joined #git
04:39 nilg joined #git
04:41 thiago joined #git
04:44 Cabanossi joined #git
04:44 a_thakur joined #git
04:46 t2mkn joined #git
04:53 tematibr joined #git
04:54 freimatz joined #git
04:57 JanC_ joined #git
04:57 Mowgli joined #git
04:58 dreiss joined #git
05:00 subhojit777 joined #git
05:01 Literphor joined #git
05:02 nights joined #git
05:02 freimatz joined #git
05:03 nights i have a question
05:03 nights i have two bitbucket accounts
05:03 nights how do i setup my config so that the correct account is used based on the folder i am in
05:04 D[4]ni joined #git
05:04 devbug joined #git
05:05 romerocesar joined #git
05:06 nights hmm
05:06 nights maybe i got it
05:07 pur3eval joined #git
05:09 nights yes
05:09 nights works
05:10 nights fuck that was really hairy
05:13 tematibr joined #git
05:14 romerocesar joined #git
05:14 sanscheese joined #git
05:16 Rodya_ joined #git
05:17 boombatower joined #git
05:17 _ikke_ nights: What did you turn op with?
05:19 fuchstronaut joined #git
05:19 ochorocho__ joined #git
05:20 cq11 joined #git
05:23 Drzacek joined #git
05:23 Drzacek Hello
05:23 sanscheese Any bitbucket users out there having issues at the moment? (can't seem to update my access management in backend, or add deployment keys)
05:25 nights _ikke_: i made a config
05:26 nights what i didnt realize was that each entry is an alias that has to be used as the remote for the respository
05:27 fracting joined #git
05:27 Drzacek http://paste.debian.net/780510/ This is how I set up my .gitignore file. Yet when I check repository for changes to stage, a binary file from /bin/Debug/bin_file is listed. What I did wrong?
05:28 Darren_ joined #git
05:29 SwiftMatt joined #git
05:31 a3Dman joined #git
05:31 a3Dman joined #git
05:31 shgysk8zer0 joined #git
05:35 eivarv joined #git
05:36 qt-x joined #git
05:39 mwhooker joined #git
05:40 lindenle joined #git
05:40 tvw joined #git
05:41 nilg joined #git
05:41 qt-x joined #git
05:42 TomyLobo joined #git
05:43 stuh84 joined #git
05:45 leeN joined #git
05:47 _xor joined #git
05:47 Codfection joined #git
05:49 pioiytr_ joined #git
05:49 madduck joined #git
05:50 Alienpruts joined #git
05:51 dsdeiz joined #git
05:51 led_belly joined #git
05:52 thoraxe joined #git
05:54 xaviergmail joined #git
05:54 cq11 left #git
05:56 Andrew_K joined #git
05:56 zeroed joined #git
05:57 zacts joined #git
05:57 OnBrokenWings joined #git
05:59 Kicer86 joined #git
06:00 xlegoman joined #git
06:03 Sucks joined #git
06:04 Sucks joined #git
06:05 freimatz joined #git
06:05 rscata joined #git
06:06 Sucks joined #git
06:06 dminca joined #git
06:06 erguven joined #git
06:06 dminca joined #git
06:08 pur3eval joined #git
06:12 Sucks joined #git
06:12 Sucks joined #git
06:13 Frenchiie joined #git
06:13 Frenchiie can anyone explain what does sync do on github desktop?
06:13 Frenchiie hovering over it says it syncs the branch name with the remote server
06:13 Frenchiie not sure of the implications
06:16 Softeisbieger joined #git
06:17 pur3eval joined #git
06:17 netj joined #git
06:20 Rynomster joined #git
06:20 Rynomster joined #git
06:22 Macaveli joined #git
06:23 Sucks joined #git
06:23 Macaveli joined #git
06:23 Macaveli joined #git
06:24 tvw joined #git
06:25 romerocesar_ joined #git
06:25 lb Frenchiie sorry we cannot support gui's here. maybe hop over to #github
06:27 Macaveli_ joined #git
06:31 circ-user-JW25t joined #git
06:33 anu1 joined #git
06:34 r3c0d3x joined #git
06:35 romerocesar joined #git
06:37 Alienpruts joined #git
06:39 inflames joined #git
06:40 zacts joined #git
06:40 orbitphreak joined #git
06:42 UTAN_dev_ joined #git
06:43 dreiss joined #git
06:43 SwiftMatt joined #git
06:44 d4rklit3 joined #git
06:47 mariuscc joined #git
06:48 cyan__ joined #git
06:52 xaviergmail joined #git
06:55 JeroenT joined #git
06:56 acetakwas joined #git
06:56 Balliad joined #git
06:56 moriko joined #git
06:57 apoth-01a joined #git
07:00 [Brain] joined #git
07:01 apoth-01a left #git
07:01 xaviergmail joined #git
07:03 saedelaere joined #git
07:05 tinajohnson___ joined #git
07:06 Darcidride joined #git
07:08 zumba_addict joined #git
07:10 cookie16 left #git
07:10 romerocesar_ joined #git
07:11 TomyWork joined #git
07:12 GavinMagnus joined #git
07:14 dreiss joined #git
07:14 abhvl joined #git
07:16 pioiytr joined #git
07:16 JeroenT joined #git
07:16 davisonio joined #git
07:17 erguven joined #git
07:18 lordjancso joined #git
07:19 Oebele joined #git
07:19 stantonk joined #git
07:19 fuchstronaut joined #git
07:20 ochorocho__ joined #git
07:21 Brain joined #git
07:22 sanketdg joined #git
07:24 matleh joined #git
07:25 nnyk_ joined #git
07:25 hahuang62 joined #git
07:26 lb what would be the workflow to tranform an existing subfolder into a submodule ?
07:27 lb does submodule need an existing git repo that is to be added to the current repo?
07:31 romerocesar joined #git
07:32 kedare joined #git
07:32 GavinMagnus joined #git
07:32 BlackPanx joined #git
07:35 clemf joined #git
07:37 drodger joined #git
07:37 Repox joined #git
07:37 zumba_ad_ joined #git
07:40 encod3 joined #git
07:41 romerocesar joined #git
07:42 lindenle joined #git
07:43 Hounddog joined #git
07:43 PCatinean joined #git
07:47 tematibr joined #git
07:48 tematibr joined #git
07:50 multi_io joined #git
07:51 skylite joined #git
07:52 DevAntoine joined #git
07:55 usm4n joined #git
07:56 GavinMagnus joined #git
07:58 kurkale6ka joined #git
07:58 MrMojito joined #git
07:58 MrMojito joined #git
08:00 davisonio joined #git
08:01 aidalgol joined #git
08:02 madduck_ joined #git
08:02 jknetl joined #git
08:03 darkbit joined #git
08:04 Rodya_ joined #git
08:04 bongjovi joined #git
08:05 tvw joined #git
08:06 Rodya_ joined #git
08:08 kurkale6ka joined #git
08:08 Macaveli joined #git
08:08 jagob joined #git
08:08 kurkale6ka joined #git
08:09 clemf joined #git
08:11 romerocesar joined #git
08:13 isxek joined #git
08:14 FuzzySockets joined #git
08:17 axisys left #git
08:19 a_thakur joined #git
08:20 madprocess joined #git
08:21 madduck_ left #git
08:22 zacts joined #git
08:22 madduck joined #git
08:23 ochorocho__ joined #git
08:29 ddr2 joined #git
08:30 Literphor joined #git
08:31 dminca joined #git
08:31 romerocesar joined #git
08:33 eizua joined #git
08:34 ybden joined #git
08:34 thiras joined #git
08:34 usm4n_ joined #git
08:36 watersoul joined #git
08:36 eizua joined #git
08:38 Beams joined #git
08:39 tilerendering joined #git
08:39 sbulage joined #git
08:39 tilerendering maybe someone could help me with this: http://pastebin.com/L6gMMY6K
08:39 eizua joined #git
08:40 rominronin joined #git
08:40 canton7 tilerendering, no need to clone the gitolite repo
08:40 drodger joined #git
08:41 satya4ever_ joined #git
08:41 canton7 tilerendering, create repo in gitolite (or setup config so that repos are auto-created on push); on workstation, 'git init .' in the appropriate folder; 'git remote add origin git@yourhost:whatever.git'; add, commit, whatever; push
08:43 satya4ever_ joined #git
08:43 circ-user-JW25t joined #git
08:43 cqi joined #git
08:43 canton7 ah he cross-posted and didn't mention. Also solved in #gitolite
08:44 tilerendering canton7: thanks a lot
08:44 usm4n joined #git
08:44 clmsy joined #git
08:44 OnkelTem Hi
08:44 canton7 tilerendering, if you cross-post, please say that you have. That way we can avoid answering in multiple places :P
08:45 tilerendering I m sorry, I will
08:46 OnkelTem Is there a way to have a sub project with its own git repo so that changes to its file will be stored in the main repo? Typcal scenario: you have a third-party module and you apply patches against it, not pushing changes to its own repo until some moment or never
08:46 mrkat joined #git
08:46 canton7 OnkelTem, there are a couple of approaches: submodules and subtrees. Neither is particularly simple, so make sure you understand the one you decide to use
08:46 liuzhen joined #git
08:48 OnkelTem canton7: what I clearly understand is that not every change to subproject should go to the its repo, instead - I'd like to save changes only in the parent project. Maybe its like treating a subproject's .git directory as regular directory
08:48 notebox joined #git
08:48 OnkelTem s/to the/to/
08:49 hck89 joined #git
08:49 canton7 OnkelTem, life starts to get fun there :P You will have a git repository for the subproject, and you'll be juggling branches - changes to be submitted back upstream will need to be on a separate branch to local-only changes
08:50 rasto joined #git
08:50 canton7 there's no concept of referencing a subproject's repository, but also tracking "overrides" of some sort in another repository - everything goes in the same repo, and you separate them using branches
08:50 chll_ joined #git
08:52 fees joined #git
08:53 OnkelTem canton7: So after I patch a third-party module, I save this change in *its* repository but in a branch which I'm not gonna push (now or ever)?
08:54 canton7 (we're talking specifically about submodules here btw): almost, but slightly worse. With submodules, each subproject has to have its own remote git repo - the parent project just has a reference to the subproject's repo
08:54 eijk joined #git
08:54 OnkelTem But how to "save" the other repo in my main repository? What approach can I use - "submodule" or "subtree"?
08:55 stratos joined #git
08:55 canton7 we're specifically been talking about submodules so far. Let me remind myself how subtrees work...
08:56 sostenuto joined #git
08:56 canton7 with subtrees, the subproject is tracked inside the parent project's repository (unlike with submodules). However my understanding is that separating "changes to keep local" and "changes to submit back upstream" will be harder
08:57 canton7 read https://git-scm.com/book/e​n/v2/Git-Tools-Submodules for submodules, and https://github.com/git/git/blob/mas​ter/contrib/subtree/git-subtree.txt for subtrees
08:57 thiras left #git
08:57 OnkelTem Ah, I see. Unfortunately this is not a option: I don't like to have a repository for each such a module, because this is Drupal and the number of modules are tens and hundreds)(
08:57 OnkelTem (I was talking about submodules)
08:59 troulouliou_div2 joined #git
09:01 cdown joined #git
09:01 Zamerick joined #git
09:02 satya4ever joined #git
09:02 liuzhen_ joined #git
09:03 nodz joined #git
09:05 liamonade joined #git
09:06 usm4n joined #git
09:09 OnkelTem canton7: found this tutorial: https://medium.com/@v/git-sub​trees-a-tutorial-6ff568381844#.ivpypr2lj
09:09 OnkelTem canton7: looks great and exactly what I needed for
09:10 mischat joined #git
09:11 mischat joined #git
09:11 usm4n_ joined #git
09:13 canton7 OnkelTem, cool, like I said, I think the challenge will come with trying to separate the modifications to the subproject that you want to keep local, vs the modifications which you want to submit back upstream
09:13 OnkelTem true
09:15 Softeisbieger joined #git
09:15 hackal joined #git
09:16 usm4n joined #git
09:16 Fissure1 joined #git
09:17 hackal Hi, sorry for noob question. I have some local code. I went to github, made a private repo added README.md. Then I went to my local directory called git init, git remote add origin https://github.com/user/repo.git. Now I would like to add all my local files to repo however using git status says "on branch master, nothing to commit....". What should I do?
09:18 jhass hackal: you want to keep your README.md?
09:19 hackal I can remake it later
09:19 jhass then just force push over the readme creating commit
09:19 Fijit joined #git
09:19 jhass git push -uf origin master
09:20 moritz jhass: I think you're ahead of hackal
09:20 moritz hackal: you need to add your files to the repo before commit, with 'git add thefile'
09:20 fuchstronaut joined #git
09:21 hackal yes, I did git add -A
09:22 hackal git push -uf origin master worked, however what should I do next time (before creating a repo) to avoid something like this?
09:22 fuchstronaut joined #git
09:22 fuchstronaut joined #git
09:23 dsdeiz joined #git
09:23 liuzhen joined #git
09:24 jhass not much, it's pretty much working as intended
09:24 jhass don't create anything on github, just create an empty repo
09:24 jhass then you can leave the -f flag out on the initial push
09:26 babilen joined #git
09:28 nettoweb joined #git
09:29 armyriad joined #git
09:29 aidalgol joined #git
09:30 jimi_ joined #git
09:39 ToBeCloud joined #git
09:39 eizua joined #git
09:44 fuchstronaut joined #git
09:46 satya4ever joined #git
09:48 mflow joined #git
09:49 mastro joined #git
09:49 pioiytr_ joined #git
09:52 a3Dman joined #git
09:53 romerocesar joined #git
09:56 darkbit joined #git
09:58 cdown joined #git
09:58 rvsjoen joined #git
10:01 usm4n_ joined #git
10:01 PCatinean joined #git
10:02 ffledgling joined #git
10:04 Impaloo joined #git
10:07 Chiko joined #git
10:09 nfk joined #git
10:10 muelli joined #git
10:16 bauruine joined #git
10:17 codeman joined #git
10:19 usm4n joined #git
10:22 liamonade joined #git
10:23 romerocesar joined #git
10:24 ochorocho__ joined #git
10:36 freimatz joined #git
10:38 OnkelTem Ok, I'm tamming gut substree now
10:38 OnkelTem Question: how to list the current branch of a subtree?
10:39 canton7 there's no such thing, as I understand it
10:39 moritz OnkelTem: this question doesn't compute
10:39 OnkelTem I didn't find any listing/info commands for a subtrees
10:39 canton7 a subtree literally copy-pastes a branch of another repo into your repo
10:39 cdown joined #git
10:39 moritz OnkelTem: a subtree isn't checked out, so it can't have a current branch
10:39 canton7 different branches aren't maintained
10:40 OnkelTem hm, then how git subtree push works?
10:40 canton7 https://github.com/git/git/blob/maste​r/contrib/subtree/git-subtree.txt#L95
10:40 jknetl joined #git
10:41 moritz OnkelTem: you have to give "git subtree push" a ref to push to
10:41 canton7 so it extracts all of the commits relating to the submodule, sticks them in a new branch, then pushes that branch to a remote repo
10:41 OnkelTem so it stores somehwere the red
10:41 OnkelTem ref
10:41 canton7 the ref of what?
10:41 OnkelTem the ref of the original commit when I was pulling the remote
10:41 canton7 no
10:41 canton7 nothing like that is stored
10:45 lindenle joined #git
10:46 nnyk_ joined #git
10:48 jeus1 joined #git
10:52 ygeLN joined #git
10:52 cyan__ joined #git
10:53 JeroenT joined #git
10:58 aguimaraes1986 joined #git
11:02 moriko joined #git
11:02 johnmilton joined #git
11:05 Rish joined #git
11:05 ArchNoob joined #git
11:10 cdown joined #git
11:12 ThomasLocke joined #git
11:13 romerocesar joined #git
11:14 sdothum joined #git
11:15 ojdo joined #git
11:16 codeman joined #git
11:19 nnyk_ joined #git
11:19 raz anyone know a good and safe git branch housekeeping script? (that does stuff like offering to delete merged branches that haven't been modified in x days etc.)
11:19 Khisanth joined #git
11:22 stantonk joined #git
11:22 rnsanchez joined #git
11:24 romerocesar joined #git
11:26 fuchstronaut joined #git
11:26 stantonk_ joined #git
11:28 HoierM_ joined #git
11:29 DieguezZ joined #git
11:29 clmsy joined #git
11:31 watersoul_ joined #git
11:32 baako joined #git
11:32 baako hi guys how do i commit ONLY new files and folder NOT changes in existing files which exist in my local repo and server repo
11:32 TomyWork I have a 1.4 GB file named .git/objects/pack/sedWOEFas. That's not part of the repo, right?
11:33 TomyWork I renamed it and "git fsck" didnt complain. It milled through the same amount of objects as before
11:33 NeverDie joined #git
11:33 Literphor joined #git
11:33 ilmari that looks like a temporary file from a sed -i invocation
11:34 TomyWork my suspicion as well. probably accidentally invoked that a while ago *g*
11:34 ilmari a bit overeager sed -i ... $(find ...)?
11:34 TomyWork 4.5 months ago
11:34 TomyWork find | xargs sed i guess
11:36 OnkelTem joined #git
11:37 SimonNa joined #git
11:39 osse baako: git ls-files --others --exclude-standard -z | xargs -0 git add; git commit
11:39 d0nkeyBOB joined #git
11:40 baako osse, thanks will try it in a bit
11:41 stonerfish joined #git
11:44 cwillu_at_work joined #git
11:46 jeus1 joined #git
11:46 toogley joined #git
11:47 narendraj9 joined #git
11:48 zack_s_ joined #git
11:48 zack_s_ I have a branch with a lot of commits
11:48 zack_s_ how can I squash them to one commit?
11:49 Mowgli joined #git
11:51 jhass git rebase -i
11:51 canton7 or git merge --squash
11:51 UrsoBranco joined #git
11:53 circ-user-JW25t joined #git
11:53 zack_s_ I found "git reset --soft"
11:54 hck89 joined #git
11:54 mdw joined #git
11:55 chid joined #git
11:55 zack_s_ "git reset --soft HEAD~10 && git commit"
11:55 Lunatrius` joined #git
11:56 zack_s_ canton7: does this also work?
11:56 chid_ joined #git
11:56 zack_s_ I have already pushed my commits to origin
11:56 canton7 in principle, sure. you might need an 'add' in there
11:56 canton7 beware !rewriting
11:56 gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will 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 --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
11:57 JeroenT joined #git
11:57 zack_s_ canton7: how can I check, whether I have done it right?
11:57 canton7 do it, see if it looks right
11:58 d0nkeyBOB joined #git
11:58 zack_s_ its gone through
11:58 zack_s_ but I dont know how I can see whether it has worked
11:58 zack_s_ should I still see the old commits?
11:58 zack_s_ I see them localy
11:59 netj joined #git
12:01 tilerendering joined #git
12:02 King_Hual joined #git
12:02 espindola joined #git
12:03 tomog999 joined #git
12:03 abhvl left #git
12:04 ehynds joined #git
12:04 synthroid joined #git
12:04 Lunatrius` joined #git
12:04 romerocesar joined #git
12:04 espindol_ joined #git
12:08 zack_s_ canton7: when I want to push my changes, I get: "Updates were rejected because the tip of your current branch is behind"
12:08 zack_s_ ts remote counterpart. Integrate the remote changes (e.g.hint: 'git pull ...') before pushing again
12:08 zack_s_ should I do a pull or force a push?
12:11 ilmari zack_s_: force push discards whatever changes someone else pushed
12:12 ilmari I normally do a 'git pull --rebase' in that situation
12:12 ilmari which rebases your local commits on top of the remote ones
12:14 notebox joined #git
12:14 kedare_ joined #git
12:17 liquidjamm joined #git
12:19 JeroenT_ joined #git
12:21 liquidjamm joined #git
12:21 Gamecubic joined #git
12:23 baraba joined #git
12:24 ochorocho__ joined #git
12:26 skylite joined #git
12:26 wrouesnel1 joined #git
12:27 nilg joined #git
12:30 jeffreylevesque joined #git
12:31 fracting joined #git
12:32 encod3 joined #git
12:33 Mowgli joined #git
12:34 romerocesar joined #git
12:35 medeirosthiiago joined #git
12:41 fuchstronaut joined #git
12:41 cdown joined #git
12:45 livingstn joined #git
12:46 l4v2 joined #git
12:51 jstimm_ joined #git
12:51 stantonk joined #git
12:52 Mowgli joined #git
12:54 rahtgaz joined #git
12:54 ac3takwas joined #git
12:54 zivester joined #git
12:56 JeroenT joined #git
12:56 ekinmur joined #git
12:57 ac3takwas joined #git
12:57 Darcidride_ joined #git
12:57 quetz joined #git
12:57 zack_s_ left #git
12:58 texinwien joined #git
12:59 ekinmur joined #git
13:00 fuchstronaut joined #git
13:00 ajf- joined #git
13:01 ziongate joined #git
13:01 ziongate hello all
13:01 gitinfo ziongate: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
13:02 concerti joined #git
13:03 ziongate i have following need: i need to go to continue my job (wip) in another location & machine. I generally do a commit, push to origin, and pull on the other site. But the "store/backup_only" commit remains tracked.
13:03 ziongate is there a way to avoid the commit to stay recorded in the log in this cases ?
13:04 ziongate or a better alternative way to do this
13:04 cqi joined #git
13:05 romerocesar joined #git
13:05 hepkatt joined #git
13:05 ProbabilityMoon joined #git
13:06 jhass you could clone the repo onto a stick (or directly onto the other machine over the network) and then add it as remote on the repo you want to work on
13:06 jhass and then just amend the commit into its final shape
13:07 ziongate ok, so i set an additional remote and push / pull from it
13:08 ziongate there is no "stash push/pop" things that can be saved on remote ?
13:09 jhass well stashes are just commit objects, so there probably is a way, but no clean one I'm aware of
13:09 jhass you could also just create a new branch on origin if your teammates don't mind the noise
13:10 ziongate jhass, yeah, we can create wip/name/branches on remote
13:10 ziongate but i think we don't have permission to remove commits ... afair
13:11 jhass you mean to force push?
13:11 jhass that's a bit silly if you're allowed to have wip branches
13:11 ziongate yeah, as far is i remember is not possible
13:12 DieguezZ joined #git
13:12 ziongate matter of policies i think, they want to keep all the history and disallowing deletions
13:13 ziongate ok, i will go with push pull from my remotes so should be fine. Many thanks for the support
13:13 monbro joined #git
13:14 moriko joined #git
13:16 sangy joined #git
13:16 griffindy joined #git
13:17 JeroenT joined #git
13:17 bsanford joined #git
13:18 circ-user-JW25t joined #git
13:18 rwb joined #git
13:19 cdg joined #git
13:22 mrkat joined #git
13:24 rgrinberg joined #git
13:25 dyske joined #git
13:26 rgrinberg joined #git
13:27 rnsanchez_ joined #git
13:29 parasite joined #git
13:30 elsevero joined #git
13:30 todd_dsm joined #git
13:30 Ahmed90 joined #git
13:32 ekinmur joined #git
13:33 mjuszczak joined #git
13:33 codeman_ joined #git
13:34 stantonk joined #git
13:34 stantonk joined #git
13:35 romerocesar joined #git
13:35 M-shine joined #git
13:36 bruce_lee joined #git
13:37 crater2150 hi. I'm trying to add a git repo to another git repo as normal files (not as a submodule). The outer repo tracks an exercise for a programming course concerning git, so the inner repo is actually some sample data for the students and should not be treated specially by git. But it seems like git prevents this ("fatal: Pathspec ... is in submodule"). Is it possible to force-add it or do i have to rename it and let
13:37 crater2150 the students rename it back?
13:37 marc_v92 joined #git
13:38 MaximusColourum joined #git
13:39 f3r70rr35f joined #git
13:39 Codfection joined #git
13:40 bejeb joined #git
13:41 bejeb left #git
13:41 synthroi_ joined #git
13:41 AndyBrown joined #git
13:41 i7c Does the "inner repo" need to behave like a repository?
13:41 bsanford_ joined #git
13:42 Dougie187 joined #git
13:43 madewokherd joined #git
13:43 johnny56_ joined #git
13:44 i7c You can just delete the .git dir in the inner repo and add all the files (note that this is effectively loss of data, so you should have that repo elsewhere as !backup).
13:44 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
13:45 nilg joined #git
13:46 crater2150 the inner repo needs to be a complete git repository for the exercise. As a workaround i have now renamed .git to gitdir and added instructions to move it back
13:46 i7c o_o
13:46 i7c You basically have *the* use case for submodules but refuse to use them.
13:47 i7c That's why you have to do awkward things like renaming git internal data. :p
13:47 AndyBrown Is CRFL/LF conversion expected to behave differently for autocrlf true vs false even when there is a gitattributes that explicitly sets the particular file extension to text, and all other files to text=auto?
13:47 usm4n joined #git
13:48 crose joined #git
13:49 chigang_ joined #git
13:49 SpeakerToMeat joined #git
13:49 crater2150 well, the students should work with the inner repo, but its history has nothing to do with the outer repo. but maybe that is still the best option, as students will not push back into the outer repo it may not be a problem
13:50 Mowgli joined #git
13:50 rbr joined #git
13:51 Macaveli joined #git
13:52 AndyBrown I should add ... this is on windows
13:53 kpease joined #git
13:53 strype joined #git
13:53 AndyBrown I ask because this test script checks in two files with mixed line endings, one in a autocrlf false repo, one in an autocrlf true repo, and they get committed with different line endings in each case. One is converted, one is not.
13:53 AndyBrown Test script: http://hastebin.com/tovetojevi.hs (powershell on windows)
13:55 AndyBrown I'm using git for windows 2.9.0
13:55 dminca joined #git
13:55 dminca joined #git
13:55 M-mistake joined #git
13:55 M-meznak joined #git
13:57 MaximusColourum joined #git
13:58 i7c AndyBrown, I would have guessed that the attributes override the config value and since *.txt and * cover all files the option shouldn't make a difference?
13:59 AndyBrown that's what I thought should happen, but either I'm being an idiot, or I'm seeing different behaviour
13:59 AndyBrown in the autocrlf=true rep, I first add the gitattributes file, then add a CRLF, an LF, and a mixed endings file
14:00 AndyBrown sorry, I meant in the autocrlf=false repo
14:00 AndyBrown then I create an autocrlf=true repo, add the first one as a remote, and fetch and checkout
14:00 kaldoran joined #git
14:00 ekinmur joined #git
14:01 AndyBrown at this point the mixed line ending file is still mixed, the other two are both CRLF
14:01 AndyBrown now I create a mixed line ending file in the autocrlf=true repo, add, commit push
14:01 ejb joined #git
14:01 AndyBrown then I check that out in the autocrlf=false repo, and it has only LF line endigs
14:02 AndyBrown unless my .gitattributes is wrong, somehow
14:02 AndyBrown and therefore not being read
14:03 Darren_ joined #git
14:03 nonconvergent joined #git
14:03 i7c uhm
14:03 i7c well there autocrlf/text attribute only controls the normalization afaik.
14:04 GodGinrai joined #git
14:04 i7c There is also an eol attribute or an core.eol option which controls what happens in the working directory.
14:05 nnyk_ joined #git
14:06 i7c But it only has an effect if autocrlf is false I think. This is complicated.
14:06 stantonk joined #git
14:07 NeXTSUN joined #git
14:09 pneuma_ joined #git
14:10 Lotlot joined #git
14:13 refried_ joined #git
14:15 maxb_ joined #git
14:15 topi` joined #git
14:15 romerocesar joined #git
14:16 a_thakur joined #git
14:16 djb-irc joined #git
14:16 j416_ joined #git
14:16 dyske left #git
14:16 akitada joined #git
14:16 parasite joined #git
14:16 g5pw joined #git
14:17 HarryHallman joined #git
14:17 TSS_ joined #git
14:17 g5pw joined #git
14:17 tm512 joined #git
14:17 swalladge joined #git
14:18 fuchstronaut joined #git
14:19 AaronMT joined #git
14:21 AndyBrown I thought I understood this - evidently not
14:21 AndyBrown does .gitattributes affect checkout conversion, or just commit conversion?
14:21 NeverDie joined #git
14:22 AndyBrown because https://git-scm.com/docs/gitattributes says that the text setting affects both, but I'm not seeing it
14:22 a_thakur joined #git
14:23 NeverDie joined #git
14:24 NeverDie joined #git
14:25 treehug88 joined #git
14:25 ochorocho__ joined #git
14:26 i7c AndyBrown not "gitattributes". It depends on which attribute you are talking about.
14:26 LionsMane joined #git
14:26 ExoUNX joined #git
14:26 NeverDie joined #git
14:26 i7c The "text" attribute only affects normalisation, afaik. That is, how the line endings are stored int he repository (not in the working dir).
14:26 AndyBrown yes, sorry, that was me being lazy. I'm talking about text
14:27 i7c Where do you see that it affects both?
14:27 AndyBrown i'm possibly reading the man page incorreclty
14:27 lamont joined #git
14:27 AndyBrown *probably
14:28 AndyBrown I was: "text. This attribute enables and controls end-of-line normalization. When a text file is normalized, its line endings are converted to LF in the repository. To control what line ending style is used in the working directory, use the eol attribute for a single file and the core.eol configuration variable for all text files."
14:28 AndyBrown text for in, eol for out
14:28 i7c yup
14:29 i7c That's how I understand it too.
14:29 NeverDie joined #git
14:29 i7c Wait.
14:29 i7c I'm confused. :D
14:29 Asiajey joined #git
14:29 Asiajey joined #git
14:30 circ-user-JW25t joined #git
14:30 i7c The second sentence under "eol" confuses me still, but yeah.
14:30 catag87 joined #git
14:30 hepkatt left #git
14:30 D-Boy joined #git
14:30 NeverDie joined #git
14:31 i7c Ok, eol attribute implies text attribute. See the example under eof.
14:31 AndyBrown I know. I'm not sure what it means by "effectively setting the text attribute", when is tarts by talking about line ending styles to be used in the working directory
14:31 settermjd_ joined #git
14:32 i7c In the example below it says "normalize .txt, .vcproj and .sh files, ensure that .vcproj files have CRLF and .sh files have LF in the working directory"
14:32 i7c If you see how it's done, they are just setting eol=crlf or eol=lf
14:32 i7c which seems to imply text attribute.
14:33 i7c Which again makes sense. Because if you enforce lf or crlf it must be a text file.
14:34 AndyBrown ok, so now I have `* text=auto` and `*.txt eol=crlf", but the two repos still behave differently (http://hastebin.com/qijuyamaca.hs)
14:35 sangy joined #git
14:36 moritz 4/w 8
14:36 moritz sorry
14:36 phaleth joined #git
14:38 cdown joined #git
14:40 i7c AndyBrown, maybe git config core.safecrlf true  gives you some insight?
14:41 ResidentBiscuit joined #git
14:41 Heisenberg1276 joined #git
14:41 ArchNoob joined #git
14:41 happy-dude joined #git
14:41 jeus1 joined #git
14:43 mwhooker joined #git
14:44 deadnull joined #git
14:46 romerocesar joined #git
14:47 fmcgeough joined #git
14:47 stantonk joined #git
14:48 usm4n_ joined #git
14:48 i7c AndyBrown, dunno what the result of your script actually is. I have no Windows. :)
14:49 AndyBrown fair enough
14:49 AndyBrown not sure if this is me, git, or git on windows
14:50 encod3 joined #git
14:51 lmat i7c: wow, I never even heard of a i3c...
14:51 al-damiri joined #git
14:51 i7c lmat?
14:51 lmat i7c: You know i2c? https://en.wikipedia.org/wiki/I%C2%B2C
14:51 NeXTSUN joined #git
14:52 azerus joined #git
14:52 madduck joined #git
14:53 bsanford joined #git
14:53 ResidentBiscuit joined #git
14:53 i7c Hehe, yes.
14:53 jeus1 joined #git
14:54 i7c However, there is no i1c either so your conclusion is dubious.
14:54 diegoviola joined #git
14:54 cqi joined #git
14:54 a_thakur joined #git
14:54 zivester joined #git
14:55 subhojit777 joined #git
14:55 jeus1 joined #git
14:55 lmat i7c: :-)
14:55 lmat i7c: Perhaps I1C would be "integrated circuit" ^_^
14:55 i7c haha :D
14:56 i7c lmat, I take it you're an anti-tank missile?
14:56 lmat i7c: I am.
14:56 osse joined #git
14:57 * i7c is more careful around lmat.
14:57 lmat i7c: ;-) My nick actually means "limited atonement"
14:57 jeus1 joined #git
14:57 i7c It's always good when this is limited.
14:59 clemf joined #git
15:00 krabat joined #git
15:00 nnyk_ joined #git
15:00 stantonk joined #git
15:01 AndyBrown i7c: safecrlf might help, going off to test now
15:02 AndyBrown but I think it will only impact the mixed line ending file, although it might tell me more about what's giong on with autocrlf in each repo
15:02 Macaveli joined #git
15:02 GodGinrai this is why windows line endings are evil
15:03 shinnya joined #git
15:03 GodGinrai but in all seriousness, I don't know why anyone uses autocrlf for any project that doesn't *require* windows line endings
15:04 GodGinrai I mean, most any good text editor on windows nowadays supports  unix line endings
15:04 le_melomane joined #git
15:04 selckin you should configure it so git doesn't touch it at all, and then refuse to use editors that can't comply with your prefered line ending
15:04 marc_v92 joined #git
15:05 wrouesnel2 joined #git
15:06 Anoia joined #git
15:07 cdown joined #git
15:09 fuchstronaut joined #git
15:10 diegoviola https://www.youtube.com/watch?v=SsoOG6ZeyUI
15:11 GodGinrai selckin: yea, as-is<->as-is is a good strategy.
15:12 tyreld joined #git
15:15 cdown_ joined #git
15:15 Mowgli joined #git
15:16 romerocesar joined #git
15:16 lindenle joined #git
15:16 jeus1 joined #git
15:18 i7c unless as-is is something else on different machines.
15:18 selckin it never is
15:18 selckin bytes are bytes
15:19 selckin the only reason this is needed if for editors that understand both types of line ending, of which i can only think of notepad.exe
15:19 selckin *don't
15:19 i7c I'd rather force everything to lf and use safecrlf to warn about normalisation that will affect my files in the working dir.
15:19 MrMojito joined #git
15:19 selckin you are wrong
15:20 i7c How so?
15:20 Mowgli joined #git
15:22 GodGinrai i7c: as-is means no conversions.  As long as you committed it in the right format, it will be in the right format wherever you pull it
15:22 GodGinrai as long as you have your git config set to as-is
15:22 spb_ joined #git
15:22 i7c yeah I know what it means
15:23 i7c But would you really rely on the fact that everybody commits it the right way?
15:23 GodGinrai well, "unless as-is is something else on different machines" implied otherwise
15:23 refried_ joined #git
15:23 i7c What I meant is that it sometimes is lf and sometimes it is crlf.
15:23 GodGinrai i7c: you can just require that they use text editors that use lf
15:24 GodGinrai defining software is a lot simple than dealing with conversions
15:24 GodGinrai *simpler
15:24 hck89 joined #git
15:24 eivarv joined #git
15:25 jeus1 joined #git
15:26 i7c yeah, conversions suck
15:26 i7c I'd just rather have git warn about crlf anywhere so you can prevent them from ever being added.
15:26 selckin there is no reason you should ever care what the line endings are
15:27 ShekharReddy joined #git
15:27 jeus1 joined #git
15:28 i7c Unless people start committing eol changes that pollute everything.
15:28 bremner emacs can handle both DOS and unix line ending conventions.
15:28 bremner mixed, not so well
15:28 Zamerick_ joined #git
15:29 jeus1 joined #git
15:29 selckin there are 0 editors that will change line endings unless you tell them to
15:29 usm4n joined #git
15:29 NeverDie joined #git
15:30 madewokherd joined #git
15:30 jeus1 joined #git
15:31 cdown joined #git
15:31 JCaesar selckin: kek.
15:31 kpease joined #git
15:31 bremner that seems pretty unlikely to be correct, given the mass of crap software that exists
15:32 selckin so you shouldn't care unless you're the 0.01% that has to actually use that crap
15:32 jknetl joined #git
15:32 annoymouse joined #git
15:33 i7c No, it suffices if *anybody* in your repository uses that crap.
15:33 crose joined #git
15:33 kpease joined #git
15:33 i7c project* rather
15:33 selckin its 2016 , we run quake inside linux in the browser inside a auto migrating vm, and your editor can't handle line endings
15:33 selckin wtf
15:33 jeus1 joined #git
15:34 i7c Mine can. You're missing the point.
15:34 selckin no you're solving a problem that deosn't exist because git for windows has a stupid default
15:34 bonks Hi guys, I have a branch which is 10 commits ahead of remote. Modifications of commit #9 does not overlap files with the other commits and I want to push them to remote. What is the best way to do this? If I branch from commit #9, it includes commits 1-8
15:34 usm4n_ joined #git
15:34 rkazak joined #git
15:34 SteffanW joined #git
15:35 kpease joined #git
15:35 GodGinrai bonks: you probably want git-cherry-pick
15:35 GyrosGeier bonks, you can use "git rebase -i origin" to shuffle commits in your branch around
15:36 GyrosGeier or you can cherry-pick into a new branch
15:36 bonks I'll look at cherry pick. I like that name :D
15:36 bonks Thanks!
15:37 jeus1 joined #git
15:37 NeverDie joined #git
15:38 dmose joined #git
15:39 thiago joined #git
15:39 EvilPenguin joined #git
15:39 King_Hual` joined #git
15:39 usm4n joined #git
15:40 dmose left #git
15:41 bonks Crap maybe I made it more complicated. I Have remote > branchA > branchB > branchC which branches off each other in that order. the commit #9 I'm referring to is in branchC but I want to apply its changes to remote. There isn't overlap between remote and commit #9 on branchC
15:41 AndyBrown i7c, selckin, GodGinrai: so do any of you know if gitattributes must be saved with a particular encoding?
15:41 bonks GyrosGeier: GodGinrai: Will cherrypick still work in this case?
15:43 AndyBrown like, UTF8 cs Unicode
15:43 Lotlot joined #git
15:43 AndyBrown *vs
15:43 i7c No such thing.
15:43 InfoTest joined #git
15:43 i7c Unicode is not an encoding. UTF-8 is an encoding for Unicode.
15:43 kulelu88 joined #git
15:44 GodGinrai bonks: Should.  cherry-pick is basically used to take commits on one branch and apply them to another
15:44 bonks GodGinrai: Ok thx
15:44 Alienpruts joined #git
15:45 usm4n_ joined #git
15:46 AndyBrown From https://msdn.microsoft.com/en-us/library/sy​stem.text.encoding.unicode(v=vs.110).aspx: looks like powershell calls UTF-16 unicode
15:46 AndyBrown and if you use that for .gitattributes, git ignores it
15:46 AndyBrown so that;s my issue
15:46 romerocesar joined #git
15:46 AndyBrown use UTF8 encoding instead
15:47 i7c Oh well, Windows.
15:48 bipolar joined #git
15:48 King_Hual joined #git
15:48 Macaveli joined #git
15:49 Macaveli joined #git
15:49 i7c selckin, all in all I get your point, it shouldn't matter and you might not run into that much trouble with it nowadays.
15:49 liuzhen_ joined #git
15:50 Macaveli joined #git
15:50 Macaveli joined #git
15:51 Macaveli joined #git
15:51 bipolar joined #git
15:51 usm4n joined #git
15:52 Macaveli joined #git
15:53 Macaveli joined #git
15:53 Tratos joined #git
15:54 Macaveli_ joined #git
15:54 marc_v92 joined #git
15:54 InfoTest joined #git
15:56 Topic for #git is now Welcome to #git, the place for git help and recursion | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-sweep: It's brooms, all the way down.
15:56 lmatteis joined #git
15:59 eivarv joined #git
16:00 AndyBrown also `*       text=auto` isn't enough, you need `*.*       text=auto` as well, or the conversions are inconsistent between autocrlf true and false repos
16:02 romerocesar joined #git
16:02 shinnya joined #git
16:03 CheckDavid joined #git
16:04 barteks2x joined #git
16:05 cdown_ joined #git
16:06 tristanp joined #git
16:07 nnyk_ joined #git
16:07 AndyBrown final .gitattributes uses `*       -text` and `*.*       -text`, which (I believe) makes all repos the same as if they were autocrlf=false, regardless of the individual developer's global default.
16:07 AndyBrown mission accomplished
16:08 usm4n joined #git
16:08 AndyBrown and is UTF8 encoded, so git actually recognises this
16:08 AndyBrown */this/it
16:09 NeXTSUN joined #git
16:09 AndyBrown so now git shouldn't screw with line endings, on any developer's machine
16:09 AndyBrown (for that repo)
16:10 dreiss joined #git
16:11 stantonk joined #git
16:12 Electrometro joined #git
16:13 fuchstronaut joined #git
16:14 matleh joined #git
16:15 Electrometro joined #git
16:16 stantonk joined #git
16:18 romerocesar_ joined #git
16:19 MaximusColourum joined #git
16:19 artemisart joined #git
16:21 ochorocho__ joined #git
16:23 usm4n joined #git
16:24 Arban joined #git
16:27 stantonk joined #git
16:30 stantonk joined #git
16:32 usm4n joined #git
16:34 phanimahesh joined #git
16:34 dmto joined #git
16:35 blackwind_123 joined #git
16:35 ochorocho__ joined #git
16:37 hck89 joined #git
16:38 FuzzySockets joined #git
16:38 NimeshNeema joined #git
16:39 nnyk_ joined #git
16:40 romerocesar joined #git
16:42 durham joined #git
16:42 pur3eval joined #git
16:44 ochorocho__ joined #git
16:44 JanC_ joined #git
16:45 f3r70rr35f joined #git
16:46 catag87 joined #git
16:46 medeirosthiiago joined #git
16:48 ochorocho__ joined #git
16:51 jfran joined #git
16:52 hck89 joined #git
16:52 ochorocho__ joined #git
16:52 GodGinrai joined #git
16:53 [Brain] joined #git
16:53 jfran joined #git
16:53 orbitphreak joined #git
16:54 fuchstronaut joined #git
16:55 BrianBlaze420 joined #git
16:55 robotroll joined #git
16:55 jfran joined #git
16:56 marc_v92 joined #git
16:58 ochorocho__ joined #git
16:58 DevAntoine joined #git
16:58 frem_ joined #git
16:59 romerocesar_ joined #git
16:59 spudowiar joined #git
16:59 stantonk joined #git
17:00 tristanp joined #git
17:00 hahuang61 joined #git
17:01 ochorocho__ joined #git
17:01 pur3eval joined #git
17:02 d5sx43 joined #git
17:05 synthroid joined #git
17:06 rpd joined #git
17:06 Corneliu joined #git
17:06 totte joined #git
17:06 totte joined #git
17:07 nnyk_ joined #git
17:07 nodz joined #git
17:08 medeirosthiiago joined #git
17:09 GodGinrai joined #git
17:09 Literphor joined #git
17:09 espindola joined #git
17:10 totte joined #git
17:11 lindenle joined #git
17:12 Guest33195 left #git
17:12 ramsub07 joined #git
17:13 Raging_Hog joined #git
17:13 romerocesar joined #git
17:13 Darren_ joined #git
17:14 rainbyte joined #git
17:15 d5sx43 joined #git
17:16 xbob joined #git
17:16 d5sx43 joined #git
17:16 drodger joined #git
17:18 phanimahesh joined #git
17:19 IWishIKnew joined #git
17:19 HoierM_ joined #git
17:19 d5sx43 joined #git
17:22 phanimahesh joined #git
17:25 robotroll joined #git
17:25 bonks GodGinrai: Amazing, cherrypick was exactly what I wanted. Since it has a new commit id, the commit from branchC will apply but not actually cause any modifications right?
17:25 shinnya joined #git
17:26 GodGinrai bonks: what do you mean by "not actually cause any modifications"?
17:26 nnyk_ joined #git
17:26 dreiss joined #git
17:26 ToBeCloud joined #git
17:26 nitin joined #git
17:26 duarteper joined #git
17:27 ochorocho__1 joined #git
17:27 jstimm_ joined #git
17:27 cdown joined #git
17:27 bonks GodGinrai: Since branchC includes the changes from the cherry pick, it will include the original commit #9, but when branchC merges with remote commit #9 wont have any affect
17:27 hahuang61 joined #git
17:29 espindola joined #git
17:29 GodGinrai That sounds likely.  I haven't used cherry-pick all that much, so I can't say with certainty that that is how it would work.
17:29 _ikke_ The same changes, even from different commits, won't conflict
17:30 bonks Ok cool. I didnt know how to phrase it
17:30 durham_ joined #git
17:30 deadnull joined #git
17:31 thiago_ joined #git
17:32 muelli joined #git
17:32 marc_v92 joined #git
17:33 totte joined #git
17:34 axl_ joined #git
17:35 leftriver04 joined #git
17:35 TomyLobo joined #git
17:36 axl_ left #git
17:38 freimatz joined #git
17:39 leftriver04 Hi, I have a question, I have 2 git repo one for the front and one for the back, I want to simplify this app so I want to merge those 2 repo in 1 repo but I dont want to lose my old commits, what can I do?
17:39 MaskedDriver joined #git
17:40 MaskedDriver I have git 2.6.3 and for some reason it is ignoring my .gitkeep files
17:40 EvilPeng1 joined #git
17:40 concerti joined #git
17:40 blnjavvy joined #git
17:40 jhass leftriver04: you can use git subtree to pull one into a folder of the other (or both into folders of a new one)
17:41 MaskedDriver I'm trying to keep empty uploads directories, but it won't let me commit up the .gitkeep files. I added them but it's telling me I'm still working in a clean directory
17:41 GodGinrai MaskedDriver: are they in your .gitignore?
17:41 MaskedDriver GodGinrai no
17:41 jhass .gitkeep is nothing special, it's just a convention for a filename
17:42 MaskedDriver jhass I know
17:42 ojacobson i use an empty .gitignore
17:42 MaskedDriver so for example I have a file web/uploads/.gitkeep
17:42 thiago_ joined #git
17:42 MaskedDriver my .gitignore has: web/uploads/*
17:43 jhass well, then it _is_ ignored
17:43 MaskedDriver lol
17:43 MaskedDriver yeah you're right
17:43 MaskedDriver derp
17:43 GodGinrai ojacobson: so does .gitignore apply rules for any directory within it?  I was wondering why a .gitignore file would not be in the root of the repo
17:43 jhass git add -f
17:44 tristanp joined #git
17:44 romerocesar joined #git
17:44 StuartMI joined #git
17:45 jagob joined #git
17:45 ojacobson GodGinrai: man gitignore -- yes, .gitignores in directories apply to those directories and their contents
17:45 gitinfo GodGinrai: the gitignore manpage is available at http://jk.gs/gitignore.html
17:45 blackwind_123 joined #git
17:45 cyan__ joined #git
17:46 GodGinrai ojacobson: I see
17:46 freimatz joined #git
17:46 thiago_ joined #git
17:47 MacWinner joined #git
17:48 vuoto joined #git
17:48 refried_ joined #git
17:49 miesco joined #git
17:50 usm4n joined #git
17:50 zeroed joined #git
17:53 SteffanW joined #git
17:54 Sasazuka joined #git
17:55 durham joined #git
17:58 axl_ joined #git
17:59 ldlework joined #git
18:00 weox joined #git
18:00 stantonk joined #git
18:01 miesco Hi.  What happens if you have a tag called "origin/miesco" and you type `git checkout -b miesco origin/miesco`?
18:02 pur3eval joined #git
18:03 GodGinrai I can't say for sure, but I must say that if you have such a tag, that you refrain from naming things in such problematic ways in the future.
18:03 Ekho joined #git
18:04 GodGinrai s/say/suggest/
18:05 vuoto joined #git
18:05 enigmabomb joined #git
18:05 enigmabomb Hi everyone!
18:06 qsx miesco: you create a branch refs/heads/miesco at the tag refs/tags/origin/miesco
18:06 vuoto joined #git
18:07 miesco qsx: What if there is a refs/remotes/origin/miesco branch?
18:07 marc_v92 joined #git
18:07 qsx miesco: then “origin/miesco” is ambiguous and git will force you to use the explicit form
18:07 qsx miesco: also, !tias
18:07 gitinfo miesco: 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.
18:07 rndguy joined #git
18:08 enigmabomb I’m having a problem where I seem to be literally “stuck in time.” I created a branch called NewHomepage. I committed all my work, then I checked out my master branch. I did a git merge NewHomepage and it merged. But, on master now I see this: “Switched to branch 'master' Your branch is ahead of 'origin/master' by 6 commits. (use "git push" to publish your local commits) …. However git push says everything is up to date and git pull says the same.
18:08 enigmabomb can I do to not lose all my work?
18:08 Lvjasha joined #git
18:09 enigmabomb Sorry if that message was too long. I dont know the pastebin eqituette here
18:09 _ikke_ enigmabomb: so git push origin master does not seem to push anything?
18:09 enigmabomb Havent tried that yet
18:09 enigmabomb _ikke_: That yields: fatal: master cannot be resolved to branch.
18:10 GodGinrai enigmabomb: your upstream may not have a master branch?
18:10 _ikke_ This is saying locally there is no master branch
18:10 GodGinrai or wait
18:10 GodGinrai yea
18:10 _ikke_ otherwise it would just push it
18:10 GodGinrai indeed
18:10 miesco `git push` only pushes the current branch to the server, correct?
18:10 enigmabomb My github says there is a master and NewHomepage
18:10 miesco If push.default = simple
18:11 _ikke_ Yes, and only if it's also called master on the remote
18:11 GodGinrai enigmabomb: what is the output of `git branch`?  (Throw this onto a pastebin, and *not* pastebin.com)
18:11 enigmabomb http://laravel.io/bin/8KXND
18:11 enigmabomb Ah, so I’m starting to see the problem
18:11 _ikke_ ah, Master, not master
18:11 enigmabomb Master does not exist in github, only Master
18:11 GodGinrai that does not look like standard git out
18:11 GodGinrai *output
18:12 GodGinrai are you using some wrapper app?
18:12 rndguy Hi guys, I have a running webpage in httpdocs and now I want to turn it into a git project, so I can push to it and have the changes live directly, is this easily achievable? If yes how?
18:12 davisonio joined #git
18:12 enigmabomb Apologies, that pastebin is formatting it wrong
18:12 meatchicken joined #git
18:12 meatchicken Is it wise to force-push a detached head
18:12 meatchicken onto my remote branch?
18:12 enigmabomb So how can I pull *master* and merge NewHomepage into it? — I guess thats my real question
18:12 acetakwas joined #git
18:12 GodGinrai rndguy: sure.
18:13 rndguy GodGinrai: git creates a bunch of folders and files like branch, hooks, etc. and I feel kinda lost in there
18:13 _ikke_ meatchicken: would not matter if it's detached or not
18:14 meatchicken _ikke_, if I force-push - I can wipe out all history from where I detached?
18:14 _ikke_ The commit you push will become the new head of the branch
18:14 GodGinrai rndguy: So, I'd probably right a git-hook that checks the files out and moves them into your httpdocs directory whenever a push occurs
18:17 Shentino joined #git
18:17 editshare-ericf joined #git
18:18 miesco Is there software that can give some fancy graphs of my git log?
18:18 qsx miesco: !lol
18:18 gitinfo miesco: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
18:18 axl_ joined #git
18:18 miesco qsx: Yea, thats alright, I guess.  Do you get used to that graph?
18:19 durham joined #git
18:20 qsx miesco: well, sometimes i also use gitk
18:20 miesco qsx: Yea but the graph looks the same
18:20 qsx miesco: well, yeah.
18:20 qsx it’s the same data after all
18:20 miesco qsx: Nothign with like a big graph in the middle of the screen?
18:20 vuoto_ joined #git
18:20 qsx *shrug* never needed that
18:21 rndguy GodGinrai: can I also have all the git files directly in my httpdocs?
18:21 chrisshattuck joined #git
18:22 jost_ joined #git
18:24 meatchicken if I am on detached head A - how do I push this to my local branch?
18:24 durham joined #git
18:24 meatchicken assuming detached head is behind local branch( I went back a few commits)
18:24 NeverDie joined #git
18:25 miesco To remove an alias, I type `git -z alias.l`, right?
18:25 nilg joined #git
18:26 kfunk joined #git
18:26 NeverDie joined #git
18:26 pioiytr joined #git
18:26 cdg joined #git
18:26 stantonk joined #git
18:27 miesco Whatever, I just edited my .gitconfig
18:27 GodGinrai rndguy: you could, but I wouldn't suggest it.
18:27 miesco What do you recommend I set `merge.tool` to?
18:27 rpd meatchicken: if you just want to go back a few commits on a local branch, just reset instead of w/e you did
18:27 rpd or you can rebase
18:27 rpd Why are you in a detached head mode?
18:27 meatchicken I went back to a passing commit
18:27 ncthom91 joined #git
18:27 meatchicken and started working on it
18:28 meatchicken and now I have a bunch of work I want to merge in
18:28 meatchicken but would prefer to remove all the previous changes that came after the commit I went back to
18:30 miesco I want to use vim as my merge tool...
18:30 miesco Is that possible?
18:30 rpd meatchicken: well, you could just put your detached head onto a real branch `git checkout -b new_branch`, reset your local branch to the commit before you started work on new_branch (removes all future commits), and rebase the local branch off of new_branch
18:31 rpd miesco: isn't vimdiff the default anyways?
18:31 meatchicken rpd, how do I reset commits I've already pushed lol
18:33 rpd meatchicken: you can reset and force push
18:33 rpd you can also revert commits if you want a history of removing those commits
18:33 meatchicken eh ended up using git push origin HEAD:LOCAL_BRANCH -f
18:33 meatchicken no one has pulled down my stuff
18:33 meatchicken so rewriting history - a-ok
18:34 meatchicken thank you for your help, rpd :)
18:34 GodGinrai meatchicken: take note of what rpd suggested, for if you get into this situation again when people *have* pulled your stuff
18:34 romerocesar joined #git
18:35 miesco rpd: Wikia says this: "Git ships with support to invoke Vimdiff as a "mergetool" to help resolve merge conflicts. Unfortunately Vim struggles a bit with three-way diffs, both with highlighting the differences and with shuffling individual changes between the three windows."
18:35 Ahmed90 joined #git
18:35 rpd yeah, I'm not saying vimdiff is a particularly good merge tool, but if you want to use vim there you go
18:35 mariuscc joined #git
18:35 rpd personally I used meld
18:35 rpd kdiff is fine as well
18:36 GodGinrai rpd: I think his point was that it wasn't default
18:36 rpd ah
18:36 * GodGinrai doesn't use a merge tool and just opens the files with conflicts in vim after the fact.
18:37 nwkj86 joined #git
18:37 _ikke_ mergetools can make merging easier
18:37 GodGinrai I could see that
18:38 osse but you won't
18:38 phanimahesh meatchicken: use --force-with-lease instead of -f/--force when doing a force push. It's slightly safer
18:38 GodGinrai osse: as long as a merge doesn't bother me enough to try using a mergetool, I probably won't.
18:38 ynanm joined #git
18:39 phanimahesh I tried many merge tools, nothing satisfied me so far. :/
18:39 phanimahesh I use meld/vimdiff or splice.vim depending on my mood these days
18:40 courrier joined #git
18:40 Peuc2 joined #git
18:42 CheckDavid joined #git
18:44 slash77 joined #git
18:45 pur3eval joined #git
18:47 nonconvergent left #git
18:48 AndroidLoverInSF joined #git
18:49 Brain joined #git
18:50 GavinMagnus joined #git
18:51 Cassiopaya joined #git
18:51 netj joined #git
18:52 djb-irc joined #git
18:54 tristanp_ joined #git
18:55 fuchstronaut joined #git
18:55 catag87 joined #git
18:56 m0viefreak joined #git
18:57 djb-irc joined #git
19:01 ac3takwas joined #git
19:01 sq-one joined #git
19:01 EvilPeng1 joined #git
19:01 GavinMagnus joined #git
19:03 jungsubk joined #git
19:03 miesco GodGinrai: No my point was that it was missing features
19:03 nitin joined #git
19:04 miesco What are your thoughts on this https://github.com/whiteinge/dotfi​les/blob/master/bin/diffconflicts
19:05 NeXTSUN joined #git
19:05 Literphor joined #git
19:06 Shock- joined #git
19:07 dmto joined #git
19:08 SwiftMatt joined #git
19:09 Lotlot joined #git
19:10 NeverDie_ joined #git
19:10 irco joined #git
19:11 NeverDie_ joined #git
19:13 azbarcea joined #git
19:15 miesco Anyone know how exactly vimdiff struggles with shuffling the individual changes in the three windows?
19:15 showaz joined #git
19:15 romerocesar joined #git
19:15 djb-irc joined #git
19:16 raijin joined #git
19:20 Zamerick_ joined #git
19:21 annoymouse joined #git
19:21 tristanp joined #git
19:22 dreiss joined #git
19:22 rpd miesco: I mean, the UI just looks messy sometimes when there's three files; I wouldn't say it struggles beyond the fact that it is hard to read
19:23 kappy joined #git
19:23 miesco rpd: Okay.  Well then the `diffconflicts` script there should fix that.  It has bindings to highlight only two of the files.
19:27 GavinMagnus joined #git
19:29 nebg joined #git
19:30 tristanp_ joined #git
19:30 nebg hello everyone ... instead of doing "git clone <url>" and download all the commits and history and branches... is there a way to download only the last commit ?
19:31 stantonk joined #git
19:32 ResidentBiscuit That doesn't make much sense in git
19:33 GodGinrai ResidentBiscuit: I think he just wants to download a file archive
19:33 GodGinrai nebg: Most sites like github have a "download zip" option
19:34 ResidentBiscuit Ah that makes more sense
19:34 nebg GodGinrai, for example i want to download the linux kernel but not all the versions... which come with git
19:34 GodGinrai nebg: so you use the "download zip" option on github
19:34 ResidentBiscuit ^
19:35 ResidentBiscuit You don't want to clone, infact you want nothing to do with git in this situation. Just download the code
19:35 ojacobson nebg: for repos with remote archive enabled, you can use git-archive to do that, too
19:35 ojacobson I believe the linux kernel team export tarballs fairly regularly; maybe ask them where to find that?
19:36 GodGinrai Well, they do that, too. But once again.  Github has this handy button....
19:37 rpd nebg: you can download a single branch
19:37 matleh joined #git
19:37 rpd you can also only download the history for a certain amount of commits
19:37 GodGinrai rpd: that would still contain the history of the branch
19:37 rpd you can limit the history
19:38 GodGinrai Why is everyone so intent on telling him how to open the door with a weedwhacker instead of how to turn the knob?
19:38 usm4n_ joined #git
19:38 fuchstronaut joined #git
19:39 chris2 joined #git
19:41 nebg rpd, ok thanks how  ?
19:41 rpd tbf, the question was how to open a door with a weedwhacker
19:42 ResidentBiscuit He clearly didn't any better. If he just wants the code, without any version info, then just download the code. There is no other answer
19:42 rpd well, but there is a way to open a door with a weedwhacker
19:42 rpd nebg: git clone --branch <branch_name> --single-branch --depth=N
19:42 rpd nebg: as everyone keeps saying, don't do that
19:44 GodGinrai rpd: Yes, but just because someone asks an xy question doesn't mean you should go down the rabbit hole with them.
19:44 GodGinrai ResidentBiscuit: Yes.  100 times yes.
19:45 nebg rpd, why  ?
19:46 GodGinrai nebg: Because you aren't actually needing to use git.  You don't use something just because you could.
19:46 Bizkit joined #git
19:47 settermjd joined #git
19:47 nebg GodGinrai, why not ?
19:48 ResidentBiscuit Question: Do you intend on working on the linux kernel?
19:49 Pulp joined #git
19:49 nebg yes
19:49 nitin joined #git
19:49 GodGinrai nebg: If you plan on working on the linux kernel, then you need the history and should be properly cloning
19:49 ResidentBiscuit ^
19:49 nebg GodGinrai, why  ?
19:49 ResidentBiscuit You should have just said this from the beginning
19:49 ResidentBiscuit Holy crap
19:50 GodGinrai is there a mod in here?  I'm fairly certain nebg is a troll
19:50 * ResidentBiscuit backs up slowly
19:50 ojacobson GodGinrai: I'm watching closely, but I'm not going to ban someone for being difficult to help.
19:50 bremner GodGinrai: start by ignoring him then.
19:50 bremner or her.
19:50 ojacobson Rampant sexism, racism, and homophobia, or spam, yes
19:50 zacts joined #git
19:50 qsx bremner: them :)
19:50 bremner phew.
19:50 bremner I just avoided a ban there.
19:50 Darcidride joined #git
19:51 ojacobson haha :)
19:51 GodGinrai bremner: I don't ignore people
19:51 ResidentBiscuit lmao
19:51 bremner GodGinrai: that mainly seems to be your problem then, tbh.
19:51 nebg GodGinrai, sorry  ? a troll ?
19:51 GodGinrai bremner: Problem? No.  Principle? Yes.
19:51 bremner GodGinrai: I mean, just stop responding, if you think it's useless
19:51 Shock- joined #git
19:51 ResidentBiscuit ^
19:52 ResidentBiscuit nebg has already been answered
19:52 ojacobson _please_ stop responding.
19:52 johnmilton joined #git
19:52 GodGinrai bremner: I have already stopped responding to nebg.
19:52 AKPWD joined #git
19:52 nebg ojacobson, sorry can you explain what did i do ?  it seems the situation is precipitating... i'm sorry if i did questions too simple...
19:53 nebg but it doesn't seem the case having this behaviour....
19:53 nebg anyway thanks for the answers
19:54 showaz git-over-http support chunked http?
19:55 apotry joined #git
19:55 go1111111 joined #git
19:56 stantonk_ joined #git
19:58 espindola joined #git
19:59 srpx joined #git
20:00 texinwien joined #git
20:01 FunkyAss joined #git
20:02 bonks left #git
20:04 tristanp joined #git
20:05 pur3eval joined #git
20:08 jstimm_ joined #git
20:09 azbarcea joined #git
20:10 dreiss joined #git
20:10 yqt joined #git
20:10 newbie1 joined #git
20:10 johnmilton joined #git
20:11 jhass joined #git
20:11 Lotlot joined #git
20:11 mischat joined #git
20:14 hahuang61 joined #git
20:16 D[4]ni joined #git
20:17 espindola joined #git
20:17 _ikke_ .version
20:17 Topic for #git is now Welcome to #git, the place for git help and recursion | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-sweep: It's brooms, all the way down.
20:17 _ikke_ Are we getting sloppy?
20:18 GodGinrai _ikke_: sloppy how?
20:18 _ikke_ Version updates in the topic
20:19 _ikke_ Was announced yesterday
20:21 djb-irc joined #git
20:22 AKPWD joined #git
20:25 drodger joined #git
20:25 pur3eval joined #git
20:26 elsevero joined #git
20:27 ahmedelgabri joined #git
20:27 gkatsev joined #git
20:29 ash_workz joined #git
20:31 vishal shouldn't version updates be automated!? :)
20:31 vishal gitinfo periodically checks the tree for new tags and does it..
20:32 _ikke_ it looks at git-scm.org iirc
20:32 _ikke_ But I haven't seen it updating for some time
20:32 vishal oh so it was supposed to be automatic?
20:32 _ikke_ yes
20:33 vishal ah just a bug then :) smop... :)
20:33 _ikke_ https://github.com/jast/gitinfo​/blob/master/plugins/version.pm
20:33 nnyk_ joined #git
20:34 _ikke_ It looks at tags in a repo now though
20:34 BrianAL joined #git
20:35 BrianAL With git for windows, how do we configure it so it doesn't always prompt for the microsoft sign-in credentials?  Never had this headache with git on linux
20:36 _ikke_ microsoft sign-in credentials?
20:38 aidalgol joined #git
20:38 boombatower joined #git
20:38 BrianAL yes
20:38 * vishal wat :)
20:38 _ikke_ When and how does it ask for those?
20:39 BrianAL great big window, Sign In.  Because you're accessing sensitive info, you need to verify your password. .....
20:39 fuchstronaut joined #git
20:39 BrianAL It's a window running from Git Credential Manager for Windows.
20:39 _ikke_ Never seen that
20:39 BrianAL Pops up in the background a lot.
20:39 vuoto joined #git
20:40 BrianAL The latest version of git for windows seems to have set a system credential.helper of manager.
20:41 patarr joined #git
20:41 is_null left #git
20:42 GodGinrai BrianAL: Never seen that before.
20:43 GodGinrai None of my coworkers using git for windows have that
20:43 Blkt joined #git
20:44 BrianAL guess I will try a full uninstall and reinstall
20:44 BrianAL (again)
20:44 psacrifice joined #git
20:45 clemf joined #git
20:45 _ikke_ Can't you unset the credential manager?
20:47 Hobbyboy joined #git
20:47 fuchstronaut joined #git
20:48 dsantiago joined #git
20:49 acetakwas joined #git
20:49 nilg joined #git
20:49 hahuang61 joined #git
20:51 medeirosthiiago joined #git
20:52 usm4n joined #git
20:53 stantonk joined #git
20:57 acetakwas joined #git
20:57 fuchstronaut joined #git
20:59 tristanp joined #git
21:00 jeffreylevesque joined #git
21:01 cfoch_ joined #git
21:01 cfoch_ can I cherry-pick or something like that just a few lines of an old commit?
21:02 hahuang61 joined #git
21:03 cbreak cfoch_: git checkout -p
21:03 circ-user-JW25t GIthub asks me a password when I have the account-wide RSA key installed. How do I communicate this key file to my git engine?
21:03 cbreak circ-user-JW25t: make sure it's properly installed
21:03 cbreak ssh git@server should tell you
21:03 catag87 joined #git
21:03 cbreak if that doesn't work, then ssh can't find it
21:03 circ-user-JW25t I used is previously. Now, I added a new project and cannot push.
21:04 cbreak use ssh-add to add the key to the agent
21:05 circ-user-JW25t Interestinly, ssh -T git@github.com succeeds. It just cannot push my project.
21:06 circ-user-JW25t It asks password when I push it.
21:06 cbreak circ-user-JW25t: git ls-remote
21:06 cbreak check the URL
21:06 cbreak circ-user-JW25t: do you notice something?
21:07 cbreak circ-user-JW25t: also try git remote -v
21:08 circ-user-JW25t Damn, I guess that this is because the default download protocolo is https
21:09 cfoch_ Can I cherry-pick just a few lines of an old git commit (2014) and then do some modifications in my code but keeping that those "picked" lines were from 2014, while the new modifications are from this year?
21:09 chachasmooth joined #git
21:10 cbreak cfoch_: no
21:11 cbreak cfoch_: do what I told  you
21:11 cbreak you'll get the changes, among others
21:11 cfoch_ cbreak: but I want to keep the year of the edition
21:11 cbreak or cherry-pick -n first, then checkout -p HEAD the things you don't want away
21:11 cbreak cfoch_: doesn't matter
21:11 cbreak cfoch_: you can chose any commit time you want when committing
21:12 cfoch_ cbreak: but what will "git blame" say?
21:12 cbreak cfoch_: see man git-commit
21:12 gitinfo cfoch_: the git-commit manpage is available at http://jk.gs/git-commit.html
21:12 cbreak cfoch_: it'll give the commit you're about to make as the one to blame of course
21:12 cfoch_ will git-blame say that the change has been from 2014?
21:12 cbreak no
21:12 cbreak it'll say they are from that commit
21:12 cbreak the commit will claim to be from when ever you want
21:13 cbreak but everyone with half a brain will know it's a lie of course
21:16 Dyonisos joined #git
21:17 EvilPeng1 joined #git
21:18 Zamerick_ joined #git
21:20 acetakwas joined #git
21:21 zacts joined #git
21:22 miesco joined #git
21:22 miesco Hi.  I lost my origin/master.  How do I find it?!
21:22 BlaXpirit sounds funny
21:22 ahr3n joined #git
21:22 _ikke_ git fetch?
21:22 sobersabre_ joined #git
21:23 Drone4four joined #git
21:23 Drone4four left #git
21:23 KnightRider00 left #git
21:23 GodGinrai that will make the dog go out and find your master for you :P
21:24 King_Hual joined #git
21:24 King_Hual joined #git
21:24 chardan joined #git
21:25 mellernoia joined #git
21:25 tgunr joined #git
21:25 spudowiar joined #git
21:25 jhass my guess is git remote -v
21:25 anuxivm joined #git
21:25 ahmed_elgabri joined #git
21:26 stonerfish joined #git
21:26 AndyBrown left #git
21:26 ygeLN joined #git
21:27 Fissure joined #git
21:27 HoierM_ joined #git
21:27 clemf joined #git
21:28 refried_ joined #git
21:28 cdown joined #git
21:28 rpd did you lose your origin or your master... or both?
21:31 miesco _ikke_: Yes
21:31 chachasmooth joined #git
21:32 drodger joined #git
21:32 miesco I can see it with `git log --all`
21:34 jeffreylevesque left #git
21:34 miesco How do I get `git log --oneline --decorate --graph` to not wrap?:
21:35 jokajak joined #git
21:35 D[4]ni joined #git
21:37 jokajak joined #git
21:37 cbreak tell the pager
21:37 cbreak or use --nopager?
21:38 pdgwien joined #git
21:40 moei joined #git
21:40 miesco fatal: unrecognized argument: --nopager
21:40 jokajak joined #git
21:42 xlegoman joined #git
21:43 miesco thanks!
21:43 miesco git config alias.graph !git --no-pager log --oneline --decorate --graph
21:43 NeXTSUN joined #git
21:45 jokajak joined #git
21:47 chachasmooth joined #git
21:47 clemf joined #git
21:47 wywedanse joined #git
21:47 miesco When I type `git merge origin/master` it says that I have an untracked file that will be deleted...
21:47 wywedanse left #git
21:48 miesco And more importantly `git status` shows nothing
21:48 tristanp joined #git
21:48 Cheaterman joined #git
21:48 Cheaterman left #git
21:49 miesco ...
21:49 _ikke_ Ignored file?
21:49 Dougie187 left #git
21:49 miesco https://gist.github.com/e374​f51db2f2b1a758fb41d605b66675
21:52 miesco _ikke_: Its saying that
21:52 WaReZ joined #git
21:52 rpd miesco: what does `git status` say
21:52 miesco rpd: that...
21:53 raijin joined #git
21:53 troulouliou_div2 joined #git
21:53 miesco rpd: Oh its the same as `git status master`; I don't evne know if you can put a branch for git status
21:53 _ikke_ euhm, doesn't that do a *path* filter, not a branch filter?
21:53 _ikke_ try git status
21:54 xpk joined #git
21:54 rpd yeah, I was just curious
21:54 rpd apparently it says the same thing
21:54 _ikke_ git status master would not make sense
21:54 Lotlot joined #git
21:54 _ikke_ git ls-files -i --exclude-standard
21:54 miesco Oh I see
21:54 _ikke_ does that return that file?
21:55 miesco _ikke_: No, but I think I get it
21:55 _ikke_ ok
21:55 miesco _ikke_: https://gist.github.com/e3cb​946b37ead6d60eb59d4a7257afa1
21:57 _ikke_ git check-ignore .irssi/config
22:00 jstimm_ joined #git
22:03 miesco _ikke_: Well I had to actually back that file up as it was my old config that was going to get rewritten
22:03 stantonk joined #git
22:04 madewokherd joined #git
22:05 joki joined #git
22:06 a3Dman joined #git
22:07 acetakwas joined #git
22:10 miesco Man... why is gpg-agent asking for my password in my irssi tmux window...
22:13 rkazak joined #git
22:13 miesco Oh man... why would anyone do 'git fetch; git merge origin/master' so much work...
22:14 EvilPeng1 joined #git
22:15 Lotlot joined #git
22:15 McNozes joined #git
22:16 cfoch_ joined #git
22:19 devbug joined #git
22:21 nwkj86 joined #git
22:22 cdown joined #git
22:24 catag87 joined #git
22:24 usm4n left #git
22:25 BrianAL joined #git
22:31 cdown joined #git
22:32 nitesh joined #git
22:34 HoierM_ joined #git
22:34 paws_ joined #git
22:34 rudi_s miesco: It's just git merge (you can omit the origin/master if it's the remote tracking branch for the current branch which is most likely true for master) - and some people like to actually review the changes before they merge them in.
22:35 rudi_s (As you might've guessed I'm one of those people who never uses git pull, but only fetch and merge - with tig or git log -p in between to review the changes.)
22:35 Lotlot joined #git
22:36 rudi_s (Oh, and with the right aliases this becomes: g f; t; g m;)
22:36 rubyonrailed joined #git
22:37 UTAN_dev joined #git
22:37 davisonio joined #git
22:44 ORiON-- joined #git
22:45 elastix joined #git
22:49 stantonk joined #git
22:50 NeverDie joined #git
22:50 cdown joined #git
22:52 skapunker joined #git
22:53 NeverDie joined #git
22:53 Thorn joined #git
22:53 chachasmooth joined #git
22:54 tristanp joined #git
22:56 astrofog joined #git
22:57 jokajak joined #git
22:57 livingstn joined #git
22:59 ziongate left #git
23:02 rubyonrailed joined #git
23:05 jokajak joined #git
23:06 chachasmooth joined #git
23:07 jfelchner joined #git
23:07 jokajak joined #git
23:07 k-man joined #git
23:11 elastix joined #git
23:13 jokajak joined #git
23:13 Rodya_ joined #git
23:14 SwiftMatt joined #git
23:15 IWishIKnew joined #git
23:16 bouncy joined #git
23:17 KnightsOfNi joined #git
23:18 jokajak joined #git
23:18 kulelu88 joined #git
23:19 arescorpio joined #git
23:19 clemf joined #git
23:20 zacts joined #git
23:21 ffabi joined #git
23:23 GavinMagnus left #git
23:23 jokajak joined #git
23:25 liamonade joined #git
23:28 DarkoEyes joined #git
23:30 Rodya_ joined #git
23:30 MattMaker joined #git
23:31 hck89 joined #git
23:32 Lyqyd joined #git
23:33 cfoch joined #git
23:34 ShapeShifter499 joined #git
23:38 drodger joined #git
23:42 ShapeShifter499 joined #git
23:43 nd joined #git
23:46 rubyonra_ joined #git
23:46 raijin joined #git
23:48 ferr joined #git
23:50 jokajak joined #git
23:51 cfoch joined #git
23:52 EvilPeng1 joined #git
23:53 pur3eval joined #git
23:54 jokajak joined #git
23:56 * Eugene spotted the emacs user
23:56 liquidjamm joined #git
23:56 HoierM_ joined #git
23:57 jokajak joined #git
23:57 romerocesar joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary