Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-22

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

All times shown according to UTC.

Time Nick Message
00:04 Goplat joined #git
00:05 PaulCapestany joined #git
00:09 SwiftMatt joined #git
00:09 Mobutils joined #git
00:09 stonerfish joined #git
00:10 josuebrunel joined #git
00:17 tristanp joined #git
00:17 mizu_no_oto joined #git
00:19 przemoc joined #git
00:23 fuchstronaut joined #git
00:29 mizu_no_oto joined #git
00:30 tomog999_ joined #git
00:30 m0viefreak joined #git
00:31 rahtgaz joined #git
00:33 PaulCape_ joined #git
00:37 liquidjamm joined #git
00:41 liquidjamm joined #git
00:42 raininja joined #git
00:44 novice9999 joined #git
00:50 novice9999 just test message
00:50 d4rklit3 joined #git
00:51 lindenle joined #git
00:51 qpdb joined #git
00:54 boudiccas joined #git
00:55 jontmorehouse joined #git
00:58 mizu_no_oto joined #git
00:59 PaulCapestany joined #git
01:00 toogley joined #git
01:01 ToBeCloud joined #git
01:07 boudicca joined #git
01:07 lolmac joined #git
01:08 tristanp joined #git
01:09 PaulCape_ joined #git
01:10 NeverDie joined #git
01:11 PaulCapestany joined #git
01:12 spinningarrow joined #git
01:13 kristofferR joined #git
01:14 ochorocho__ joined #git
01:15 scarabx joined #git
01:16 SwiftMatt joined #git
01:18 xiaok joined #git
01:20 bjpenn joined #git
01:23 mehola joined #git
01:24 d4rklit3 joined #git
01:25 PaulCape_ joined #git
01:29 Rikairchy joined #git
01:30 scoz joined #git
01:35 schneider joined #git
01:36 jagob joined #git
01:36 schneider Where do git stores credentials on windows?
01:37 schneider I have created a private repository, and from cli, when i'm trying to push or clone, git dont ask me for the password
01:37 prsn joined #git
01:39 mhockenbury joined #git
01:40 netj joined #git
01:43 alex1a joined #git
01:46 z1haze2 joined #git
01:46 z1haze2 if i rebase when pushing to my repo, all my local changes will overwrite the repo right? not the other way around?
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and zerg rushes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | YOU MUST SUBMIT ADDITIONAL JOKES https://madeitwor.se/git-jokes
01:49 gumnos joined #git
01:50 Puffball joined #git
01:52 lindenle joined #git
01:52 Dougie187 joined #git
01:53 lindenle joined #git
01:54 PaulCapestany joined #git
01:54 xlegoman joined #git
01:57 s00pcan_ joined #git
01:59 pks joined #git
01:59 wxg joined #git
02:02 Gsham joined #git
02:04 harish joined #git
02:07 rchavik joined #git
02:08 faux___ joined #git
02:08 joki joined #git
02:09 Eugene z1haze2 - rebase has nothing to do with force-pushing
02:10 unreal joined #git
02:10 z1haze2 then why did it give me that option when there were conflicts
02:10 Eugene !transcript
02:10 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:10 z1haze2 i was working on it on my other computer and i forgot to get latest before i started working today
02:10 awkwardusername joined #git
02:10 z1haze2 but i didnt want to keep any of my previous code anyway
02:10 z1haze2 nevermind
02:10 Eugene !rebase
02:10 gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
02:11 d4rklit3 joined #git
02:11 Puffball joined #git
02:12 Eugene "rebase or merge" is suggested when a push fails because either of those will create new history that has both your current branch and the remote branch as parents
02:12 razieliyo joined #git
02:14 clemf joined #git
02:18 PaulCape_ joined #git
02:20 Guest47468 joined #git
02:25 tristanp joined #git
02:26 fuchstronaut joined #git
02:28 Mobutils joined #git
02:36 Limes_ joined #git
02:39 SimonNa joined #git
02:39 schneider left #git
02:40 Puffball joined #git
02:43 PaulCapestany joined #git
02:44 chachasmooth joined #git
02:44 jaguarmagenta joined #git
02:47 eletuchy joined #git
02:47 nilg joined #git
02:50 nilg` joined #git
02:50 ochorocho__ joined #git
02:51 Puffball joined #git
02:52 nnyk joined #git
02:53 arescorpio joined #git
02:54 PaulCape_ joined #git
02:58 realz joined #git
03:00 hexagoxel joined #git
03:01 Mobutils joined #git
03:04 Puffball joined #git
03:09 rgrinberg joined #git
03:09 bronson joined #git
03:11 PaulCapestany joined #git
03:11 catuca joined #git
03:18 Puffball joined #git
03:26 attente joined #git
03:27 DrDaemonEye joined #git
03:27 Puffball joined #git
03:31 diegoaguilar joined #git
03:33 nilsi joined #git
03:36 mohabaks joined #git
03:38 PaulCape_ joined #git
03:40 Gsham joined #git
03:42 raijin joined #git
03:42 slappymcfry joined #git
03:46 mizu_no_oto joined #git
03:48 eletuchy joined #git
03:51 ochorocho__ joined #git
03:54 fracting joined #git
03:56 bjpenn joined #git
03:56 t2mkn joined #git
03:57 cdown joined #git
04:06 cdown joined #git
04:07 PaulCapestany joined #git
04:08 jstimm joined #git
04:11 bronson joined #git
04:11 p joined #git
04:12 Gsham joined #git
04:14 lindenle joined #git
04:17 mikeric joined #git
04:17 k3rn31 joined #git
04:17 __xor joined #git
04:23 kadoban joined #git
04:24 spinningarrow joined #git
04:28 fuchstronaut joined #git
04:28 spinningarrow joined #git
04:31 scoz joined #git
04:32 scoz joined #git
04:35 scoz joined #git
04:40 jlewis joined #git
04:41 jontmorehouse joined #git
04:42 Cabanossi joined #git
04:45 jaguarmagenta joined #git
04:45 phaleth joined #git
04:46 zrr joined #git
04:47 languitar joined #git
04:56 kristofferR joined #git
04:57 dreiss joined #git
05:00 tristanp joined #git
05:02 PaulCape_ joined #git
05:03 Puffball joined #git
05:05 nezZario Hi guys.  Does anyone know of any web software for git that .. i'm not talking about for browsing repositories, tons of those exist .. but can actually commit, view history, etc for predefined repositories ?
05:06 Mobutils joined #git
05:09 akiva joined #git
05:09 Eugene joined #git
05:13 Paddy joined #git
05:16 Psychiatrist joined #git
05:20 spinningarrow nezZario: you mean something like a self-hosted GitLab instance?
05:22 zrts joined #git
05:24 bronson joined #git
05:29 fuchstronaut joined #git
05:30 PaulCapestany joined #git
05:31 SwiftMatt joined #git
05:32 maxis joined #git
05:32 jontmorehouse joined #git
05:40 dreiss joined #git
05:42 nezZario spinningarrow: I've never used gitlab, so I'm not sure.  But my requirement here, I have a small team, 2x app devs, and 2x design guys.  the design guys aren't adept enough to setup a local testing environment, so I have a dev server with a copy of the repo for each of them there..  but.. they can't commit (unless they ssh'd in and used that.. which yeah
05:42 nezZario right)
05:43 preaction so give them a gui client
05:44 nezZario not sure how that will help ... the repo is on a remote debian server which is what they use to test their changes
05:44 preaction they edit the files via a web interface, too?
05:45 preaction you can't give them a virtual machine with everything inside, including the gui git client?
05:46 nezZario i guess they could commit from their local copies but I doubt they keep a full copy of the app ..
05:47 Arahael nezZario: i haven't tried it...  but maybe provide access using nomachine's nx desktop?
05:47 preaction so they dev locally, push to the testing server to test, and then commit locally too. that doesn't sound terrible
05:48 risc98 joined #git
05:49 fracting joined #git
05:50 nezZario Well like I said, I can write something myself in an hour or two... I was just checking.  It's a long story I guess.. The 'design guys' are actually the owner and another guy he knows very well who isn't very technically adept and neither of them love the idea of git.. they want to use it but I just want to make it as easy and stremalined as possible so they
05:50 nezZario will actually use it and use it for everything
05:50 nezZario I will check out some windows GUI's and nomachine (never heard of it)
05:50 arooni joined #git
05:50 eletuchy joined #git
05:50 Arahael nezZario: nomachine is a remote desktop system, really.
05:51 nezZario also gitlab
05:51 eletuchy joined #git
05:52 preaction there's also novnc, which is vnc in a web browser
05:52 preaction they can just use chrome to get a full view of that remote box
05:52 ochorocho__ joined #git
05:53 nezZario actually that would be pretty sweet ..
05:54 nezZario I could just install xfce and a some decent open source linux gui
05:54 Arahael nomachine is _supposed_ to be the most efficient by far.  but don't know how it compares to rdesktop (microsoft's system), which is also quite decent.
05:55 Arahael vnc needs high bandwidth, and raw x11 needs low latency.
05:55 PaulCape_ joined #git
05:55 ntshetty joined #git
05:56 _ikke_ apache also released something: https://guacamole.incubator.apache.org/
05:57 irwiss` joined #git
05:59 Arahael very neat.
06:00 Arahael what a freakishly weird name though.
06:01 subhojit777 joined #git
06:02 diegoaguilar joined #git
06:02 jaguarmagenta joined #git
06:03 spinningarrow nezZario: there's also chrome remote desktop, which works pretty well if you all use chrome
06:06 Arahael there's also tmux. ;)
06:06 saedelaere joined #git
06:07 sanketdg joined #git
06:08 apotry joined #git
06:15 ntshetty joined #git
06:16 dopesong joined #git
06:16 lindenle joined #git
06:18 ensyde joined #git
06:19 fracting joined #git
06:22 SwiftMatt joined #git
06:24 PaulCapestany joined #git
06:24 circ-user-nYr1x joined #git
06:26 _ng joined #git
06:27 baba_ joined #git
06:29 fuchstronaut joined #git
06:30 nezZario in any event, thanks guys =)
06:37 netj joined #git
06:41 MattMaker joined #git
06:45 fracting joined #git
06:48 PaulCape_ joined #git
06:48 fracting joined #git
06:50 Oog joined #git
06:53 fracting joined #git
06:54 neanderslob joined #git
06:54 spinningarrow joined #git
06:54 acetakwas joined #git
06:56 fracting joined #git
06:59 jagob joined #git
07:02 baba__ joined #git
07:04 blackwind_123 joined #git
07:06 Corosus joined #git
07:09 narendraj9 joined #git
07:10 faux___ joined #git
07:11 xbob joined #git
07:15 anu0 joined #git
07:15 Puffball joined #git
07:15 mikeric joined #git
07:15 PaulCapestany joined #git
07:21 andyhoang left #git
07:23 baba_ joined #git
07:24 Rikairchy joined #git
07:24 PCatinean joined #git
07:25 bronson joined #git
07:25 Puffball joined #git
07:26 fracting joined #git
07:28 emPi joined #git
07:29 settermjd joined #git
07:30 hanshenrik joined #git
07:30 settermjd joined #git
07:30 fuchstronaut joined #git
07:36 PaulCape_ joined #git
07:38 fbwnd joined #git
07:38 xbob joined #git
07:38 acetakwas joined #git
07:41 serapath_ joined #git
07:43 serapath_ left #git
07:46 radsy joined #git
07:46 dsantiago joined #git
07:47 Puffball joined #git
07:49 serapath joined #git
07:50 dan2k3k4 joined #git
07:50 elastix joined #git
07:53 ochorocho__ joined #git
07:53 Puffball_ joined #git
07:54 MattMaker joined #git
07:54 csd_ joined #git
07:56 TomyLobo joined #git
07:57 risc98 left #git
08:00 lindenle joined #git
08:01 Kicer86 joined #git
08:03 baba_ joined #git
08:03 mehola joined #git
08:04 xbob joined #git
08:12 SteffanW joined #git
08:12 LucaTM joined #git
08:15 LucaTM joined #git
08:15 netj joined #git
08:18 khmarbaise joined #git
08:30 xbob joined #git
08:31 fuchstronaut joined #git
08:35 PaulCapestany joined #git
08:37 baba_ joined #git
08:37 ntshetty joined #git
08:39 fracting joined #git
08:40 ochorocho__ joined #git
08:42 hamster joined #git
08:46 mdw joined #git
08:51 eletuchy joined #git
08:53 zincrokx joined #git
08:54 mase-tech joined #git
08:55 elastix joined #git
08:55 zincrokx joined #git
08:55 xbob joined #git
08:56 Marny joined #git
08:56 zincrokx joined #git
08:56 ntshetty joined #git
08:56 baba_ joined #git
08:58 prsn joined #git
09:00 PaulCape_ joined #git
09:01 waveclaw joined #git
09:02 waveclaw joined #git
09:04 ahmedelgabri joined #git
09:05 Wipster joined #git
09:10 ohcibi joined #git
09:11 fscala joined #git
09:12 LaT0rtue joined #git
09:14 Limes_ joined #git
09:17 catsup joined #git
09:19 xbob joined #git
09:19 aswen joined #git
09:20 jakkn joined #git
09:20 narendraj9 joined #git
09:21 AbsurdTech joined #git
09:23 Wipster Hi all, I could do with some tips on how to get commits affecting a subdirectory into another repo. I only want the current files from creation to current state so excluding commits of deleted files. But I'm not sure how to tackle this.
09:24 jakkn any suggestions on porting a cvs project from sourceforge to git? I followed a few guides using programs like cvs2git, git cvsimport, and cvs-fast-export but all I get is an empty repo with just initial commits and no source code. I must be doing something wrong but I lack the experience and understanding of cvs to figure out what on my own.
09:26 bronson joined #git
09:27 PaulCapestany joined #git
09:28 shinnya joined #git
09:29 BUTTERFLYFX joined #git
09:32 fuchstronaut joined #git
09:37 cdown joined #git
09:37 Jackneill joined #git
09:41 xbob joined #git
09:42 MattMaker joined #git
09:42 josuebrunel joined #git
09:43 bgamari joined #git
09:46 PaulCape_ joined #git
09:48 Psychiatrist joined #git
09:49 osse Wipster: you mean 'git log -- subdir' ?
09:50 |ifei5good joined #git
09:51 fracting joined #git
09:53 bgamari joined #git
09:55 Wipster osse, potentially yeh I was going around the houses a bit I think
09:55 PCatinean joined #git
09:57 davisonio joined #git
09:58 neanderslob joined #git
09:59 prsn joined #git
09:59 sdothum joined #git
10:02 Wipster huh it appears that subtree split does the job, that's cool
10:03 lindenle joined #git
10:04 baba_ joined #git
10:05 khmarbaise joined #git
10:08 xbob joined #git
10:08 den2204 joined #git
10:12 neanderslob joined #git
10:13 WayToDoor joined #git
10:14 ramsub07 joined #git
10:19 fracting joined #git
10:19 aswen joined #git
10:21 interne7y joined #git
10:22 bjpenn joined #git
10:23 fracting joined #git
10:23 ramsub07 joined #git
10:24 zalatovo joined #git
10:26 toogley joined #git
10:26 fracting joined #git
10:28 shinnya joined #git
10:28 xbob joined #git
10:29 spinningarrow joined #git
10:29 rahtgaz joined #git
10:31 zyclonicz left #git
10:31 nwkj86 joined #git
10:33 fuchstronaut joined #git
10:33 mwhooker joined #git
10:38 moobee joined #git
10:39 ahmedelgabri joined #git
10:41 nitin joined #git
10:42 jaguarmagenta joined #git
10:44 PaulCapestany joined #git
10:45 _ikke_ Wipster: Yeah, that would have been my suggestion too
10:46 WayToDoor joined #git
10:49 fracting joined #git
10:52 xbob joined #git
10:53 eletuchy joined #git
10:54 MattMaker joined #git
11:00 prsn joined #git
11:13 PaulCape_ joined #git
11:16 xbob joined #git
11:16 zotherstupidguy joined #git
11:18 ahmedelgabri joined #git
11:18 fracting joined #git
11:19 boudiccas joined #git
11:21 gaen joined #git
11:21 fracting joined #git
11:22 interne7y joined #git
11:24 weox joined #git
11:24 davisonio joined #git
11:26 davisonio joined #git
11:27 faux___ joined #git
11:28 cdown_ joined #git
11:29 Lvjasha joined #git
11:30 PaulCapestany joined #git
11:33 jbitdrop joined #git
11:33 digidog joined #git
11:34 fuchstronaut joined #git
11:35 jaguarmagenta joined #git
11:36 xbob joined #git
11:39 ToBeCloud joined #git
11:42 PaulCape_ joined #git
11:43 UTAN_dev joined #git
11:45 raijin joined #git
11:45 gsingh joined #git
11:46 boudicca joined #git
11:47 eletuchy joined #git
11:52 GavinMagnus joined #git
11:54 csd_ joined #git
11:56 ojdo joined #git
11:57 mwhooker joined #git
11:59 fstd joined #git
12:00 prsn joined #git
12:02 PaulCapestany joined #git
12:02 razieliyo joined #git
12:04 xbob joined #git
12:04 skunkz joined #git
12:05 AbsurdTech joined #git
12:05 lindenle joined #git
12:05 frekoya_ joined #git
12:06 MattMaker joined #git
12:08 nilsi joined #git
12:14 JanC joined #git
12:15 cdown_ joined #git
12:17 cbreak joined #git
12:17 elastix joined #git
12:19 mda1 joined #git
12:20 Gamecubic joined #git
12:21 chachasmooth joined #git
12:21 mwhooker joined #git
12:22 skunkz joined #git
12:23 xbob joined #git
12:24 jaguarmagenta joined #git
12:24 |2701 joined #git
12:25 mda1 joined #git
12:29 cdg joined #git
12:30 bronson joined #git
12:30 PaulCape_ joined #git
12:34 fuchstronaut joined #git
12:34 fuchstronaut joined #git
12:34 jakkn left #git
12:35 gaen joined #git
12:37 xbob joined #git
12:38 prsn joined #git
12:38 ahmed_elgabri joined #git
12:41 plasticle joined #git
12:42 jaguarmagenta joined #git
12:45 jaguarma_ joined #git
12:45 artemisart joined #git
12:52 PCatinean joined #git
12:52 xbob joined #git
12:52 gsingh joined #git
12:53 bojangles left #git
12:54 davisonio joined #git
12:56 cgundersson joined #git
12:56 ahmedelgabri joined #git
12:58 PaulCapestany joined #git
13:00 GingerGeek joined #git
13:00 GingerGeek joined #git
13:04 de-vri-es joined #git
13:06 xbob joined #git
13:15 TheMoonMaster joined #git
13:18 xbob joined #git
13:18 MattMaker joined #git
13:19 spinningarrow joined #git
13:20 fuchstronaut joined #git
13:21 felGru joined #git
13:22 LaT0rtue joined #git
13:22 interne7y joined #git
13:23 fracting joined #git
13:24 PaulCape_ joined #git
13:24 mehola joined #git
13:27 fuchstronaut joined #git
13:27 guardianJ joined #git
13:28 shaggycat joined #git
13:28 rainbyte joined #git
13:30 todd_dsm joined #git
13:30 Gsham joined #git
13:34 leeN joined #git
13:34 rolha joined #git
13:36 spinningarrow joined #git
13:38 leeN joined #git
13:38 prsn joined #git
13:39 spinning_ joined #git
13:41 ZenWalker 22:56 <+_ikke_> ZenWalker: git commit -F - <<EOF
13:41 ZenWalker thanks :)
13:41 jaguarmagenta joined #git
13:44 _ikke_ :-)
13:44 _ikke_ yw
13:45 rgrinberg joined #git
13:50 PaulCapestany joined #git
13:51 rkazak joined #git
13:51 drbean_ joined #git
13:52 gravitron joined #git
13:53 gravitron joined #git
13:54 elastix joined #git
13:55 Noldorin joined #git
13:56 drbean joined #git
14:00 mda1 joined #git
14:00 Balliad joined #git
14:02 gravitron joined #git
14:02 gravitron joined #git
14:03 bibble joined #git
14:05 Fullma joined #git
14:06 lindenle joined #git
14:09 Reda joined #git
14:09 jaguarmagenta joined #git
14:10 rolha joined #git
14:10 chachasmooth joined #git
14:13 bluestrain joined #git
14:13 mischat joined #git
14:13 cdown_ joined #git
14:13 nnyk joined #git
14:14 raijin joined #git
14:15 z1haze2 joined #git
14:16 PaulCape_ joined #git
14:17 mda1 joined #git
14:18 baba_ joined #git
14:18 CheckDavid joined #git
14:19 mase-tech joined #git
14:20 ntshetty joined #git
14:20 Jellyg00se joined #git
14:23 shiriru joined #git
14:23 interne7y joined #git
14:26 italoacasas joined #git
14:31 MattMaker joined #git
14:31 dsdeiz joined #git
14:32 bronson joined #git
14:37 guardian is it possible to find the branching point of a branch?
14:38 BlessJah guardian: try `git merge-base br1 br2`
14:39 guardian in fact it's for a pre-push hook
14:39 guardian the sample hook examines all commits when it's a new branch on remote
14:39 guardian but I would like to start from the branching point
14:40 madewokherd joined #git
14:41 maxis joined #git
14:41 PaulCapestany joined #git
14:43 BlessJah guardian: how about listing all commits that belong to branchA but does not belong to branchB?
14:44 BlessJah instead of finding branching point, you'll find commits that exists only on the other branch
14:44 sanketdg joined #git
14:45 nwkj86 joined #git
14:46 mellernoia joined #git
14:46 ikmaak joined #git
14:46 guardian hmm dunno it doesn't seem to be that simple
14:47 guardian it seems it assumes branchA branches off branchB
14:47 guardian but that, the hook script doesn't even know
14:48 _ikke_ There is no way to find out without knowing the branch it branched of
14:48 _ikke_ If you look at only one branch, you don't see other branches, only merges
14:49 BlessJah _ikke_: he could try finding commits that does not belong to any other branch
14:49 BlessJah (by listing all branches for example)
14:50 sd512 joined #git
14:53 Chill_Surf joined #git
14:53 eletuchy joined #git
14:55 csd_ joined #git
14:57 nwkj86 joined #git
14:59 rkd joined #git
15:03 mohabaks joined #git
15:05 diegoaguilar joined #git
15:05 daguilaraguilar joined #git
15:06 bollullera joined #git
15:07 bollullera left #git
15:08 jaguarmagenta joined #git
15:08 PaulCape_ joined #git
15:11 ome joined #git
15:11 Mindiell joined #git
15:11 Mindiell left #git
15:12 sebhoss joined #git
15:13 nwkj86 joined #git
15:15 HedgeMage joined #git
15:15 jaafar joined #git
15:15 anu1 joined #git
15:15 Hedgework joined #git
15:16 fuchstronaut joined #git
15:18 mdw joined #git
15:19 jost joined #git
15:22 astrofog joined #git
15:24 interne7y joined #git
15:24 hydrogen joined #git
15:25 PaulCapestany joined #git
15:25 hydrogen Hi friends.  I facerolled over the wrong series of keys while working on a feature branch with git, and my history now shows two copies of a series of commits
15:25 hydrogen Is this something I can fix with rebase -i (I haven't pushed this anywhere)
15:25 hydrogen well, anywhere that matters
15:28 jaguarmagenta joined #git
15:28 mda1 joined #git
15:29 Zarthus yeah you can merge them with fixup
15:29 osse hydrogen: whether you've pushed or not does not determine whether it's fixable and how to fix it. It helps determine whether it's a good idea to fix it in the first place instead of leaving it be
15:29 hydrogen osse: yeah, I was just trying to say that I didn't mind a little git rewrite-history :)
15:29 osse hydrogen: as for how to fix it: are the two histories merged? in general terms: fix what makes the unwanted line of history appear
15:30 hydrogen as far as I can tell (I've been saving a copy on github) I merged remotes/mygithub/branch back into local/branch
15:30 hydrogen I'm not entirely sure how or why I did such a thing, but I've accepted it and moved on
15:31 arooni joined #git
15:32 osse hydrogen: maybe because you pulled after having rebased
15:32 NeverDie joined #git
15:33 hydrogen and before pushing again?
15:34 Gsham joined #git
15:34 nwkj86 joined #git
15:34 osse yes'
15:35 hydrogen ah, it's possible
15:35 osse what does the history look like? have you made commits after the unwanted merged?
15:35 dcg joined #git
15:35 hydrogen yeah, sec, trying to put a decent paste of the history
15:35 osse !lol
15:35 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:36 osse lol | head -100 | curl -sF 'sprunge=<-' http://sprunge.us
15:36 PaulCape_ joined #git
15:37 NeverDie_ joined #git
15:38 dcg if I was  noob I'd just yell HELP!!!! right now ;-)  As I'm not, we have a problem. we use 3 submodules in our project, the target dir for these recently got moved in the master repo (github). most of us run our own forks and have local copies of these. when we try and sync the local copy with upstream then merge to a local branch we endup with "unmerged submodule" messages and so far can't find a way to resolve this. any suggestions?
15:38 hydrogen http://sprunge.us/dMiH
15:38 baba_ joined #git
15:39 osse hydrogen: that's a mouthful. what's unwanted and what's wanted here?
15:39 osse hydrogen: maybe replace --all with a list of the relevant refs
15:40 hydrogen Osse: theres a sequence starting at line 52 that shows the duplicated commits
15:40 hydrogen (well, 51 was the merge commit)
15:40 Gsham joined #git
15:40 hydrogen but I can condense it as well
15:40 SwiftMatt joined #git
15:40 osse is it only the isotope-add stuff ?
15:41 hydrogen yeah
15:41 felGru joined #git
15:41 osse instead of --all, do git log ... isotope-add dmeltzer/isotope-add
15:42 hydrogen http://sprunge.us/eTJN
15:42 hydrogen I cut it off at the end of the series too
15:43 hydrogen hope it makes it clearer :)
15:43 spinningarrow joined #git
15:43 MattMaker joined #git
15:43 davisonio joined #git
15:44 installlnx joined #git
15:45 aswen joined #git
15:46 osse hydrogen: git checkout -b tmp; git reset --hard 08492f9; git cherry-pick 0e16ab8..ed7eff2
15:46 osse if that looks good you can then reset isotope-add to the tmp branch
15:46 dcg osse: did my post 10 minutes ago show here or do I need to resend?
15:46 osse (or if you trust me, don't create tmp at all)
15:47 osse dcg: it came through. but i know next to nothing about submodules
15:47 dcg No problem. I wasn't sure if it came through as I hadn't asked for voice at that stage
15:48 installlnx joined #git
15:48 dcg_mx joined #git
15:49 zarel joined #git
15:50 subhojit_ joined #git
15:50 baba_ joined #git
15:50 nilsi joined #git
15:51 a_thakur joined #git
15:52 mda1 joined #git
15:53 hydrogen osse: thank you! it looks like that worked
15:53 hydrogen I fully believe that theres a git make-rocket-ship hidden somewhere in the documentation :)
15:53 fbwnd joined #git
15:54 astrofog joined #git
15:54 livingstn joined #git
15:57 watabou joined #git
15:57 rgrinberg joined #git
15:58 Chill_Surf joined #git
15:59 Seveas hydrogen: git rocket-ship --assemble
16:00 ahmedelgabri joined #git
16:00 Boraelix joined #git
16:00 Boraelix how do i download a terminal color scheme?
16:01 ril joined #git
16:02 PaulCapestany joined #git
16:02 raininja joined #git
16:03 jimmybuffet joined #git
16:05 mikeric joined #git
16:07 k3rn31 joined #git
16:07 knutstrut joined #git
16:08 Seveas Boraelix: git doesn't care about your terminal colors
16:08 lindenle joined #git
16:12 PCatinean_ joined #git
16:13 Wiz_KeeD joined #git
16:16 mdw joined #git
16:17 fuchstronaut joined #git
16:19 thiago joined #git
16:19 primeos joined #git
16:19 prsn joined #git
16:20 csd_ joined #git
16:21 hydrogen okay, another question... I have some modifications that I need to keep locally to make things work that isn't ready to be pushed upstream, but a few different branches I'm working on that can be pushed upstream require it
16:21 hydrogen Which seems counter intuitive by default
16:21 hydrogen but is there a way of having certain commits be "ignored" by push?
16:22 osse nope
16:22 osse !config
16:22 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
16:23 hydrogen this is some code changes to support sqlite instead of mysql, so it's tangental to the code i'm working on, but it makes tracking pull requests messy
16:23 hydrogen i'll read through that and see if I can find something workabler
16:25 interne7y joined #git
16:27 Limes_ joined #git
16:28 clemf joined #git
16:29 osse i've been there
16:29 dreiss joined #git
16:29 osse the only solution i found was to have a commit that I cherry-picked and rebased away as needed
16:29 PaulCape_ joined #git
16:29 osse it wasn
16:30 osse it wasn't pretty
16:30 primeos Is it possible to ignore .gitignore files in subdirectories (not just the file but the changes it would introduce) without ignoring the whole subdirectory?
16:30 primeos I know this doesn't make much sense but it's a special use-case...
16:31 PryMar56 joined #git
16:31 pol123456 joined #git
16:31 rom1504 using git add -f
16:31 rom1504 but don't do that
16:32 a_thakur_ joined #git
16:33 primeos rom1504: so I would ignore the whole direcotry and then add the files I need via git add -f?
16:33 _ikke_ That's a possibility, yes. Once git tracks a file, .gitignore doesn't affect it anymore
16:34 bronson joined #git
16:36 zivester joined #git
16:37 a_thakur joined #git
16:38 a_thakur joined #git
16:38 primeos Wow thank you, works great :)
16:38 jahhein joined #git
16:38 a_thakur_ joined #git
16:39 Balliad joined #git
16:40 a_thakur joined #git
16:41 a_thakur joined #git
16:41 chris_wot joined #git
16:41 mizu_no_oto joined #git
16:42 a_thakur joined #git
16:43 cyan__ joined #git
16:44 AntiNoisyBot joined #git
16:44 a_thakur_ joined #git
16:44 ahmedelgabri joined #git
16:45 eka joined #git
16:48 shaggycat joined #git
16:50 a_thakur joined #git
16:51 gravitron joined #git
16:51 gravitron joined #git
16:52 roflincopter joined #git
16:53 karstensrage joined #git
16:54 davisonio joined #git
16:54 jimmybuffet joined #git
16:55 PaulCapestany joined #git
16:55 nnyk joined #git
16:58 diegoviola joined #git
17:00 zeroed joined #git
17:03 zmachine joined #git
17:07 unbalancedparen joined #git
17:08 mischat joined #git
17:09 sq-one joined #git
17:10 rgrinberg joined #git
17:11 bgamari joined #git
17:12 ynot269 joined #git
17:15 Panacea joined #git
17:16 bket joined #git
17:16 zrr joined #git
17:19 saedelaere joined #git
17:19 shinnya joined #git
17:20 prsn joined #git
17:21 PaulCape_ joined #git
17:26 interne7y joined #git
17:26 nitesh joined #git
17:31 MattMaker joined #git
17:31 WayToDoor joined #git
17:32 trig-ger_ left #git
17:32 trig-ger joined #git
17:34 boudiccas joined #git
17:37 Balliad joined #git
17:37 sebhoss joined #git
17:39 nettoweb joined #git
17:41 ril joined #git
17:42 kadoban joined #git
17:44 yang joined #git
17:45 canton7 joined #git
17:45 josuebrunel joined #git
17:45 Darcidride joined #git
17:45 bitkiller joined #git
17:48 PaulCapestany joined #git
17:48 haasn joined #git
17:52 nitin joined #git
17:53 KeelOfSteel joined #git
17:53 clemf joined #git
17:55 tristanp joined #git
17:56 MyBot joined #git
17:56 raijin joined #git
18:00 toothe left #git
18:00 mdw joined #git
18:01 Julio35 joined #git
18:01 IWishIKnew joined #git
18:01 lindenle joined #git
18:02 Julio35 left #git
18:02 mizu_no_oto joined #git
18:02 cdown joined #git
18:04 chachasmooth joined #git
18:08 rgrinberg joined #git
18:08 davisonio joined #git
18:09 prsn joined #git
18:11 dan2k3k4 joined #git
18:12 ahmedelgabri joined #git
18:13 bjpenn joined #git
18:14 PaulCape_ joined #git
18:17 `mx joined #git
18:17 ProbabilityMoon joined #git
18:20 fuchstronaut joined #git
18:20 qknight joined #git
18:21 qknight hey. is there a library which can be used to list all git remote branches/tags without having to use a local git repository or git binary? or at least without having to do file IO
18:22 kadoban qknight: I don't see how it'd even theoretically be possible without file IO. A git repo is all just files.
18:23 mizu_no_oto joined #git
18:26 Gitzilla joined #git
18:27 interne7y joined #git
18:27 _ikke_ qknight: What is the usecase?
18:31 qknight _ikke_: i want to write a program which given a github (or similar url) lists the branches on the shell, and with a different set of parameters it should compute a string like this: https://gist.github.com/qknight/27fb8bbc49a663a2374da4aa694cbbfa (used in nixos)
18:31 Balliad joined #git
18:31 qknight _ikke_: and finally it would call: nix-fetch-git to compute the hash so that i don't have to do this manually every time i do updates on repos
18:33 Dyonisos joined #git
18:34 kadoban qknight: You could look at what 'git ls-remote' does and how it works, maybe it both provides enough info and could be abstracted out easily enough for you.
18:34 Dyonisos joined #git
18:35 qknight kadoban: ah, so i should implement this feature myself, right?
18:35 `mx qknight: why not use the github API?
18:35 raininja joined #git
18:35 qknight `mx: isn't that github only?
18:36 troulouliou_dev joined #git
18:36 bronson joined #git
18:36 `mx qknight: I take you want it generic for any git type backend. Sorry came the conversation late
18:37 nadim joined #git
18:38 kadoban qknight: Well, I mean I'd just use the git binary I have sitting around, but it sounds like that won't work for your use-case.
18:39 kadoban So I'm not sure what you should do otherwise, but as a worst-case you could probably cut out the part you need from the git source. I'm not sure.
18:40 PaulCapestany joined #git
18:43 _ikke_ whatabout libgit2 or something similar?
18:43 livingstn joined #git
18:44 Ram-Z joined #git
18:44 whitby joined #git
18:45 qknight _ikke_: libgit2 sounds like a good plan but it also requires a local FS IIRC
18:49 iamme_ joined #git
18:49 SteffanW joined #git
18:50 alex1a joined #git
18:52 _ikke_ You can run ls-remote without a local repository
18:52 _ikke_ so I would imagine that it would provide enumartion of remote refs too
18:52 qknight _ikke_: nice
18:53 PaulCapestany joined #git
18:53 Terens joined #git
18:55 qknight i will check. thanks for your help everyone
19:00 jimmybuffet_ joined #git
19:02 Guest57 joined #git
19:02 tristanp joined #git
19:03 rgrinberg joined #git
19:04 dsdeiz joined #git
19:04 dsdeiz joined #git
19:04 cbreak joined #git
19:09 csd_ joined #git
19:13 ochorocho__ joined #git
19:13 githogori joined #git
19:13 fuchstronaut joined #git
19:16 multi_io joined #git
19:16 djb-irc joined #git
19:17 LeBlaaanc joined #git
19:18 Off2k18 joined #git
19:22 DomDom_ joined #git
19:22 mizu_no_oto joined #git
19:27 interne7y joined #git
19:28 tristanp joined #git
19:30 cerberii joined #git
19:32 ahmedelgabri joined #git
19:33 hi joined #git
19:35 acetakwas joined #git
19:41 gaen joined #git
19:42 zmo joined #git
19:42 zmo hi! o/
19:45 zmo I'd need a quick help on rebasing: I got <branch A> → <branch B> → ( <branch C> | <branch D> ) ; I realised I forgot a patch in <branch A>, so I did `git checkout A` and committed my patch. Now I want to rebase <branch B>, <branch C> and <branch D> on top of the new A…
19:46 zmo I can do it by going through each branch without a problem, but I'm pretty sure there's a way to do it with a single rebase command
19:46 tristanp joined #git
19:47 zmo (I'm trying to skim through all git rebase documentation on the net as I'm asking, but I don't want to mess up the rebase by doing it wrong)
19:47 _ikke_ No, in this case you have to rebase each branch, because rebase only works on one branch at the time
19:47 zmo ah? :-(
19:48 hadoken joined #git
19:48 kus joined #git
19:48 zmo so basically that would be: git co B; git rebase A; git co C; git rebase B; git co D; git rebase B
19:48 _ikke_ yeah
19:52 khmarbaise_ joined #git
19:54 Goplat joined #git
19:57 acetakwas joined #git
19:59 PCatinean joined #git
20:00 cgunders1on joined #git
20:00 cgundersson joined #git
20:00 csd_ joined #git
20:00 rahtgaz joined #git
20:01 rkd joined #git
20:03 lindenle joined #git
20:03 FilipNortic joined #git
20:06 WaReZ joined #git
20:08 fuchstronaut joined #git
20:09 m0viefreak joined #git
20:14 tango_ hm is there an easy way to find a commit that creates a new file in a specific subdirectory
20:14 tango_ ?
20:14 tango_ any file, not one specific file
20:17 Seveas tango_: git log -p --name-status and search in the pager for ^A
20:17 Seveas there's probably a way to get scripted output as well, but the aboce is nice for a quick one-off
20:17 Terens1 joined #git
20:18 Seveas that's ^A<tab> by the way, otherwise it'll match Author as well :)
20:19 tango_ Seveas: thank you very much
20:22 Balliad joined #git
20:23 justanotheruser joined #git
20:23 fuchstronaut joined #git
20:23 fuchstronaut joined #git
20:27 livingstn joined #git
20:28 afuentes joined #git
20:28 interne7y joined #git
20:29 nnyk joined #git
20:31 jaguarmagenta joined #git
20:32 diego1 joined #git
20:34 j416 tango_, Seveas: git log --diff-filter=A -- subdirectory
20:34 j416 should work
20:35 j416 (combine with --name-status or --stat or whatever as needed)
20:35 tango_ oh cool
20:36 EduardoMartins joined #git
20:36 toothe joined #git
20:36 toothe so...I found a bug in an open source project.
20:36 toothe I also found the solution.
20:36 toothe what's the process in git to upload the fix?
20:37 Seveas j416: ooh, TIL
20:37 osse depends on the project
20:38 toothe meaning, you fork the project, make the change, commit, and...?
20:38 osse either push to your own fork and submit a pull request, or send a patch by email
20:38 jimmybuffet joined #git
20:38 toothe i think its the pull request...
20:38 toothe need to figure out how that works.
20:39 bronson joined #git
20:39 osse is the project hosted in github?
20:39 toothe yes.
20:39 osse https://help.github.com/articles/using-pull-requests/
20:39 toothe ahh
20:39 todd_dsm joined #git
20:39 radsy joined #git
20:40 Panacea joined #git
20:40 Panacea joined #git
20:45 raijin joined #git
20:47 ojdo joined #git
20:47 _ikke_ If it's a small fix, you can even do it on the website
20:48 mikeric joined #git
20:48 aswen joined #git
20:49 Impaloo joined #git
20:49 bibble joined #git
20:51 AfroThundr joined #git
20:56 toothe wow...
20:56 toothe github > gitlab
20:56 toothe the functionality is comparable, but the interface is significantly cleaner.
20:57 fuchstronaut joined #git
20:57 nettoweb joined #git
20:58 MadHatter42 joined #git
21:00 nettoweb joined #git
21:01 zalatovo joined #git
21:02 mizu_no_oto joined #git
21:03 mehola joined #git
21:04 sbogg joined #git
21:04 AfroThundr joined #git
21:04 AfroThundr joined #git
21:04 WayToDoor joined #git
21:05 AfroThundr joined #git
21:06 moei joined #git
21:08 josuebrunel joined #git
21:13 jaguarmagenta joined #git
21:13 tobiasvl otoh, gitlab listens to its community and is open source
21:13 tobiasvl but they're both good
21:15 fuchstronaut joined #git
21:20 aidalgol joined #git
21:22 Puffball joined #git
21:25 AfroThundr joined #git
21:26 lindenle joined #git
21:30 interne7y joined #git
21:32 mwhooker joined #git
21:32 GavinMagnus joined #git
21:33 nettoweb joined #git
21:33 j416 22:47:46       +_ikke_ | If it's a small fix, you can even do it on the website
21:33 j416 D:
21:36 lindenle joined #git
21:37 mwhooker joined #git
21:37 tobiasvl was that heresy maybe
21:37 khmarbaise joined #git
21:37 NeverDie joined #git
21:39 d4rklit3 joined #git
21:40 ril joined #git
21:44 mda1 joined #git
21:46 iovoid joined #git
21:46 iovoid How can I make git include file attributes. (the ones set with chmod and chattr)
21:48 dopesong joined #git
21:48 tobiasvl iovoid: you can't (except for +x) but other tools can, like git-cache-meta
21:49 iovoid How can I use git-cache-meta to do that job?
21:50 Puffball joined #git
21:51 tobiasvl I don't rightly know, it's not very well documented, but http://stackoverflow.com/a/3208143/176464
21:52 iovoid So, the perms are not auto-applied
21:53 tobiasvl no, it's not built into git
21:58 Puffball joined #git
21:59 toph joined #git
22:01 astrofog joined #git
22:01 toph hi, i have a detached HEAD that is 1 commit ahead of the main branch, how do i make it attached again?
22:03 Zarthus checkout to a branch
22:03 Seveas toph: commit=$(git rev-parse HEAD); git checkout name-of-your-branch; git merge --ff-only $commit
22:05 ximvan joined #git
22:07 toph so i did $ git checkout -b temp_branch
22:07 toph but all my merge commands say 'already up to date'
22:08 mda1 joined #git
22:08 Seveas toph: yes, because you created a *new* branch.
22:09 Seveas check out the branch you want to merge the changes into.
22:09 Seveas and then merge
22:09 toph oh there we go :) ty
22:09 xlegoman joined #git
22:10 diego2 joined #git
22:10 chadi joined #git
22:11 csd_ joined #git
22:11 eka joined #git
22:11 c0ded joined #git
22:11 c0ded joined #git
22:12 jaguarmagenta joined #git
22:14 |ifei5g00d joined #git
22:15 fuchstronaut joined #git
22:18 troulouliou_dev joined #git
22:19 ToBeCloud joined #git
22:20 raijin joined #git
22:20 orlock joined #git
22:21 mizu_no_oto joined #git
22:22 Mixologic joined #git
22:22 razieliyo joined #git
22:22 razieliyo joined #git
22:23 Impaloo joined #git
22:28 linuxmint joined #git
22:29 johnmilton joined #git
22:30 interne7y joined #git
22:30 BaD_CrC joined #git
22:31 diegoaguilar joined #git
22:35 interne7y joined #git
22:38 amdi_ joined #git
22:40 bronson joined #git
22:41 dreiss joined #git
22:42 bjpenn joined #git
22:45 boombatower joined #git
22:46 prsn joined #git
22:49 DistantStar joined #git
22:52 todd_dsm joined #git
22:55 moobee joined #git
22:58 JustinHitla joined #git
22:58 JustinHitla I never used GitHub, does it have "likes","dislikes","comments" ? or just counter how much file was downloaded ?
22:58 wxg joined #git
22:59 SwiftMatt joined #git
22:59 ojacobson there's a "star this repo" button that has broadly similar semantics as favouriting in social media
23:01 whitby joined #git
23:05 Lunatrius joined #git
23:10 basiclaser joined #git
23:12 Ardethian\work joined #git
23:13 nnyk joined #git
23:13 jchonig joined #git
23:15 anu0 joined #git
23:21 _rgn joined #git
23:21 _rgn joined #git
23:21 ffabi joined #git
23:21 zerox2a joined #git
23:26 kenansulayman joined #git
23:26 rgrinberg joined #git
23:27 drbean joined #git
23:31 tristanp joined #git
23:33 scarabx joined #git
23:34 dopesong joined #git
23:36 cyan__ joined #git
23:37 mablae_ joined #git
23:40 Sasazuka joined #git
23:41 d4rklit3 joined #git
23:49 compiler joined #git
23:51 SwiftMatt joined #git
23:53 harish joined #git
23:55 mattfoo joined #git
23:59 stevenbenner joined #git
23:59 johnmilton joined #git
23:59 fstd joined #git

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