Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-05

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

All times shown according to UTC.

Time Nick Message
00:00 hahuang61 joined #git
00:03 zumba_addict joined #git
00:04 tomzx joined #git
00:05 watabou joined #git
00:05 Gsham joined #git
00:05 tesuji_ joined #git
00:05 clivejo joined #git
00:06 Literphor joined #git
00:08 PaulCapestany joined #git
00:09 Impaloo joined #git
00:10 shgysk8zer0_ joined #git
00:10 qpdb joined #git
00:12 f3r70rr35f joined #git
00:14 fscala joined #git
00:15 Atlantic777 joined #git
00:15 Atlantic777 joined #git
00:16 same_ol_geez joined #git
00:16 bauruine joined #git
00:16 xnrand joined #git
00:16 same_ol_1eez joined #git
00:17 kus joined #git
00:17 BeerSerc joined #git
00:17 nyuszika7h joined #git
00:19 ahmed_elgabri joined #git
00:19 dunpeal joined #git
00:25 xaviergmail joined #git
00:26 romerocesar joined #git
00:30 Rodya_ joined #git
00:30 fstd_ joined #git
00:35 zacts joined #git
00:42 efdetonator joined #git
00:44 jokajak joined #git
00:44 dunpeal I'm on branch foo. How do I find the last merge commit in which master was merged into it?
00:45 crayon joined #git
00:47 dunpeal I know about `git merge base HEAD master`, but it will give me the parent commit of the merge commit on the master side, not the merge commit itself.
00:47 jaguarmagenta joined #git
00:48 Isla_de_Muerte joined #git
00:52 kbs not a git expert :) but you want the parent of git log master..foo ?
00:52 shgysk8zer0_ joined #git
00:53 * kbs usually does the dumb thing of git log --graph --oneline for such things, at least for non-programmatic stuff
00:55 Gsham joined #git
00:57 chrisshattuck joined #git
00:58 liuzhen joined #git
01:02 mehola joined #git
01:06 GT4066 joined #git
01:06 xaviergmail joined #git
01:07 cqi joined #git
01:07 cbRoy joined #git
01:08 Gsham joined #git
01:16 pioiytr joined #git
01:18 Rodya_ joined #git
01:19 ahmed_elgabri joined #git
01:22 Rodya_ joined #git
01:22 BombStrike joined #git
01:23 dreiss joined #git
01:25 checkItOut joined #git
01:26 Mateo_W joined #git
01:26 checkItOut joined #git
01:29 Shentino joined #git
01:29 Literphor joined #git
01:31 ekinmur joined #git
01:31 pks joined #git
01:33 codeman joined #git
01:34 Mateo_W joined #git
01:41 ReginaldFop joined #git
01:41 azbarcea joined #git
01:46 stantonk joined #git
01:46 liquidjamm joined #git
01:46 fuchstronaut joined #git
01:48 HoierM joined #git
01:55 Sucks joined #git
02:00 Literphor joined #git
02:01 hahuang61 joined #git
02:01 fracting joined #git
02:01 CEnnis91 joined #git
02:02 Rodya_ joined #git
02:06 nidr0x joined #git
02:06 a_thakur joined #git
02:06 MattMaker joined #git
02:07 ahr3n joined #git
02:10 chachasmooth joined #git
02:12 texinwien joined #git
02:12 ahr3n joined #git
02:13 ajf- joined #git
02:14 nnyk_ joined #git
02:15 ome joined #git
02:16 ToBeCloud joined #git
02:16 mkopriva joined #git
02:17 Rodya_ joined #git
02:18 Goplat joined #git
02:19 chuertab joined #git
02:20 ahmed_elgabri joined #git
02:22 Lyqyd joined #git
02:24 ahr3n joined #git
02:30 hexagoxel joined #git
02:34 ahr3n joined #git
02:35 Rodya_ joined #git
02:38 efdetonator joined #git
02:39 jim_carry joined #git
02:42 jim_carry I have merged a pull-request locally by 'git fetch origin pull/1/head:brancname'; 'git checout branchname'; and did minor changes and then merged it to master and pushed it back. But still the pull requests shows open instead of merged. What I have done wrong?
02:43 ojacobson Depends on what's in the "minor changes"
02:44 ojacobson a rebase, for example, will have broken the relationship between your local `brancname` and the original pull request
02:45 jim_carry Yeah I have rebased it
02:45 ojacobson That'd do it.
02:45 jim_carry So what is the preferred way
02:46 ojacobson If you want the pull request rebased, either do it yourself and close the PR by hand, or ask the original author to rebase it and re-push their branch (which will also update the pull request)
02:46 ojacobson if you want github to automatically detect your merge, your merge needs to include the actual pull request commits, not merely copies of them
02:47 ahr3n joined #git
02:48 jaguarmagenta joined #git
02:49 tjone270 joined #git
02:49 jim_carry Will contributor be happy if I manually rebase commits and close PR by hand?
02:51 ojacobson How, exactly, do you expect anyone here to be able to know that? :)
02:51 ojacobson That's going to come down to how well you communicate what you did and why, I suspect, but the contributor may not care at all
02:51 ejb joined #git
02:51 ojacobson or may be a defensive, abusive asshat about it
02:52 ojacobson "Hey, I merged these, but I rebased them first in [hash]. Closing." is usually what I do.
02:52 ojacobson (in the PR comments.)
02:52 jim_carry Okay ojacobson thanx
02:55 Gamecubic joined #git
02:58 ahr3n joined #git
03:00 dunpeal joined #git
03:03 zacts joined #git
03:04 chrisshattuck joined #git
03:05 zacts joined #git
03:05 Silenced joined #git
03:05 Silenced joined #git
03:06 chrisshattuck joined #git
03:07 ash_workz joined #git
03:08 mehola joined #git
03:09 Literphor joined #git
03:09 nilg joined #git
03:09 cqi joined #git
03:10 chrisshattuck joined #git
03:10 a_thakur joined #git
03:11 mkopriva joined #git
03:13 harish_ joined #git
03:18 dunpeal joined #git
03:18 xlegoman joined #git
03:20 rgrinberg joined #git
03:20 pioiytr joined #git
03:21 ahmed_elgabri joined #git
03:28 sangy joined #git
03:28 xaviergmail joined #git
03:35 kutsuya joined #git
03:38 liuzhen joined #git
03:41 durham joined #git
03:41 durham joined #git
03:45 stantonk joined #git
03:45 fuchstronaut joined #git
03:48 rkazak joined #git
03:49 t2mkn joined #git
03:55 chrisshattuck joined #git
03:55 PaulCape_ joined #git
03:57 safe joined #git
04:00 muthu joined #git
04:00 mmlb joined #git
04:01 cywfong joined #git
04:02 hahuang61 joined #git
04:03 hk238 joined #git
04:05 mkopriva joined #git
04:06 pioiytr joined #git
04:09 stonerfish joined #git
04:09 harish joined #git
04:10 Rodya_ joined #git
04:10 stantonk joined #git
04:10 Shentino joined #git
04:10 ahr3n joined #git
04:11 rscata joined #git
04:19 boombatower joined #git
04:21 ahr3n joined #git
04:22 ahmed_elgabri joined #git
04:26 fracting joined #git
04:30 Rodya_ joined #git
04:34 freimatz joined #git
04:41 snowkidind joined #git
04:42 darlinger left #git
04:42 freimatz joined #git
04:49 jaguarmagenta joined #git
04:50 lrp joined #git
04:51 zacts joined #git
04:53 Cabanossi joined #git
04:53 lrp joined #git
04:56 zacts joined #git
04:59 subhojit777 joined #git
04:59 mkopriva joined #git
04:59 phanimahesh joined #git
05:02 dunpeal joined #git
05:05 phaleth joined #git
05:10 Literphor joined #git
05:14 Motoko joined #git
05:16 dreiss joined #git
05:17 quetz joined #git
05:17 earational joined #git
05:18 hahuang61 joined #git
05:20 zacts joined #git
05:22 Literphor joined #git
05:22 ahmed_elgabri joined #git
05:23 cyan__ joined #git
05:23 _ng joined #git
05:25 nnyk_ joined #git
05:25 Silenced joined #git
05:25 Silenced joined #git
05:25 b100s joined #git
05:26 mariuscc joined #git
05:29 Silenced_v2 joined #git
05:29 Silenced_v2 joined #git
05:31 dopesong joined #git
05:33 scorphus joined #git
05:34 Gamecubic_ joined #git
05:35 qt-x joined #git
05:36 MattMaker joined #git
05:38 thiago joined #git
05:38 thiago joined #git
05:39 Literphor joined #git
05:41 ThomasLocke joined #git
05:41 inflames joined #git
05:46 fuchstronaut joined #git
05:46 Ma5ter joined #git
05:51 Alienpruts joined #git
05:53 basiclaser joined #git
05:56 zeroed joined #git
05:56 User458764 joined #git
05:57 User458764 joined #git
05:59 PCatinean joined #git
06:00 xlegoman joined #git
06:00 Macaveli joined #git
06:00 shgysk8zer0 joined #git
06:01 tesuji joined #git
06:04 acetakwas joined #git
06:07 freimatz joined #git
06:10 mehola joined #git
06:11 vbolea joined #git
06:11 dopesong joined #git
06:12 SimonNa joined #git
06:12 thiago joined #git
06:14 ahmed_elgabri joined #git
06:14 shgysk8zer0 joined #git
06:15 Ma5ter joined #git
06:15 clemf joined #git
06:19 ahmedelgabri joined #git
06:20 dopesong joined #git
06:23 MrWoohoo joined #git
06:24 Ma5ter joined #git
06:24 Mavericks joined #git
06:26 Mavericks does git log <remote repository name>:<remotebranchname> help peruse just like git log --stat -p
06:26 nnyk_ joined #git
06:28 _ikke_ I don't understand your question
06:29 stantonk joined #git
06:29 romerocesar joined #git
06:30 Mavericks _ikke_: i'm trying to go through commits in remote repo.
06:30 SwiftMatt joined #git
06:30 abhvl joined #git
06:30 abhvl left #git
06:31 dsdeiz joined #git
06:31 Mavericks never mind got it . it's git logs --remote=<remote repo.name>/<remote branch name>
06:31 Mavericks thanks
06:32 abhvl joined #git
06:32 abhvl left #git
06:33 _ikke_ Note that this is still a local operation
06:33 Softeisbieger joined #git
06:33 kfunk joined #git
06:34 zacts joined #git
06:34 Mavericks _ikke_: aah yes. thanks for mentioning. helps
06:37 Sceorem joined #git
06:38 lordjancso joined #git
06:39 ahr3n joined #git
06:39 Alienpruts joined #git
06:41 Silenced joined #git
06:41 Silenced joined #git
06:42 raven-au joined #git
06:44 danemacmillan joined #git
06:45 garethdaine joined #git
06:49 LeMike joined #git
06:49 jaguarmagenta joined #git
06:52 moriko joined #git
06:54 denimsoft joined #git
06:56 Balliad joined #git
06:56 acetakwas joined #git
06:57 noeden joined #git
06:57 mwhooker joined #git
06:58 Brain joined #git
06:59 raven-au joined #git
07:00 Literphor joined #git
07:04 Khisanth joined #git
07:04 dunpeal joined #git
07:07 zeroed_ joined #git
07:10 netj joined #git
07:10 zumba_addict joined #git
07:10 ahmedelgabri joined #git
07:12 BigBear joined #git
07:12 Mavericks joined #git
07:12 TomyWork joined #git
07:13 loopy joined #git
07:15 dopesong_ joined #git
07:15 adante_ joined #git
07:15 Cata|Work joined #git
07:16 Motoko joined #git
07:16 mattp_ joined #git
07:16 jrnieder joined #git
07:17 ItSANgo joined #git
07:17 piling_ joined #git
07:18 frogonwheels joined #git
07:18 jleclanche joined #git
07:19 thomas joined #git
07:19 spriz joined #git
07:19 DarkMukke joined #git
07:22 mwhooker joined #git
07:22 checkItOut joined #git
07:22 thesquib joined #git
07:22 timthowtdi joined #git
07:23 dreiss joined #git
07:23 EspadaV8 joined #git
07:23 mattcen joined #git
07:24 encod3 joined #git
07:24 Chaser joined #git
07:26 shgysk8zer0 joined #git
07:26 Lynxium[] joined #git
07:28 circ-user-Zs542 joined #git
07:29 jatin30 joined #git
07:30 jatin30 how do I remove the extra [branch "master"] in this https://bpaste.net/show/3afbe1cc52fe ?
07:30 Lynxium joined #git
07:30 tobiasvl jatin30: just edit the file and remove it?
07:30 unkn0wn joined #git
07:30 unkn0wn left #git
07:31 thiago jatin30: or just ignore it
07:31 thiago jatin30: why do you care?
07:31 jatin30 I just cant bear it
07:31 jatin30 I need to remove it
07:31 raven-au joined #git
07:31 hahuang61 joined #git
07:31 thiago OCD?
07:31 jatin30 is there a way?
07:31 jatin30 maybe
07:31 thiago yes, with a text editor
07:32 dopesong joined #git
07:34 jatin30 I dont know how can a text editor do it. JUst have a look at what I did actually https://bpaste.net/show/a6b37a14d82b
07:35 thiago open a text editor, scroll down to the line you want to remove, remove it
07:35 tobiasvl jatin30: .git/config is a simple text file, you can just edit it directly just like you cat-ed it directly
07:35 leeN joined #git
07:35 jatin30 oh thanks
07:36 lordjancso joined #git
07:37 DevAntoine joined #git
07:39 LeMike joined #git
07:40 nnyk_ joined #git
07:40 jast maybe the extra line is a piece of art created spontaneously by git :)
07:43 multi_io_ joined #git
07:43 Grum joined #git
07:44 irco joined #git
07:45 chid__ joined #git
07:46 mkopriva joined #git
07:47 fuchstronaut joined #git
07:48 Literphor joined #git
07:51 MafiaInc joined #git
07:54 kadoban joined #git
07:55 Neobenedict_ joined #git
07:55 Neobenedict_ joined #git
07:57 GavinMagnus joined #git
07:58 Lynxium[] joined #git
07:58 cookie3 left #git
07:58 jatin30 jast, wow!
07:59 jatin30 :P
08:02 jatin30 left #git
08:03 jatin30 joined #git
08:03 arand joined #git
08:03 flopsec joined #git
08:04 moriko joined #git
08:06 a_thakur joined #git
08:06 tvw joined #git
08:07 dunpeal joined #git
08:08 a_thakur_ joined #git
08:08 Khisanth joined #git
08:09 phanimahesh joined #git
08:12 Lynxium joined #git
08:14 phanimahesh joined #git
08:14 nilg joined #git
08:17 davidbz joined #git
08:18 Urbany joined #git
08:19 dopesong joined #git
08:20 Neobenedict joined #git
08:20 Neobenedict joined #git
08:24 daedeloth joined #git
08:25 daedeloth so, probably a weird question: I need to keep an svn and a git repo in sync the svn repo includes all external libraries which I don't want to keep in git
08:25 daedeloth is this possible or should I just shoot myself in the head?
08:25 marcogmonteiro joined #git
08:26 kurkale6ka joined #git
08:27 vkyeof joined #git
08:27 ahmedelgabri joined #git
08:28 Fijit joined #git
08:28 jor daedeloth: 'in sync', but exclude a part of the svn repo?
08:28 daedeloth yea
08:29 daedeloth I guess it sounds like madness
08:29 jor yeah, but so is shooting yourself in the head for it ;)
08:30 ramsub07 joined #git
08:30 daedeloth that is true
08:30 jor Been a while since it did git-svn, but I think it doesn't support svn:externals...
08:30 wrouesnel1 joined #git
08:31 Repox joined #git
08:31 daedeloth I just found something called "ignore path", going to give that a spin
08:31 stantonk joined #git
08:31 jor So you might be able to 'hide' part of the svn with that :/
08:31 Chill_Surf joined #git
08:31 jor But it should like you should just put the external libraries somewhere else :)
08:32 daedeloth yea I agree
08:33 daedeloth but our lead "doesn't trust git"
08:33 jor haha
08:33 rkazak joined #git
08:33 jor sory
08:33 jor *sorry
08:33 daedeloth oooh yea that seems to have worked :)
08:34 satbyy joined #git
08:35 fscala joined #git
08:35 nidr0x joined #git
08:36 digidog joined #git
08:38 harish_ joined #git
08:39 Khisanth joined #git
08:39 tarkus joined #git
08:42 fees joined #git
08:44 Darcidride joined #git
08:44 t0by joined #git
08:44 irqq joined #git
08:46 texinwien joined #git
08:47 Beams joined #git
08:49 Rish joined #git
08:50 Andrew_K joined #git
08:50 jaguarmagenta joined #git
08:50 nettoweb joined #git
08:51 WizJin joined #git
08:53 afuentes joined #git
08:56 cxz joined #git
08:59 romerocesar joined #git
09:00 afuentes joined #git
09:02 keltvek joined #git
09:02 ahr3n joined #git
09:07 King_Hual joined #git
09:07 cdown joined #git
09:08 Neobenedict_ joined #git
09:08 stantonk joined #git
09:09 MafiaInc joined #git
09:09 zarubin joined #git
09:10 a_thakur joined #git
09:11 unkn0wn joined #git
09:11 mrkat joined #git
09:12 Meteorhead joined #git
09:17 vuoto joined #git
09:18 unkn0wn left #git
09:20 jim_carry joined #git
09:26 checkItOut joined #git
09:27 vuoto joined #git
09:28 vuoto joined #git
09:33 atrigent joined #git
09:33 troulouliou_div2 joined #git
09:36 Rish_ joined #git
09:38 fracting joined #git
09:44 cbreak ha. ha. ha.
09:45 cbreak daedeloth: but svn is trusted?
09:45 Bombe Of course. It has not been written by some Finnish hippie.
09:46 QssT joined #git
09:46 dopesong joined #git
09:46 QssT anyone know how I can cherry pick a file from another branch?
09:47 QssT do I do something like: git cherry-pick branchname filename?
09:47 moritz QssT: git checkout otherbranch thefile
09:47 moritz and then commit
09:47 Chiko joined #git
09:47 cbreak Bombe: git is mostly written by git git shortlog -ns >  14915  Junio C Hamano
09:47 moritz QssT: cherry-pick only copies commits, not files
09:47 QssT is that cherry picking?
09:47 Bombe cbreak, not if you restrict the history to the first two weeks! :)
09:47 eijk joined #git
09:47 QssT I remember using cherry-pick for this before
09:47 fuchstronaut joined #git
09:48 bruce_lee joined #git
09:48 moritz it's not cherry-pick, no
09:48 moritz and I'd wager you mis-remember
09:48 dsdeiz joined #git
09:48 dsdeiz joined #git
09:49 alcohol joined #git
09:49 QssT okay, thanks
09:49 moritz git-cherry-pick - Apply the changes introduced by some existing commits
09:49 QssT I  guess it wasn't cherry-pick
09:50 QssT but in concept your command accomplished a cherry pick :-)
09:50 stoopkid joined #git
09:52 Chiko_ joined #git
09:52 stoopkid hi, does anyone know how to set up an irc commit-notifier on github?
09:53 mischat joined #git
09:53 xcesariox joined #git
09:56 stfn stoopkid: repo settings, webhooks & services
09:57 Mavericks joined #git
09:57 ntonjeta joined #git
09:57 Mavericks _ikke_: there ?
09:59 ferr joined #git
09:59 fuchstronaut joined #git
10:02 stoopkid stfn, any idea which of these services can do it? none of the summaries indicate anything about notifying an irc channel
10:02 stoopkid and google isn't being helpful except for tools i'd have to set up on my own comp
10:03 a_thakur joined #git
10:04 stfn stoopkid: well the one called "IRC"
10:05 b100s joined #git
10:06 Flying_Squirrel joined #git
10:06 netcarver joined #git
10:06 stoopkid woops, i was looking in the integrations directory
10:06 stoopkid thanks
10:07 lss8 joined #git
10:07 Flying_Squirrel Hi all! Dumb question of the day : how can you merge something without noticing? I appear to have merge 2 branches together without intending to. Hopefully a colleague could revert that but I'm left wondering what went wrong.
10:09 i7c Flying_Squirrel, maybe you pulled?
10:09 dunpeal joined #git
10:09 i7c pull is fetch + merge in the default configuration.
10:09 WayToDoor joined #git
10:10 NewbieWan joined #git
10:10 NewbieWan left #git
10:12 dopesong joined #git
10:15 jbitdrop joined #git
10:23 sdothum joined #git
10:24 NimeshNeema joined #git
10:25 dopesong joined #git
10:26 jhass Flying_Squirrel: what's the commit message of the unintended merge commit?
10:30 fuchstronaut joined #git
10:30 Flying_Squirrel jhass: there is no commit message
10:31 Flying_Squirrel or rather just a description of the operation
10:31 jhass yes, I'm interested in the specific wording of that, real values if possible
10:32 danchr joined #git
10:32 diegoviola joined #git
10:32 Flying_Squirrel jhass: Merge branch 'issue1' of git.bla.bla.com/ProjectName into issue2
10:33 nettoweb joined #git
10:33 jhass sounds like you did indeed to a git pull origin issue1 while having issue2 checkout out locally
10:33 Flying_Squirrel oh
10:33 Flying_Squirrel so you mean I went on branch issue2 and git a git pull of issue1?
10:34 jhass yeah
10:34 jhass or you created issue2 like git checkout -tb issue2 origin/issue1 and did just "git pull"
10:34 Flying_Squirrel I think the first thing was the right one, I remember doing a git pull of a branch at some point
10:34 Xandaros joined #git
10:35 Flying_Squirrel I guess I forgot to go back to master before pulling
10:35 jhass a shell prompt displaying the current branch helps ;)
10:36 Flying_Squirrel well, yeah, that's true
10:36 Flying_Squirrel *scratching head* I'll look into that
10:36 danchr left #git
10:37 Xandaros I'm trying to do a giant merge. There is one commit in particular, that I'd like to merge in individually, because it restructures large parts and it's a pain to see how everything works when the merge is bunched together. Is there an easy way to achieve this? (Apart from doing three individual merges)
10:39 _ikke_ Not sure if it helps, but look at a tool called git imerge
10:39 _ikke_ !imerge
10:39 gitinfo https://github.com/mhagger/git-imerge -- a tool to split a large merge with many conflicts into many smaller merges, hopefully each with easier-to-understand small conflicts.
10:41 troulouliou_div2 joined #git
10:41 Xandaros Well, the description mentions exactly what I want, so that's a good start :D
10:42 Xandaros Not exactly what I'm looking for, but maybe even better. Thank you
10:43 b00^wk joined #git
10:43 b00^wk hello
10:44 b00^wk how do i just take changes from another branch into mine, do I cherry pick or .. ?
10:44 b00^wk dont know about picking cherries, just 've heard thats how you do it
10:45 Xandaros cherry-pick will pull in an individual commit. If you want all commits up to a common root, you can use merge
10:46 b00^wk Xandaros,  i basically have like,  commits 1-2-3-4 ..   while i branched from 1, and i want take all after 1 into my branch
10:46 b00^wk all from that 1 till current HEAD of the master, into my branch
10:46 mischat_ joined #git
10:47 tobiasvl man git merge
10:47 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
10:47 b00^wk i see, so that is merging
10:48 Xandaros It will create a commit with both branches as its parents. It will effectively do what you want, though not technically
10:48 nnyk_ joined #git
10:48 ag4ve joined #git
10:48 dopesong joined #git
10:48 b00^wk Xandaros, well i don't want them to merge, i just want to take the master's changes
10:48 b00^wk effectively
10:49 b00^wk and still carry on with  my branch
10:49 Xandaros Yes. Merge
10:49 b00^wk ok
10:49 tobiasvl Xandaros: it will technically also do what he asked, since a branch is just a pointer
10:49 Xandaros Right. I put more interpretation into his question than I should've, sorry
10:50 sagerdearia joined #git
10:50 b00^wk and cherry-picking then, what is that used for .. ?
10:50 b00^wk @_@
10:50 b00^wk i thought you can tell cherry pick take say, commit 1 2 3, and apply it to my stuff
10:50 Mavericks joined #git
10:50 mischat joined #git
10:50 Xandaros It will take a single commit, make a copy of it and put it onto the branch, with the current head of the branch as its parent
10:51 jaguarmagenta joined #git
10:51 b00^wk also kinda, seems like can work.. no ?
10:51 b00^wk i know i will need to merge, just asking
10:51 Sceorem joined #git
10:52 Xandaros You could cherry-pick all the commits in order, yes. An easier way to do that is to rebase the other branch and then fast-forward your branch. It's kinda sloppy in my opinion, though
10:53 checkItOut joined #git
10:53 daedeloth cbreak, apparently it is :D Not even duplicated I think, it's running on a server that just cannot be allowed to crash :P
10:53 tobiasvl b00^wk: cherry-pick (or rebase) and merge have their advantages and disadvantages. read for example http://stackoverflow.com/questions/1241720/git-cherry-pick-vs-merge-workflow
10:53 M-shine joined #git
10:54 deadnull joined #git
10:54 nettoweb joined #git
10:55 quenode joined #git
10:55 ag4ve but cherry pick doesn't mess anyone up you're working with
10:56 ag4ve most it'll do is dup commits
10:57 Neobenedict joined #git
10:57 dopesong joined #git
10:58 Xandaros That can cause problems, though. One person works off one commit and another off the other. In a rebase workflow, you need to make sure not to keep the old committs around. This is difficult to sync with other contributors, though
10:59 retropikzel joined #git
10:59 jensaronsson joined #git
10:59 psprint joined #git
11:00 psprint Hello. Is it true that cloned repo might have origin set or not? I think github sets origin, but bitbucket doesn't, is that true?
11:00 cdown joined #git
11:01 jhass no
11:01 jhass origin is set by the clone command
11:01 jhass to whatever you gave it as argument
11:01 daedeloth I'm having trouble linking an svn repo with a git repo
11:01 nilg joined #git
11:01 daedeloth I keep getting
11:01 daedeloth Unable to determine upstream SVN information from working tree history
11:01 grawity psprint: cloning only transfers data, not configuration, so `git clone` has to add the remote itself – and it always does.
11:01 daedeloth but when I try to cloen it in, I get
11:01 grawity daedeloth: which command are you using
11:02 ag4ve ah yeah, I didn't think about work based on message
11:02 daedeloth svn-remote.svn.url already set: http://192.168.1.9/svn/DieKeure_BoekEApp/trunk/src/BoekE/trunk
11:02 daedeloth well to clone I use:
11:02 daedeloth git svn clone http://192.168.1.9/svn/DieKeure_BoekEApp/trunk/src/BoekE . --ignore-paths="node_modules|jspm_packages|build.zip|.idea"
11:02 daedeloth to load the svn changes I call
11:02 daedeloth git svn rebase
11:03 daedeloth but then I get that Unable to determine upstream svn infor
11:03 nettoweb joined #git
11:04 psprint grawity: and what about [branch "master"], is it also always set?
11:04 grawity afaik `git clone` automatically configures an upstream for whatever branch it checks out, yes
11:05 jhass what the default HEAD is however is if you specify none to clone, is something that can be set by the remote however
11:06 jensaronsson Hi! If i have a master branch and feature branches. And merges the featurebranch into master. I then revert that commit from master. I continue to work in the featurebranch and then updates the featurebranch with master to keep it updated. But know master have a reverting commit, that removes my changes in the featurebranch. I dont know my question here, im just wondering on how to handle that
11:06 jensaronsson kind of sitation, where i can accidently remove stuff in the featurebranch.
11:06 tobiasvl !faulty_merge
11:06 gitinfo If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt
11:10 stantonk joined #git
11:11 checkItOut joined #git
11:11 M-mistake joined #git
11:11 M-meznak joined #git
11:13 SimonNa joined #git
11:13 johnmilton joined #git
11:14 mischat_ joined #git
11:14 rnsanchez joined #git
11:15 ojdo joined #git
11:18 ahmedelgabri joined #git
11:19 mehola joined #git
11:22 retropikzel joined #git
11:24 a_thakur joined #git
11:25 HoierM joined #git
11:30 Chiko_ left #git
11:30 chiko joined #git
11:31 fuchstronaut joined #git
11:32 The-Compiler joined #git
11:32 The-Compiler I have a long-running branch and would like to do an interactive rebase to clean it up a bit before merging it to master. However, I also merged master into the branch (with a few conflicts) once. Will this make things more difficult?
11:32 dopesong joined #git
11:33 selckin yes
11:33 selckin unless you rebase from after the merge
11:35 unbalancedparen joined #git
11:35 jhass that is you'll have to resolve the conflicts again
11:36 shymega joined #git
11:37 tobiasvl can rerere be used for that?
11:37 j416 git rerere to the rescue
11:37 j416 tobiasvl: I was thinking the same thing. I believe it could, as it only looks at conflicts and resolutions, not how they ended up being conflicts
11:38 j416 but unless The-Compiler enabled rerere earlier, it won't help now of course
11:38 The-Compiler I enabled rerere :)
11:38 j416 nice
11:38 j416 then that might help a bit.
11:38 j416 tias™
11:38 selckin the merge will be lost and history will have duplicate commits tho
11:39 The-Compiler maybe I just should pretend I don't care about the history before the merge :D
11:39 j416 selckin: duplicate? really
11:39 j416 hm
11:39 selckin not entirely sure, but i think so
11:39 selckin since the rebase will remove the merge commit
11:39 j416 rebase is quite clever in removing what has already been applied ime
11:40 j416 but I don't know how it does that so perhaps this is a corner case.
11:40 selckin so then you have the merged commits on both branches, and then you merge again after the cleanup
11:40 stonerfish joined #git
11:40 j416 The-Compiler: just try rebasing and see where that gets you
11:41 j416 The-Compiler: it could perhaps be easier to do it in steps; rebase the part before the merge first, then use rebase --onto to rebase the rest
11:41 j416 The-Compiler: maybe, just maybe, rebase can fix it on its own in one go. but try.
11:41 The-Compiler would it make sense to do the first rebase --onto the commit where the branch originated?
11:42 j416 s/but try/try/
11:42 j416 The-Compiler: 1. just rebase and see if it explodes
11:42 The-Compiler will do after I fixed my tests, was asking here while they were running ;)
11:44 j416 The-Compiler: 2. create a branch as backup from the one you're trying to rebase; reset it to the state just before you merged master, rebase that on top of master and fix your conflicts, then checkout the commit that your backup branch is on, rebase --onto <the-rebased-branch> <the-commit-that-merges-master>
11:44 tabrez joined #git
11:44 j416 is what I'd try if plain rebase doesn't cut it.
11:45 j416 er, "reset it" refers to original branch, not backup branch ^
11:47 acetakwas joined #git
11:48 daedeloth git clone git@bitbucket.org:epyc/client.boeke.diekeure.be.git
11:48 daedeloth -> ok
11:48 daedeloth git svn clone http://192.168.1.9/svn/DieKeure_BoekEApp/trunk/src/BoekE/ . --ignore-paths="node_modules|jspm_packages|build.zip|.idea"
11:48 daedeloth -> ok
11:48 daedeloth (all conflicts I had are resolved already so fresh clone works perfectly fine)
11:49 daedeloth git svn rebase
11:49 daedeloth -> Current branch master is up to date.
11:49 daedeloth (all good)
11:50 daedeloth git checkout git-svn
11:50 daedeloth git checkout -b svn-release
11:51 daedeloth oh wait I'm wrong
11:51 daedeloth git svn rebase
11:51 daedeloth -> Unable to determine upstream SVN information from working tree history
11:52 daedeloth ok so I switch to the git-svn branch
11:52 daedeloth git checkout git-svn
11:52 daedeloth git svn rebase -> up to date (all good)
11:53 daedeloth git pull origin master (to merge the git changes into the svn branch)
11:53 daedeloth -> all good
11:53 daedeloth git svn rebase
11:53 daedeloth Unable to determine upstream SVN information from working tree history
11:53 daedeloth and stuck again... any thoughts? What am I doing wrong?
11:54 selckin how does origin exist
11:54 daedeloth from the first git clone
11:54 toogley joined #git
11:55 selckin oh can you do that crazy
11:55 daedeloth well aparently you can't? :D
11:55 Lunatrius` joined #git
11:56 selckin believe it parses the commit message for the svn revision (you can rm -rf .git/svn) and it'll rebuild it, so it might
11:56 daedeloth it's really strange because I can pull the master code into the subversion branch without any trouble
11:56 daedeloth and all merge conflicts are dealt with already
11:56 selckin did the pull fast-forward?
11:56 daedeloth I just can't seem to dcommit after pulling the change sin
11:56 daedeloth yep
11:56 daedeloth 58 files changed, 48843 insertions(+), 1773 deletions(-)
11:57 checkItOut joined #git
11:57 selckin that doesn't say anything about that
11:58 Virox joined #git
11:58 daedeloth http://paste.ubuntu.com/18531842/
11:58 ramsub07 joined #git
11:58 nettoweb joined #git
11:59 selckin what does status say
11:59 daedeloth git status
11:59 daedeloth HEAD detached from git-svn
11:59 daedeloth nothing to commit, working directory clean
11:59 sangy joined #git
12:00 selckin so you're not on a branch
12:00 selckin did you swap to the remote branch maybe
12:00 daedeloth ok so I'll create a branch
12:00 selckin git checkout -b git-svn git-svn
12:00 selckin git branch -a
12:01 daedeloth aaah yes I probably switche dto remote branch
12:01 daedeloth git svn rebase
12:01 daedeloth Unable to determine upstream SVN information from working tree history
12:02 daedeloth http://paste.ubuntu.com/18532146/
12:03 tomog999 joined #git
12:03 qpdb joined #git
12:04 Shock- joined #git
12:04 espindola joined #git
12:05 synthroid joined #git
12:06 daedeloth sorry, no
12:06 daedeloth so I create a local branch git-svn
12:06 daedeloth git checkout -b git-svn git-svn
12:06 daedeloth git svn rebase
12:06 daedeloth Current branch git-svn is up to date.
12:06 daedeloth (all good)
12:06 Sceorem joined #git
12:06 fuchstronaut joined #git
12:06 daedeloth git pull origin master
12:06 daedeloth (all good again)
12:06 daedeloth git svn rebase
12:06 daedeloth Unable to determine upstream SVN information from working tree history
12:07 daedeloth so, same story, after pulling in git branch, I somehow lose svn info
12:07 selckin don't know
12:07 dunpeal joined #git
12:09 dunpeal left #git
12:10 daedeloth ok apparently I just can't do that, my master branch needs to start from the cloned svn branch
12:12 selckin does the git repo have svn-id comments?
12:13 selckin if no, then you probably can't
12:13 daedeloth no I guess not
12:14 Shock- joined #git
12:15 The-Compiler j416, selckin, jhass, tobiasvl: Thanks for the help! I rebased, merge commit is gone, and conflicts got resolved by rerere (I just hadd to "git add" and rebase --continue a few times)
12:15 j416 awesome
12:15 j416 The-Compiler: so the first idea, just to rebase, worked?
12:15 The-Compiler right
12:15 j416 no duplicate commits?
12:16 The-Compiler I don't think so, I didn't really get what could be duplicated
12:16 texinwien joined #git
12:16 selckin you turned the merge into a cherry-pick
12:16 selckin but that doesn't mean it won't work
12:17 j416 The-Compiler: if you rebased onto master, and master already had been merged in, you would end up putting commits from master (those that were merged in earlier) on top of master, I think this was the thought.
12:17 j416 The-Compiler: but, duplicate detection seems to do its part :)
12:17 j416 either that or I misremember how rebase treats merges
12:17 dopesong joined #git
12:18 selckin depends on the order too i guess, rebase on master first, or rebase -i first
12:18 selckin guess you explained first, and i'm thinking latter
12:19 jhass j416: pretty sure you misremember ;)
12:19 j416 jhass: does it ignore non-first parents altogether?
12:19 The-Compiler all looking good I think :) http://paste.the-compiler.org/view/ae2be5f4
12:19 jhass j416: a merge doesn't alter commit sha's, so master's commits are simply not in the set build by branch - master
12:19 The-Compiler (master is on line 82, the older merge on line 123)
12:20 jhass and merge commits themselves are simply ignored
12:20 j416 jhass: I see, so it's never considered in the first place
12:20 jhass that's how I understood it, anyway
12:20 j416 The-Compiler: you still have a merge on line 123
12:20 j416 jhass: mhm. easy to test. :)
12:20 mehola joined #git
12:21 j416 I suppose I will, one day.
12:21 ramsub07 hello, i want to merge two commits into one and retain the name of the earlier one. Should i do,
12:21 ramsub07 $git-rebase -i upstream/master ?
12:23 The-Compiler j416: that's in the qtwebengine-bak branch, which is before rebasing
12:23 zumba_addict joined #git
12:23 jhass ramsub07: most likely yes
12:24 jhass ramsub07: usual caveats as to rewriting history apply
12:24 Juzzika joined #git
12:24 ramsub07 jhass: which one should i squash and which one should i have as pick ?
12:25 perlpilot joined #git
12:25 j416 The-Compiler: ah, you passed --all to the log, I see.
12:25 jhass ramsub07: the one above the other should remain at pick, in other words the older one
12:26 The-Compiler j416: oh, yeah, sorry - that's an alias I often use:    lg = log --oneline --decorate --all --graph
12:27 guzzlefry joined #git
12:27 GodGinrai joined #git
12:31 kpease joined #git
12:31 Ardethian\work joined #git
12:33 rgrinberg joined #git
12:34 basti_ joined #git
12:35 nettoweb joined #git
12:35 jeffreylevesque joined #git
12:38 vbsales joined #git
12:41 mischat joined #git
12:42 notebox joined #git
12:42 eijk_ joined #git
12:46 jmnlwy joined #git
12:48 solars joined #git
12:48 christobago_ joined #git
12:49 fmcgeough joined #git
12:49 crose joined #git
12:49 guzzlefry Say someone committed something directly to production. Someone else didn't notice that it was made because it was never pushed back to origin, so they made nearly (whitespace may vary) the exact same commit on a development server and pushed to origin. Would `git pull --force` on production be safe in order to get everything back in sync?
12:49 cbreak guzzlefry: why bother?
12:49 cbreak just merge it
12:49 solars quick question, I seem to have messed up something: branches dev and feature, I got behind in feature, then did git rebase dev (some merges) and commited. I then changed to dev and did git merge feature - somehow I double all the commits. what did I do wrong? I assume I should have used rebase to get the branch into dev again, is that right?
12:50 osse guzzlefry: two things: nearly identical commits on different branches isn't usually a problem. and pull doesn't have a --force option.
12:50 cbreak osse: it does
12:50 tobiasvl osse: yes it does, but I don't think it's what guzzlefry wants
12:50 cbreak osse: it does something he doesn't need
12:50 Stummi isn't pull -f just the counterpart for push -f?
12:51 osse huh
12:51 tobiasvl no
12:51 osse ohh i see
12:51 moritz olars: basically the rebase changed the SHA1s of the commits it touched, so the merge saw them as different commits, and included both the old and the new version
12:51 guzzlefry I just want to get production in a state where further pulls won't break things. Which would be syncing it up with origin.
12:51 osse it's just a different way of writing the + in the fetch refspec
12:51 osse aka fetch --force is the common case :p
12:52 jaguarmagenta joined #git
12:52 moritz sorry, that was meant for solars
12:52 guzzlefry osse: So even though there's a commit that isn't in origin, `git pull` won't result in a merge conflict?
12:52 guzzlefry Or any warnings really...
12:52 dimi1947 joined #git
12:52 moritz solars: so you can either always merge or always rebase in such situations
12:52 selckin git reset --hard origin/master
12:52 tobiasvl sure it will result in a merge conflict
12:52 solars moritz, thanks a lot - so what would be the correct way to do this? I assume checkout feature; rebase dev; checkout dev; rebase feature?
12:53 nettoweb joined #git
12:53 moritz solars: why do you have two branches at all if you want to rebase them both onto each other?
12:53 moritz solars: that doesn't really make much sense
12:53 solars moritz, well practically I would do some more work in feature
12:54 solars moritz, but I'm a bit confused now
12:54 moritz solars: the typical workflow is: you have a develop branch, which you never rebase
12:54 moritz solars: then you have feature branches, which you might want to rebase on develop occasionally
12:55 moritz solars: when you're done with a feature, you merge the feature branch into develop (potentially as a fast-forward merge after a rebase), then delete the feature branch
12:55 cbreak guzzlefry: it will probably result in a merge conflict
12:55 Slashman joined #git
12:55 cbreak guzzlefry: just resolve it
12:55 moritz solars: if you need to work more on the feature after the branch has been merged, start a new branch
12:55 solars moritz, that's what I thought I did, but the merge added everything twice? or when did this happen
12:55 daniel_rose joined #git
12:55 cbreak guzzlefry: or rewrite history so that the bad commit never happened
12:56 quenode Hi how to clone shallow with from single git SHA commit   ? Tried some option tutorials no luck using git 2.9.x
12:56 Xandaros _ikke_: Thank you so much for showing me imerge. Looks like it actually had less conflicts than normal merge :D
12:56 moritz solars: maybe you had merged the feature branch before?
12:57 Balliad joined #git
12:57 Xandaros I also found out about checkout --conflict=diff3. Amazing, made it default for merge conflicts :D
12:57 vuoto joined #git
12:57 cbreak quenode: only from branches
12:57 cbreak or tags
12:58 cbreak you need a ref
12:58 solars moritz, I'm not sure.. I'm unsure now how to avoid that all the shas are changed
12:58 moritz solars: the save way is not to rebase at all
12:58 moritz that way you're guarantueed to not run into that problem
12:59 vuoto_ joined #git
12:59 moritz quenode: what have you tried? What result did you get?
12:59 solars moritz, yes but if I have to because the branch is behind.. when does rebase change the shas in general?
12:59 vuoto joined #git
13:00 Codfection joined #git
13:00 moritz solars: then you can merge develop into the feature
13:00 xpk joined #git
13:00 moritz solars: it changes the shas of the commits on feature branch, but should leave those of the develop branch alone
13:01 romerocesar joined #git
13:02 JeremyM_ joined #git
13:02 ahmed_elgabri joined #git
13:03 Junior joined #git
13:03 fuchstronaut joined #git
13:03 solars moritz, now I didn't get that.. so given the workflow like I was supposed to do: branch feature from dev, do work, rebase dev, do more work, commit, change to dev, merge feature - this should be okay, right
13:04 liquidjamm joined #git
13:05 Balliad joined #git
13:05 djb-irc joined #git
13:05 CheckDavid joined #git
13:06 azbarcea joined #git
13:06 cuebix-wk joined #git
13:10 jimi_ joined #git
13:10 SimonNa joined #git
13:11 moritz solars: yes
13:11 enleeten_ joined #git
13:12 stantonk joined #git
13:12 Cata|Work joined #git
13:14 shymega joined #git
13:15 diegoviola joined #git
13:15 dreiss joined #git
13:15 docnvk joined #git
13:16 inflames joined #git
13:16 wrouesnel3 joined #git
13:16 chris_99 joined #git
13:17 chris_99 Can someone just help me with a simple git question, i added a remote, then did, git pull REMOTENAME master, whilst checked into my branch called 'bob'
13:17 chris_99 is it normal that the new changes, then appear in 'bob'
13:19 acetakwas joined #git
13:19 canton7 yes
13:19 ekinmur joined #git
13:20 chris_99 cool, just so i understand, i thought if i create a new branch, it's separate to master, so how come the files appear in bob
13:20 canton7 'git merge remote branch' means "git, fetch the latest changes from branch on remote, and update the remote-tracking remote/branch to point to them. Then when that's done, merge remote/branch into my currently-checked-out branch"
13:21 moritz canton7: did you mean "git pull remote branch"?
13:21 canton7 so, because you use 'pull' instead of, say, 'fetch', you told git to merge what was fetched into your currently-checked-out branch
13:21 canton7 moritz, oops, I did. Thanks.
13:21 canton7 chris_99, ^
13:21 baraba joined #git
13:21 chris_99 ahh canton7, thanks a lot!
13:21 mehola joined #git
13:22 j416 chris_99: pull means fetch and merge
13:22 chris_99 oh gotch
13:22 nettoweb joined #git
13:22 ejb joined #git
13:24 xpika joined #git
13:24 Repox joined #git
13:25 rnsanchez_ joined #git
13:25 guzzlefry is `git reset --hard origin/master` going to nuke untracked files?
13:25 encod3 joined #git
13:25 j416 guzzlefry: no, but as always !backup
13:25 gitinfo guzzlefry: 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.com/GitBestPractices/#backups
13:25 jensaronsson joined #git
13:26 chigang_ joined #git
13:26 ToBeCloud joined #git
13:27 checkItOut joined #git
13:28 xpika say I have a repo holding a website and I want to commit the recent changes to another branch without changing the current branch or changing the files in current working tree how would I do that?
13:29 tobiasvl uuuh, !xy ?
13:29 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
13:30 enleeten_ joined #git
13:30 pioiytr joined #git
13:30 xpika Is there syntax to git commit --to-other-branch xyz ?
13:30 moritz xpika: no. What do you need it for?
13:32 ItSANgo joined #git
13:32 xpika I want to commit my changes to another branch so I don't mess up the current branch, but I also don't want to stash my changes because they are live.
13:32 djb-irc joined #git
13:32 tobiasvl don't develop on live?
13:32 osse xpika: is the other branch identical to the current one?
13:33 xpika tobiasvl: you know things don't always happen that way
13:33 Drzacek joined #git
13:33 f3r70rr35f joined #git
13:33 chitopunk joined #git
13:34 xpika osse: I'm thinking about making a branch and calling it scratch pad, just to hold changes for syncing
13:34 Drzacek Hello. I've been strugling with Git gui for some time now, and found out that it is not the best gui for git (didn't know there are others til today)
13:34 nettoweb joined #git
13:34 snowkidind joined #git
13:34 j416 Drzacek: use plain cmdline, you won't regret it.
13:34 Drzacek And I wonder, can someone recommend some good gui client for git? For windows/linux systems
13:35 Drzacek j416, well, I would if I understand that whole thing a little better
13:35 j416 you will need to understand the concepts anyway.
13:35 j416 tig is a nice history viewer
13:36 osse xpika: so you haven't created the new branch yet?
13:36 j416 gitk is not bad either
13:36 osse xpika: !float
13:36 gitinfo xpika: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
13:36 j416 then there is plain 'git log' with formatting options as you prefer; paged through less. Works well.
13:36 Gsham joined #git
13:37 * Drzacek googles all of them
13:37 fspy joined #git
13:37 Drzacek I was on git website, and didn't saw those names there. I only found GitKraken, git-cola and giteye
13:37 j416 I'd not use those.
13:37 Drzacek why?
13:38 j416 1. 15:35:29            j416 | you will need to understand the concepts anyway.
13:38 nnyk_ joined #git
13:38 artgoeshere joined #git
13:38 j416 2. once you have learnt the concepts, cmdline is not all that hard, it is more powerful than any gui, and getting help here will be much easier if needed
13:38 a_thakur joined #git
13:39 Drzacek but..but I like gui
13:39 j416 for many years of my life I thought I was a GUI person too.
13:40 * j416 ¯_(ツ)_/¯
13:41 fspy joined #git
13:41 quenode moritz: what about this ? https://github.com/git/git/commit/68ee628932c2196742b77d2961c5e16360734a62
13:41 Drzacek well, don't get me wrong, I don't need to click everything, but sometimes I would like to see stuff
13:41 hosttor joined #git
13:42 j416 Drzacek: for viewing, as I said above :)
13:42 j416 works well
13:42 toogley joined #git
13:42 j416 if you happen to be on OS X, gitx is nice too
13:42 Drzacek win7 and debian
13:42 AaronMT_ joined #git
13:42 fspy joined #git
13:43 piling hi guys
13:44 piling how can i override local branc with remote ?
13:44 piling *branch
13:44 xpika I just found "git checkout --merge" Thanks anyway guys.
13:45 tobiasvl piling: git reset --hard remote/branch
13:46 tobiasvl piling: but it will lose the local branch obviously, so take care
13:46 MrJones left #git
13:46 tobiasvl or do you mean something else by "override"
13:46 piling tobiasvl: please, i want this
13:46 tobiasvl ok then go ahead
13:49 adminisnotadmin joined #git
13:50 nettoweb joined #git
13:52 piling thank you tobiasvl
13:53 zumba_addict joined #git
13:55 garethdaine joined #git
13:55 fspy joined #git
13:56 jensaronsson joined #git
13:56 fspy joined #git
13:57 ShapeShifter499 joined #git
13:57 ResidentBiscuit joined #git
13:59 mjuszczak joined #git
14:00 artgoeshere joined #git
14:00 mjuszcza_ joined #git
14:00 Mavericks joined #git
14:01 FuzzySockets joined #git
14:01 fspy joined #git
14:01 mjuszczak joined #git
14:02 mjuszczak joined #git
14:03 SwiftMatt joined #git
14:03 annoymouse joined #git
14:03 mjuszczak joined #git
14:04 Mavericks what does log --remotes=<remoteurlname>/master do exactly ?
14:04 fspy joined #git
14:05 mjuszcza_ joined #git
14:06 fspy joined #git
14:06 mjuszczak joined #git
14:07 osse Mavericks: Pretend as if all the refs in refs/remotes are listed on the command line that match the pattern
14:07 nettoweb joined #git
14:08 Mavericks i've added remote repo.url for a branch. and i know for sure that branch is ahead of remote branch by one commit
14:08 cyan__ joined #git
14:08 Mavericks how do i verify this ?
14:09 Mavericks i'm trying to browse commits of remote repo. but no luck. i believe git log --remotes.. is one way to check
14:09 Noldorin joined #git
14:10 ash_workz joined #git
14:12 kpease joined #git
14:13 tobiasvl Mavericks: fetch the branches and log the branches?
14:13 Lipp joined #git
14:14 Mavericks tobiasvl: yes, fetched the branch. logging the branch ?
14:15 Mavericks as in straightforward
14:16 Mavericks git log --remotes=<remote url name>/<remote branch name> ?
14:17 jwest joined #git
14:17 Guest97738 joined #git
14:18 dhollinger joined #git
14:19 CheckDavid I've seen apps and websites hosted on github
14:19 CheckDavid Does github do that for all accounts or is it something special?
14:19 shinnya joined #git
14:20 Guest97738 left #git
14:20 tobiasvl Mavericks: sorry, diffing the branches
14:20 tobiasvl CheckDavid: https://pages.github.com/
14:20 tobiasvl also #github
14:21 gniourf joined #git
14:26 totte joined #git
14:26 bsanford joined #git
14:28 NeverDie joined #git
14:29 irco joined #git
14:30 dopesong joined #git
14:33 jfran joined #git
14:33 geko joined #git
14:33 yonahw joined #git
14:34 SaraDR joined #git
14:35 romerocesar joined #git
14:35 SaraDR left #git
14:36 ndim joined #git
14:36 xcesariox joined #git
14:36 tabrez joined #git
14:36 xaviergmail joined #git
14:36 rubyonrailed joined #git
14:38 sweatsuit joined #git
14:38 daniel_rose joined #git
14:38 leprechau joined #git
14:39 bsanford joined #git
14:39 tenc joined #git
14:41 Gsham joined #git
14:41 subhojit777 joined #git
14:44 xaviergmail joined #git
14:44 hk238 joined #git
14:46 zarubin left #git
14:49 demiro joined #git
14:49 stantonk joined #git
14:49 daro joined #git
14:50 Tim-SEM joined #git
14:51 Tim-SEM left #git
14:51 nettoweb joined #git
14:53 R1ck joined #git
14:54 daniel_rose joined #git
14:54 nilg joined #git
14:55 R1ck Hi. I'm trying to cherry-pick. I have a branch with the changes I want, and a new branch I just created. So I do git checkout <new branch>, and then git cherry-pick <sha_id> where sha_id is a commithash from the branch with the changes I want. What am I doing wrong? for each hash I try, it says "fatal: bad object <sha_id>"
14:55 selckin sounds ok
14:56 R1ck yeah. I'm an idiot
14:57 R1ck I was trying to do it in two terminals and the second terminal was in a different directory which happend to be in a different git repo with a same branch name
14:57 TooLmaN joined #git
14:58 clemf joined #git
14:58 Gsham joined #git
14:59 The-Compiler left #git
14:59 mniip joined #git
15:01 arooni joined #git
15:02 cdg joined #git
15:02 crose joined #git
15:03 madewokherd joined #git
15:04 ejb joined #git
15:06 chrisshattuck joined #git
15:08 sangy joined #git
15:08 mjuszczak joined #git
15:08 allcentury joined #git
15:14 dmto joined #git
15:15 iota_pi joined #git
15:18 Vinnie_win joined #git
15:20 unforgiven512 joined #git
15:21 unforgiven512 joined #git
15:21 rkazak joined #git
15:21 unforgiven512 joined #git
15:22 unforgiven512 joined #git
15:22 ahmedelgabri joined #git
15:23 unforgiven512 joined #git
15:23 TomyLobo joined #git
15:23 unforgiven512 joined #git
15:23 quetz joined #git
15:24 unforgiven512 joined #git
15:24 mehola joined #git
15:25 unforgiven512 joined #git
15:26 troulouliou_div2 joined #git
15:26 relipse joined #git
15:27 allcentury Hi all - I'm looking for any articles or advice on git workflows.  Today, we have a staging branch where developers push to before merging to master.  However, not everything that goes into staging ends up in master.  So staging slowly becomes 'polluted' with commits and I'm forced to blow the branch away, set it back to master and the process repeats.  Surely there is a better way?
15:27 relipse ok, i was trying to track down a bug and i made about 15 commits with the message "DEBUG", is there a quick way to remove all debug statements by revertting those commits onlY?
15:27 tyreld joined #git
15:28 jhass !revert
15:28 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
15:28 unforgiven512 joined #git
15:28 relipse well it looks like this DEBUG, DEBUG, DEBUG, FIX
15:28 relipse how can i undo all those DEBUG commits and leave FIX
15:28 unforgiven512 joined #git
15:29 grawity interactive rebase & delete the corresponding lines
15:29 relipse so git rebase -i ?
15:29 Literphor joined #git
15:29 osse allcentury: maybe have a bunch of staging branches? say one per topic?
15:29 unforgiven512 joined #git
15:29 kbs joined #git
15:30 unforgiven512 joined #git
15:30 relipse crap i just did git rebase -i and then closed the editor and is tarted rebasing, then i did ctrl-C to quit and now i'm stuck in the middle of rebase how do i get back to master
15:30 allcentury osse: we thought about deploying feature branches into it's own environment but that requires a lot of heavy lifting around load balancers
15:31 jhass relipse: git rebase --abort
15:31 relipse ok thank you
15:31 relipse ok i did git rebase -i and I didn't see any of my DEBUG commits listed
15:31 unforgiven512 joined #git
15:32 jhass did you push them already to your remote tracking branch?
15:33 relipse oh yes they are on remote
15:33 relipse but I am the sole entity so I can rewrite history if i need to
15:33 jhass do you understand the consequences of force pushing a rewritten history?
15:33 jhass ok
15:33 jhass git log and find the parent of the first commit you want to get rid of
15:33 fracting joined #git
15:33 jhass git rebase -i that
15:34 Mavericks tobiasvl: git remote -v shows a remote that isn't seen in git branch -a
15:34 Mavericks tobiasvl: is this by design ?
15:34 unforgiven512 joined #git
15:34 relipse not sur ewhat you mean by "parent" jhass
15:34 thiago joined #git
15:34 ac3takwas joined #git
15:35 jhass relipse: the commit coming before it
15:35 CJKinni joined #git
15:35 relipse ok the comit beore it is 21ad982 does that mean i do git rebase -i 21ad982
15:35 jhass yes
15:36 relipse ok perfect now what do I do, hcomment out all the lines with DEBUG in it?
15:36 unforgiven512 joined #git
15:36 nettoweb joined #git
15:36 unforgiven512 joined #git
15:37 unforgiven512 joined #git
15:37 miklcct joined #git
15:38 unforgiven512 joined #git
15:38 unforgiven512 joined #git
15:39 relipse ok thank you for your help jhass
15:39 a_thakur joined #git
15:39 osse allcentury: I mean instead of merging staging to master you can merge staging1 and staging3 to master, but not staging2 for example
15:42 oich joined #git
15:42 spudowiar joined #git
15:43 spudowiar joined #git
15:44 Literphor joined #git
15:45 Alienpruts joined #git
15:47 ag4ve joined #git
15:47 jstimm joined #git
15:47 monster^ joined #git
15:47 ejb joined #git
15:48 Orbitrix joined #git
15:48 f3r70rr35f joined #git
15:51 mmmveggies joined #git
15:51 kulelu88 joined #git
15:51 kpease_ joined #git
15:52 synthroid joined #git
15:53 eijk joined #git
15:54 psprint Writing a wrapper around Git, how would one check if git push requires user and password, and show a dialog to enter those, before running git push?
15:54 narendraj9 joined #git
15:54 Matrixiumn joined #git
15:54 jungsubk joined #git
15:55 Furai Hey, I've already asked this question here but I'm going to repeat it as I'm about to put some work into it. I need to convert mercurial repo (with full commit history, subrepos, etc.) into git repo. What is the best tool to do that? Are there any that you can recommend?
15:56 BombStrike joined #git
15:56 njbair joined #git
15:56 synthroi_ joined #git
15:56 spudowiar left #git
15:56 spudowiar joined #git
15:56 spudowiar left #git
15:56 spudowiar joined #git
15:57 akushner joined #git
15:57 spudowiar joined #git
15:58 Furai spudowiar, nice spam.
15:58 Furai psprint, http://stackoverflow.com/questions/19524398/github-authentication-from-a-wpf-application-using-username-password
15:58 Furai Is that even remotely an answer to what you've just asked?
15:58 spudowiar Furai: ?
15:59 Furai https://file.furai.pl/2016-07-05_17-59-08.png
15:59 psprint Furai: somewhat
15:59 kulelu88 spudowiar: you spammed the channel by giving 'voice' to yourself
16:00 f3r70rr35f joined #git
16:00 b100s hi2all
16:00 Furai psprint, https://developer.github.com/ - maybe that has any answers?
16:00 b100s why can be next: fatal: git-write-tree: error building trees
16:00 b100s Cannot save the current index state
16:01 ahmedelgabri joined #git
16:01 CJKinni` joined #git
16:02 canton7 jast, might be worth having gitinfo check if a user's already voiced? ^
16:02 spudowiar kulelu88: wait, how many times did I give myself voice?
16:02 spudowiar I did it once, right?
16:02 spudowiar wait, no, three times
16:02 kulelu88 spudowiar: +30 times
16:02 robotroll joined #git
16:03 canton7 yeah, about 34
16:03 spudowiar kulelu88: Fucking hell, I'm so sorry!
16:03 spudowiar I didn't realise guys, there's something up with WeeChat :/
16:03 Furai psprint, https://github.com/nodegit/nodegit - maybe they did cover that, but that's js.
16:03 spudowiar Furai: so sorry, I didn't realise
16:03 Furai psprint, your best bet would be to look at existing projects.
16:03 spudowiar let's check something...
16:03 spudowiar left #git
16:03 Furai There's no need to reinvent the wheel.
16:03 spudowiar joined #git
16:04 spudowiar hmm
16:04 kulelu88 no need to apologize spudowiar . it's not like you were purposely doing it ;)
16:04 Furai spudowiar, as long as you didn't do it on purpose it's all fine.
16:04 spudowiar heh :)
16:05 Furai https://github.com/libgit2/libgit2 psprint last thing.
16:06 psprint ok
16:06 Furai So anyone can help me with my problem?
16:06 psprint thanks
16:06 Furai "I've already asked this question here but I'm going to repeat it as I'm about to put some work into it. I need to convert mercurial repo (with full commit history, subrepos, etc.) into git repo. What is the best tool to do that? Are there any that you can recommend?" - this
16:07 Silenced joined #git
16:08 spudowiar Furai: git-hg?
16:08 spudowiar https://hg-git.github.io/
16:08 spudowiar wait, that's the wrong way round lol
16:08 LionsMane joined #git
16:09 spudowiar Furai: I've heard fast-export is good
16:09 spudowiar Furai: if you're using GitHub, GitHub has an importer online
16:09 Furai nah, gogs.
16:09 Furai Thanks, these are the ones I've found.
16:10 Furai https://gogs.io
16:10 spudowiar Furai: that's a self-hosted Git system right?
16:10 Furai Yes.
16:10 spudowiar Furai: GitHub-alternative
16:10 spudowiar Furai: ah, I've seen that, too heavy for meh
16:10 spudowiar I'd just use something like cgit
16:11 Furai spudowiar, to heavy?
16:11 Furai We were using gitlab before that.
16:11 Furai This runs extremely fast comparing to gitlab.
16:11 Furai Golang does it well.
16:11 Furai Ruby fails.
16:12 spudowiar Furai: indeed lol
16:12 spudowiar Furai: but still, cgit is lightweight af
16:12 zacts joined #git
16:12 nedbat Furai: github is in rails, isn't it? It's a mistake to attribute all the performance differences to the language.
16:12 InfoTest joined #git
16:12 nedbat s/rails/ruby
16:14 nettoweb joined #git
16:15 irqq joined #git
16:16 Flying_Squirrel joined #git
16:17 Jason_ joined #git
16:17 kpease joined #git
16:18 nettoweb joined #git
16:21 Guest__ joined #git
16:21 quetz joined #git
16:21 Ordentlig joined #git
16:21 artgoeshere joined #git
16:21 Guest__ left #git
16:22 rominronin joined #git
16:22 romerocesar joined #git
16:23 kpease joined #git
16:24 quetz^^ joined #git
16:25 mehola joined #git
16:26 stantonk joined #git
16:26 GeekMan joined #git
16:28 Furai spudowiar, can you show me any ready cgit installation?
16:29 spudowiar https://git.zx2c4.com/cgit/tree/ https://git.kernel.org/cgit/ https://cgit.freedesktop.org/ https://source.codeaurora.org/
16:29 spudowiar Furai: ^
16:29 stantonk joined #git
16:30 Furai Hmm, so I've seen it many times.
16:30 Furai That's for sure lightweight.
16:30 spudowiar Furai: written in C
16:30 spudowiar Furai: the first link is the creator's
16:30 Furai Yeah, I read theri page.
16:30 Furai I think that it's not for me.
16:31 Furai I need some more features than that.
16:31 Furai But just for plain browsing of repos it's amazing.
16:31 spudowiar indeed
16:31 spudowiar cgit+Gitolite IMO is brilliant
16:32 nettoweb joined #git
16:33 Furai Hmm gitolite?
16:33 Furai Just googled, found their page.
16:34 spudowiar Git access control, etc.
16:34 spudowiar So the SSH bit of Git
16:34 spudowiar cya
16:35 Furai ok
16:39 Mavericks joined #git
16:39 GeekMan Furai: https://git.zx2c4.com/cgit  )
16:40 Furai Yeah, I've seen it already.
16:41 jeffreylevesque joined #git
16:42 freimatz joined #git
16:45 CEnnis91 joined #git
16:47 realz joined #git
16:47 kulelu88 what is the closest FLOSS alternative to github?
16:47 _ikke_ gitlab
16:47 netj joined #git
16:48 eijk_ joined #git
16:48 SteffanW joined #git
16:48 b100s hey, guys, in case i have merge conflict and mostly done with resolve but one file want to take from infuse branch totally, not from HEAD
16:49 _ikke_ git checkout --theirs <file> should do it
16:49 stantonk joined #git
16:50 freimatz joined #git
16:51 b100s _ikke_, thanks a lot!
16:52 durham joined #git
16:52 romerocesar joined #git
16:52 miklcct joined #git
16:54 vuoto joined #git
16:54 anuxivm joined #git
16:55 demiro joined #git
16:56 fscala joined #git
16:57 kutsuya joined #git
16:57 _ikke_ yw
16:57 eijk_ joined #git
16:58 Mavericks how is it possible that git remote -v lists a remote than is not in git branch -a
16:58 Mavericks ?
16:59 _ikke_ Mavericks: did you git fetch from that remote?
16:59 Mavericks yes
16:59 piling_ joined #git
16:59 Mavericks _ikke_:
16:59 optraz joined #git
17:03 _ikke_ How is the remote called?
17:05 Topic for #git is now Welcome to #git, the place for git help and self-reflection | 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 | Fork by yourself, shame on you. Fork with a friend, now we're getting somewhere.
17:05 ahmedelgabri joined #git
17:07 daniel_rose joined #git
17:07 daniel_rose joined #git
17:07 Silenced joined #git
17:08 stantonk joined #git
17:08 felixjet joined #git
17:09 aep-shoutlet joined #git
17:10 romerocesar_ joined #git
17:10 absk007 joined #git
17:11 eight58 joined #git
17:12 Darcidride joined #git
17:13 zacts joined #git
17:13 yqt joined #git
17:14 dreiss joined #git
17:15 EvilPenguin joined #git
17:17 mostlybadfly joined #git
17:17 texinwien joined #git
17:17 piling joined #git
17:21 retropikzel joined #git
17:22 InfoTest joined #git
17:22 spudowiar joined #git
17:23 MrMojito joined #git
17:23 mutex__ left #git
17:24 stantonk joined #git
17:26 markmarkmark joined #git
17:26 mehola joined #git
17:28 romerocesar joined #git
17:28 kadoban joined #git
17:28 Mavericks _ikke_: i didn't understand. how is it called ? either with the git@.. or via the https://.. protocol
17:29 _ikke_ The name of the remote
17:29 _ikke_ the thing git remote returns
17:29 Sasazuka joined #git
17:31 Mavericks _ikke_: devtestapi
17:31 fmcgeough joined #git
17:31 _ikke_ And you say git branch -r does not contain anything with devtestapi?
17:32 dreiss joined #git
17:32 Mavericks _ikke_: yes . i have few other branches whose remotes appear fine in git branch -a
17:32 _ikke_ and git fetch devtestapi does not fetch anything?
17:32 Mavericks _ikke_: oh. let me check with git branch -r
17:33 _ikke_ (git branch -a is all, git branch -r is only remote tracking branches)
17:33 crose joined #git
17:33 Mavericks _ikke_: oh right. yes it doesn't show that particular entry
17:33 devbug joined #git
17:33 _ikke_ Are you missing a particular branch, or don't you get any branch?
17:33 stantonk joined #git
17:33 Mavericks _ikke_:  git fetching that remote doesn't fetch anything
17:34 devbug .gitattributes supports {} for pattern matching classes, right?
17:34 _ikke_ devbug: Not that I'm aware of
17:34 devbug eek
17:34 martin_g joined #git
17:34 devbug and of course it silently fails
17:34 devbug _ikke_ is there something similar?
17:34 _ikke_ Mavericks: what does git ls-remote devtestapi return?
17:34 piling_ joined #git
17:34 Gitzilla joined #git
17:35 Mavericks _ikke_:  other branches are fine. will check that now
17:35 demiro joined #git
17:35 Mavericks _ikke_: nothing
17:35 _ikke_ Mavericks: Is it a new repository where you try to fetch from?
17:35 Mavericks yes
17:35 toogley joined #git
17:35 _ikke_ Ah
17:36 _ikke_ Well, then it does not contain anything to fetch..
17:36 Mavericks _ikke_:  branch on my machine is one commit ahead of remote one
17:36 _ikke_ Mavericks: How many remotes do you have?
17:36 Mavericks _ikke_:  ok. about 6-7 other remotes
17:37 relipse joined #git
17:37 _ikke_ Mavericks: Right. Why do you expect that specific remote to contain anything?
17:39 devbug _ikke_: nothing similar at all?
17:39 devbug I have to duplicate line entries for every extension?
17:40 GavinMagnus left #git
17:40 nedbat kulelu88: if by closest you mean, "kind of just ripped off the github UI", then gogs.io is much closer to GitHub than gitlab is.
17:41 Gsham joined #git
17:41 Mavericks _ikke_: let me get back to that. in the meanwhile i checked git log --remotes=devtestapi/master it showed entire repo. including one extra commit
17:41 kulelu88 nedbat: I was seeking an alternative that is more "we're open-source and we are not profit-driven" instead of a clone
17:41 nedbat kulelu88: then gitlab seems like a better choice
17:42 _ikke_ devbug: I think so, I see no way to group them
17:42 Mavericks _ikke_:  is that another way to confirm the remote has nothing ?
17:42 _ikke_ Mavericks: Check what --remotes does
17:43 _ikke_ Mavericks: git ls-remote directly queries the remote to check what refs (branches / tags) it has
17:43 hich|2 joined #git
17:43 kulelu88 nedbat: didn't know you hang here also :)
17:43 nedbat kulelu88: mostly as a passive learner
17:44 ResidentBiscuit joined #git
17:44 Mavericks _ikke_: basically did https://devcenter.heroku.com/articles/fork-app and expected it to have it as app /site itself works. looks like it isn't the case
17:44 kulelu88 best not reveal your batman-esque skills in another channel nedbat ;)
17:44 hich|2 Am I able to apply a git commit on a local file that is not known to git?
17:44 hich|2 https://github.com/boostorg/fusion/commit/27321dd18ecf34db72422d174bcdd0b550006974
17:44 Mavericks _ikke_:  i see. will keep that (ls-remote) in mind.
17:45 choki joined #git
17:46 _ikke_ Mavericks: what does git for-each-ref '*devtestapi*' return?
17:46 nedbat kulelu88: i'm more like Robin with git.... :)
17:46 _ikke_ hich|2: You should be able to appy https://github.com/boostorg/fusion/commit/27321dd18ecf34db72422d174bcdd0b550006974.diff
17:46 Mavericks _ikke_: nothing agian
17:47 kulelu88 and iron-man with x-programming language nedbat :D
17:47 hck89 joined #git
17:49 GavinMagnus joined #git
17:49 jstimm joined #git
17:49 hich|2 _ikke_ just with patch?
17:50 _ikke_ hich|2: patch or git apply, should both work
17:50 hich|2 git apply doesn't require the involved files to be in a git repo?
17:51 bmor joined #git
17:51 raincoon joined #git
17:51 stantonk joined #git
17:51 hich|2 also, if that URL for the diff shows 3  files that have changed, do I split the file into 3, 1 diff file for each, and apply each separately?
17:52 bmor Hey #git! I'm running into an odd issue where Github thinks im someone else. I've checked my config and .gitconfig file. Anyone know what could be going on here?
17:52 bmor The strange part is, on a VM it works fine. Locally it thinks im someone else.
17:54 mkoskar joined #git
17:54 weckl joined #git
17:54 irregular joined #git
17:55 irregular hi guys, I do git remote -v and then git pull but `git pull` uses the github.io version of what's outputted from `git remove -v`, I'm not sure what I accidentally did
17:56 irregular .git/config also shows the github.com, idk what's going on with my git pull
17:57 ajf- joined #git
17:58 martinkl_ joined #git
17:58 romerocesar joined #git
17:59 jophish joined #git
18:02 mwhooker joined #git
18:03 HoierM joined #git
18:03 stantonk_ joined #git
18:03 pullphinger joined #git
18:04 EvilPeng1 joined #git
18:04 stantonk_ joined #git
18:04 hck89 joined #git
18:04 akushner joined #git
18:06 nitin joined #git
18:06 rgrinberg joined #git
18:06 ahmedelgabri joined #git
18:06 kbs joined #git
18:07 cdg joined #git
18:08 Darcidride_ joined #git
18:08 blackwind_123 joined #git
18:09 texinwien joined #git
18:09 ojacobson irregular: can you pastebin the output of 'git branch -vv' and 'git remote -v' ?
18:10 ResidentBiscuit joined #git
18:10 nettoweb joined #git
18:11 _ikke_ hich|2: Git will apply the patch to the file named in the patch
18:13 nettoweb joined #git
18:15 moei joined #git
18:16 elastix joined #git
18:18 romerocesar joined #git
18:19 raijin joined #git
18:19 hahuang61 joined #git
18:22 jost_ joined #git
18:22 nettoweb joined #git
18:23 jimi_ joined #git
18:23 hich|2 left #git
18:24 pioiytr joined #git
18:24 Balliad joined #git
18:24 ToBeCloud joined #git
18:26 piling guys, i've something like this -> https://gist.github.com/piling/4df2c95d922164e644c74d4c2d0581da
18:27 bmor left #git
18:27 mehola joined #git
18:27 UTAN_dev joined #git
18:29 piling_ joined #git
18:30 piling_ So, guys any help?
18:31 jhass piling_: fix the conflicts and commit?
18:31 GavinMagnus joined #git
18:31 GavinMagnus left #git
18:31 jhass git status
18:32 piling_ jhass: what do you mean by fixing the conflicts ?
18:33 jhass piling_: open the files marked as both modified in git status, look for <<<<<<
18:34 piling_ jhass: remove those lines ?
18:35 piling_ jhass: there is <<<<<<< and >>>>>>> .
18:35 jhass they mark a conflict
18:35 jhass turn the file into the state you want it to be
18:36 piling_ I want to overrid with changes on upstream master branch
18:36 piling_ *override
18:36 _ikke_ piling_: You didn't ask a question
18:36 _ikke_ piling_: Was waiting for one
18:36 jhass so you can have no local changes _at all anywhere_ you want to keep?
18:37 jhass s/can//
18:37 piling_ yeah
18:37 jhass git merge --abort
18:37 jhass git reset --hard upstream/master
18:38 pioiytr_ joined #git
18:39 Jason_ joined #git
18:40 daniel_rose joined #git
18:41 nettoweb joined #git
18:43 Ordentli1 joined #git
18:43 piling_ jhass: that worked. So, can i do that for updating my fork to ?
18:45 elastix joined #git
18:47 GavinMagnus joined #git
18:49 romerocesar joined #git
18:49 zeroed joined #git
18:49 Bizkit joined #git
18:49 piling_ jhass: thank you for your help.
18:52 afuentes joined #git
18:54 satifant joined #git
18:56 NeverDie joined #git
18:57 griffindy joined #git
18:57 mwhooker joined #git
18:58 Literphor joined #git
18:59 hahuang61 joined #git
19:02 stantonk joined #git
19:03 _nwkj86 joined #git
19:03 ac110 joined #git
19:03 Balliad joined #git
19:05 acetakwas joined #git
19:06 GavinMagnus left #git
19:07 ahmedelgabri joined #git
19:09 yitz joined #git
19:10 R1ck left #git
19:10 yitz So, I got a local commit that drops a bunch of files. I'd like to --amend the commit and un-delete two of those files. How do I pull that off?
19:11 SwiftMatt joined #git
19:11 jhass yitz: git checkout HEAD^ -- path/to/file path/to/other/file; git add .; git commit --amend
19:11 yitz Thanks!
19:12 lamont joined #git
19:13 Rolybrau joined #git
19:14 christobago_ joined #git
19:17 retropikzel_ joined #git
19:18 cdown joined #git
19:19 nilg joined #git
19:19 romerocesar joined #git
19:21 circ-user-Zs542 joined #git
19:22 BlackMaria is there a way to find out if you accidentally reset your branch?  I lost some work ( recoved now) but just wondering if there is a way to know what I did
19:22 retropikzel joined #git
19:23 tobiasvl BlackMaria: well, the shell history perhaps?
19:23 jstvz joined #git
19:23 rominronin joined #git
19:23 BlackMaria yeah.  :\  I dont see anything their either. I had opened pycharm and I am wondering if it tried to 'help me'
19:24 mehola joined #git
19:24 jstvz joined #git
19:25 jhass git reflog could hint something
19:25 chrisrolle joined #git
19:26 retropikzel joined #git
19:26 chrisrolle left #git
19:26 daniel_rose joined #git
19:27 Meow-J joined #git
19:28 irregular joined #git
19:31 EvilPeng1 joined #git
19:31 chrisrolle joined #git
19:31 Gsham joined #git
19:32 chrisrolle left #git
19:32 johnmilton joined #git
19:32 CJKinni joined #git
19:33 chrisrolle joined #git
19:34 djb-irc joined #git
19:34 daniel_rose joined #git
19:36 Ordentli2 joined #git
19:36 freimatz joined #git
19:36 chrisrolle left #git
19:36 chrisrolle joined #git
19:36 BlackMaria jhass: yeah there is is thanks!
19:37 zeroed joined #git
19:38 grazfather joined #git
19:39 CheckDavid joined #git
19:39 grazfather is there a non-stupid way to do something akin to --no-verify for `git revert`?
19:39 _ikke_ grazfather: git revert -n && git commit --no-verify?
19:40 kpease joined #git
19:40 stantonk joined #git
19:40 chrisrolle left #git
19:40 chrisrolle joined #git
19:40 chrisrolle hey
19:40 gitinfo chrisrolle: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
19:41 tesuji joined #git
19:41 grazfather _ikke_: what does that do?
19:41 grazfather trying specifically to do revert --continue
19:42 chrisrolle I did a pull request at github, which was closed, because I had o fix a bug. Now I want o reopen he pull request, which obviously does not work (Github has no button for it). What is my best bet to make a pull request with my commits?
19:42 _nwkj86 joined #git
19:42 jhass make a new one
19:42 ac110 joined #git
19:43 jhass (they were stupid to close it)
19:43 chrisrolle jhass make a new commit?
19:43 jhass new pull request
19:43 _ikke_ grazfather: That's basically a shortcut for git commit, so if you want to use --no-verify, just use git commit --no-verify
19:44 mutex joined #git
19:44 grazfather _ikke_: alright thank you
19:44 Orphis joined #git
19:44 GavinMagnus joined #git
19:45 cyan__ joined #git
19:45 cdown joined #git
19:47 chrisrolle jhass did it :) thank you. wasn't sure if that is the common workflow.
19:47 UTAN_dev joined #git
19:47 jhass it's not, normally you just keep the PR open and push to the same branch
19:48 chrisrolle ok
19:49 chrisrolle left #git
19:49 romerocesar joined #git
19:50 johnmilton joined #git
19:51 mostlybadfly joined #git
19:53 nettoweb joined #git
19:53 jophish if I rebase -i HEAD^^^ and make no changes to the file, so I just have 'pick' on every commit, is it possible to not have a different history to someone who hadn't done the same rebase?
19:53 jophish I've tried using --committer-date-is-author-date
19:53 zartu joined #git
19:53 jophish but the hashes still change
19:55 _ikke_ Hmm, I would expect nothing to change
19:55 jhass that is unless you give it options like that
19:55 oich When I add a submodule it is checked out with a detached head, which is what I want, I think, to effectively have it pinned to the commit it was added from. But, if I understand correctly someone can update with checkout --force and it will potentially change the commit that the submodule consists of. If I have that right, is there a way to make it explicit that the submodule is pinned to a...
19:55 oich ...commit?
19:56 flobin joined #git
19:56 flobin if you do git push -u origin master, what is the -u for?
19:57 jhass it sets the tracking branch of master to origin/master
19:57 jophish _ikke_: perhaps it's because this repo has multiple roots
19:57 robotroll joined #git
19:58 Repox joined #git
19:58 flobin jhass ah okay, thanks
20:00 Brain joined #git
20:00 _ikke_ jophish: That should not matter
20:00 _ikke_ It would not even do a full traversel
20:00 _ikke_ traversal
20:03 tobiasvl flobin: -u is short for --set-upstream
20:04 kulelu88 joined #git
20:04 kulelu88 joined #git
20:04 zacts joined #git
20:05 WaReZ joined #git
20:08 ahmedelgabri joined #git
20:08 zartu joined #git
20:09 mwhooker joined #git
20:10 stantonk joined #git
20:12 diegoviola joined #git
20:13 jstimm joined #git
20:14 nnyk_ joined #git
20:18 m0viefreak joined #git
20:19 packmule joined #git
20:22 Balliad joined #git
20:25 nettoweb joined #git
20:26 ochorocho__ joined #git
20:26 zartu joined #git
20:26 zeroed joined #git
20:26 zeroed joined #git
20:27 ynanm joined #git
20:29 b100s joined #git
20:29 yitz So, I did a commit/push to a branch with a file delete. I want to ammend and un-delete. If I do 'git checkout HEAD^ -- file; git add . ; git commit --amend" the commit text still shows the file as deleted
20:32 stantonk joined #git
20:32 _noblegas joined #git
20:33 jhass "the commit text"?
20:33 yitz The comments in the editor when it lets you edit the description which lists changed files. "file deleted"
20:33 jhass check git status after each step
20:34 dopesong joined #git
20:36 albel727 joined #git
20:37 stantonk joined #git
20:38 zartu joined #git
20:38 circ-user-2lJvp joined #git
20:40 yitz Heh. I think I got stuff to where I want with a new commit plus a rebase
20:41 zeroed joined #git
20:41 zeroed joined #git
20:41 jstein_ joined #git
20:41 yitz Or not...
20:42 LaptopBrain joined #git
20:44 ramsub08 joined #git
20:44 akushner joined #git
20:45 AaronMT joined #git
20:46 pioiytr joined #git
20:46 zumba_addict joined #git
20:46 Dyonisos joined #git
20:47 zumba_addict joined #git
20:48 zumba_addict joined #git
20:49 zumba_addict joined #git
20:50 ochorocho__ joined #git
20:52 Gsham joined #git
20:52 zartu joined #git
20:52 yqt joined #git
20:56 ule joined #git
20:56 SwiftMatt joined #git
20:57 ule hi there.. I'm trying to rebase master into my repository but it's hanging for > 30 minutes
20:57 ule am I doing something wrong?
20:57 stantonk joined #git
20:57 munsking joined #git
20:57 ule I modified a 100mb xml file from my repository and comitted. The rebase from master is comming with just some lines of code
20:58 ule I also gound a stackoverflow saying that this could be a bug from git 2.7 but I updated to 2.8 and I'm still facing the same problem
20:58 hck89 joined #git
20:59 munsking Hello, i use git for a small php project that i work on on my own, i have a db class with the credentials in it but i'd still like to have it in my repo, is there a way to filter passwords/strings or should i just move the credentials to an external file and exclude that?
20:59 _ikke_ munsking: separate file works best
21:00 munsking _ikke_: pity, thanks anyway!
21:00 _ikke_ Good practice anyway
21:01 chrisrolle1 joined #git
21:02 shinnya joined #git
21:03 raininja joined #git
21:03 EvilPenguin joined #git
21:04 tarkus joined #git
21:05 basiclaser joined #git
21:05 kbs out of curiosity, sort of wondering how the filter'ing might be used if such a beast existed?
21:05 ule left #git
21:05 kbs is the expectation there's some sort of a regex or something that looks for patterns and auto-nukes them?
21:05 _ikke_ smudge/clean filters
21:05 jeffreylevesque joined #git
21:05 _ikke_ Yeah. something like that
21:05 _ikke_ very fragile
21:07 chrisshattuck joined #git
21:08 Arban joined #git
21:09 ahmedelgabri joined #git
21:09 zartu joined #git
21:09 cdown_ joined #git
21:10 Guddu joined #git
21:11 Guddu Could someone tell me how do i set the GIT_SSH variable to use Pagent. This is on windows. DO i need to set the GIT_SSH to the absolute path of Pagent.exe?
21:11 zartu joined #git
21:13 grawity um, that's not what Pageant is for
21:13 grawity you'd rather need Plink.exe in there
21:13 Guddu Thanks grawity Trying now
21:14 hahuang61 joined #git
21:15 acetakwas joined #git
21:17 Guddu grawity, I am getting "Permission denied (publickey)."
21:17 grawity then start by making regular PuTTY connections work
21:17 grawity if they need a pubkey, load it into Pageant
21:20 mwhooker joined #git
21:25 zartu joined #git
21:25 hlysig joined #git
21:25 madewokherd joined #git
21:25 rominronin joined #git
21:26 HoierM joined #git
21:27 mischat joined #git
21:29 zivester joined #git
21:30 bruce_lee joined #git
21:30 editshare-ericf joined #git
21:31 kromwell joined #git
21:36 digidog joined #git
21:36 Guddu grawity, I can connect using putty. But not using ssh from within Git Bash . . . http://dpaste.com/1V8B7SG
21:39 Zeedox left #git
21:40 romerocesar joined #git
21:40 orbitphreak joined #git
21:41 kpease joined #git
21:44 pioiytr joined #git
21:44 mehola joined #git
21:47 EvilPeng1 joined #git
21:47 zumba_addict joined #git
21:48 ac110 joined #git
21:49 zacts joined #git
21:53 Gsham joined #git
21:53 Eugene Guddu - Control Panel, System Properties, Advanced tab, Environment Variables; New, GIT_SSH, use the full path(no quotes or escaping needing for the space in Program Files) to plink.exe
21:53 zumba_addict joined #git
21:53 Eugene Should look like this: http://i.imgur.com/LlkZtV0.png
21:54 Eugene Log out / in; load your key into pageant; run `plink git@github.com` to verify
21:55 zartu joined #git
21:55 yitz If I ran a 'git commit' on the master branch by mistake and want to have that commit on a different branch, how do I accomplish that?
21:55 Eugene yitz - !fixup
21:55 gitinfo yitz: 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!
21:55 Eugene Bookmark & enjoy
21:56 yitz Thanks
21:57 Eugene Or the super tl;dr: `git reset --soft HEAD^; git checkout mybranch; git commit`
21:58 carif joined #git
21:59 LeMike joined #git
22:00 yitz What's HEAD^ ? Is that HEAD~1 ?
22:00 joki joined #git
22:00 jhass yes
22:00 mwhooker joined #git
22:00 yitz Thanks
22:01 Eugene HEAD~ and HEAD^ will refer to the same thing, but it's two different notations. !treeish has the ugly details
22:01 gitinfo A tree-ish is something that looks like a tree. Read 'man gitrevisions' and http://git-scm.com/book/en/Git-Tools-Revision-Selection
22:01 Gsham joined #git
22:01 Guddu Thanks Eugene It worked.
22:01 Eugene I use HEAD^ becaue I hold my left pinky on the Shift key, so typing HEAD~ requires a lot more finger logistics than HEAD^
22:05 pioiytr joined #git
22:06 pioiytr joined #git
22:07 pioiytr joined #git
22:07 realz joined #git
22:08 pioiytr joined #git
22:08 KevinMGranger joined #git
22:09 pioiytr joined #git
22:09 ahmedelgabri joined #git
22:09 efdetonator joined #git
22:09 bb010g joined #git
22:09 azbarcea joined #git
22:10 cd-rum joined #git
22:12 cd-rum_ joined #git
22:14 qasaur joined #git
22:17 circ-user-2lJvp joined #git
22:19 Jeroen joined #git
22:20 elastix joined #git
22:20 Literphor joined #git
22:21 romerocesar joined #git
22:22 grawity just type @~ or @^ then
22:25 wloncom joined #git
22:25 rubyonrailed joined #git
22:25 stantonk joined #git
22:25 scorphus joined #git
22:28 Eugene `git` too old for @
22:29 jstein_ joined #git
22:30 Rodya_ joined #git
22:32 pur3eval_ joined #git
22:32 pur3eval joined #git
22:38 realz joined #git
22:38 stantonk joined #git
22:39 EvilPeng1 joined #git
22:39 mwhooker joined #git
22:42 rgrinberg joined #git
22:43 ahmedelgabri joined #git
22:44 ngladitz joined #git
22:44 ngladitz joined #git
22:46 kpease joined #git
22:47 xaviergmail joined #git
22:47 Rodya_ joined #git
22:48 thiago joined #git
22:51 Gsham joined #git
22:51 romerocesar joined #git
22:52 elgenie joined #git
22:54 mwhooker joined #git
22:54 MacWinner joined #git
22:55 MacWinner joined #git
22:58 realz joined #git
23:01 maroloccio joined #git
23:01 maroloccio hi. i am looking for the first commit id in branch b1 where file f1 gets the string foo added to it. what can i do?
23:01 cdg joined #git
23:02 kpease joined #git
23:02 Rodya_ joined #git
23:02 grawity git log -S foo b1 -- f1
23:02 SimonNa joined #git
23:03 Literphor joined #git
23:04 Eugene 1) drink
23:04 Eugene 2) man git-log and see -S / -G
23:04 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
23:04 Eugene 3) more drinking, probably
23:05 qasaur joined #git
23:06 azerus joined #git
23:06 maroloccio grawity: that truly worked wonders. thank you. i solved the problem and others like it, all in one go!
23:07 dcpc007 joined #git
23:07 maroloccio Eugene: drinking had already been activated upon asking. should i drink++ now? increase drinking severity
23:07 Eugene It sure couldn't impair the process
23:08 ochorocho__ joined #git
23:08 maroloccio Now, that's an idea! Drinking in pair.
23:08 Lipp joined #git
23:11 romerocesar joined #git
23:11 SporkWitch joined #git
23:11 SporkWitch joined #git
23:12 nettoweb joined #git
23:15 hahuang61 joined #git
23:15 cbRoy left #git
23:16 spudowiar joined #git
23:16 GavinMagnus left #git
23:18 mwhooker joined #git
23:19 raijin joined #git
23:20 texinwien joined #git
23:20 zacts joined #git
23:22 israelzuniga joined #git
23:23 azerus joined #git
23:23 kbs joined #git
23:25 stantonk joined #git
23:26 nettoweb joined #git
23:26 rominronin joined #git
23:27 Sonicbit joined #git
23:27 stantonk joined #git
23:28 fission6 joined #git
23:30 mablae__ joined #git
23:33 Boniche joined #git
23:34 mwhooker joined #git
23:37 ResidentBiscuit joined #git
23:39 rubyonrailed joined #git
23:42 romerocesar joined #git
23:44 arooni joined #git
23:46 allcentury joined #git
23:52 jstein__ joined #git
23:52 NimeshNeema joined #git
23:53 beagleGuy joined #git
23:53 zumba_addict joined #git
23:54 ash_workz joined #git
23:58 Vinnie_win_n joined #git

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