Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-08

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

All times shown according to UTC.

Time Nick Message
00:00 cagedwisdom joined #git
00:01 macivy joined #git
00:02 brokensyntax joined #git
00:03 snowkidind joined #git
00:04 shmuli joined #git
00:09 cmosguy joined #git
00:10 vassagus joined #git
00:10 anuxivm joined #git
00:11 vassagus joined #git
00:11 drupald joined #git
00:13 timvisher joined #git
00:13 ediz_ joined #git
00:16 fuchstronaut joined #git
00:16 fuchstronaut joined #git
00:17 crameth joined #git
00:20 raspado joined #git
00:20 etcinit joined #git
00:21 Vinnie_win_c joined #git
00:22 sfan786_ joined #git
00:23 oriba_ joined #git
00:23 oriba__ joined #git
00:25 timwis joined #git
00:31 courrier joined #git
00:32 MattE joined #git
00:32 SwiftMatt joined #git
00:34 RustyShackleford joined #git
00:34 pwnz0r joined #git
00:35 belak joined #git
00:35 shakalaka joined #git
00:37 Lor_ joined #git
00:38 WizJin joined #git
00:40 perrier-jouet joined #git
00:41 anonymuse joined #git
00:42 dave0x6d joined #git
00:44 NimeshNeema joined #git
00:45 lucz joined #git
00:46 dreiss joined #git
00:47 ochorocho__ joined #git
00:48 Mobutils joined #git
00:49 mrwat joined #git
00:50 timvisher joined #git
00:50 madewokherd joined #git
00:52 shafun joined #git
00:52 ekinmur joined #git
00:52 [gmi] joined #git
00:54 ochorocho__ joined #git
00:54 dsdeiz joined #git
00:54 dsdeiz joined #git
00:56 eivarv joined #git
00:57 raijin joined #git
00:59 cyphase joined #git
01:00 cyphase joined #git
01:02 Wulf4 joined #git
01:02 Vampire0_ joined #git
01:04 Kitty- joined #git
01:05 fatalhalt joined #git
01:12 raijin joined #git
01:13 thierryp joined #git
01:14 raijin joined #git
01:16 tapout joined #git
01:16 jerrcs joined #git
01:17 jaguarmagenta joined #git
01:17 fuchstronaut joined #git
01:18 dreiss joined #git
01:18 ahmedelgabri joined #git
01:19 tomzx joined #git
01:20 sunri5e joined #git
01:22 AlexxNica joined #git
01:22 fstd_ joined #git
01:22 fstd_ joined #git
01:22 lindenle joined #git
01:23 d^sh joined #git
01:25 CEnnis91 joined #git
01:25 PaulCapestany joined #git
01:26 pks joined #git
01:26 Lyqyd joined #git
01:29 PaulCapestany joined #git
01:29 xshuiniu joined #git
01:34 timvisher joined #git
01:36 clemf joined #git
01:36 raijin joined #git
01:38 mycyber joined #git
01:40 sssilver joined #git
01:40 DeltaHeavy joined #git
01:42 Guest61014 joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:49 diogenese joined #git
01:49 crameth joined #git
01:56 Jellyg00se joined #git
01:59 Wulf4 joined #git
02:00 Vampire0 joined #git
02:03 hariel joined #git
02:04 medeirosthiiago joined #git
02:04 medeirosthiiago joined #git
02:15 FirewalkR joined #git
02:16 fahadash joined #git
02:18 fuchstronaut joined #git
02:26 neunon joined #git
02:26 __xor joined #git
02:26 AlexxNica joined #git
02:27 nd_ joined #git
02:27 raijin joined #git
02:30 mangolisk joined #git
02:32 malcon joined #git
02:33 AlexxNica joined #git
02:33 timvisher joined #git
02:33 DeltaHeavy joined #git
02:37 Boniche joined #git
02:37 star_prone joined #git
02:40 hexagoxel joined #git
02:40 DolphinDream joined #git
02:40 bulletmark joined #git
02:47 wrouesnel joined #git
02:50 Jameser joined #git
02:51 sssilver joined #git
02:51 AlexxNica joined #git
02:55 boombatower joined #git
02:56 nettoweb joined #git
02:56 mmmveggies joined #git
02:58 chachasmooth joined #git
02:59 mmmveggies does git modify atime mtime or ctime of a file when you check out a branch that has an older version of said file?
02:59 anaiden joined #git
03:00 ojacobson not intentionally, but it will touch the file if it has to modify the contents
03:00 buffal0 joined #git
03:01 mmmveggies will it be able to set it back to the old date or just whatever time it runs the modify?
03:02 FirewalkR joined #git
03:03 ojacobson It's no different than modifying the body of the file yourself
03:09 archaic joined #git
03:09 mmmveggies gotcha. thank you
03:09 gfixler joined #git
03:12 skyres joined #git
03:12 rpg joined #git
03:13 DarkFox_ joined #git
03:14 thierryp joined #git
03:14 Vortex35 joined #git
03:15 uimeet joined #git
03:16 buzzLightBeer joined #git
03:17 jaguarmagenta joined #git
03:18 fuchstronaut joined #git
03:20 dsantiago joined #git
03:24 arescorpio joined #git
03:26 AlexxNica joined #git
03:28 AlexxNica joined #git
03:28 mehola joined #git
03:32 buffffal00 joined #git
03:34 justan0theruser joined #git
03:37 DarkFox_ joined #git
03:41 duderonomy joined #git
03:44 NeverDie joined #git
03:44 timvisher joined #git
03:45 Kitty- joined #git
03:46 buffal0 joined #git
03:48 parasite joined #git
03:52 EvilPeng1 joined #git
03:54 rchavik joined #git
03:59 anaiden joined #git
03:59 raijin joined #git
04:01 dreiss joined #git
04:03 eizua joined #git
04:05 cyan__ joined #git
04:06 xameada joined #git
04:07 xameada joined #git
04:08 xameada joined #git
04:08 xameada_ joined #git
04:09 xameada joined #git
04:10 e14 joined #git
04:10 xameada joined #git
04:11 mizu_no_oto joined #git
04:12 raspado joined #git
04:19 fuchstronaut joined #git
04:19 jaguarmagenta joined #git
04:20 bronson_ joined #git
04:20 cspack_ joined #git
04:21 armyriad joined #git
04:24 KevinMGranger joined #git
04:26 star_prone joined #git
04:26 lindenle joined #git
04:30 Hink joined #git
04:30 Hink joined #git
04:30 navidr joined #git
04:39 a_thakur joined #git
04:39 fiddlerwoaroof joined #git
04:42 peepsalot joined #git
04:46 CrazyBonz joined #git
04:49 moei joined #git
04:50 z8z joined #git
04:51 Cabanossi joined #git
04:51 Guest84666 joined #git
04:52 fhackdroid joined #git
04:53 fiddlerwoaroof joined #git
04:57 nilg joined #git
04:58 lizzin why wouldn't this gitignore file be included in a push?
04:58 lizzin https://gist.github.com/anonymous​/98eb07b9a594efcc82f388a9519c10d2
04:58 lizzin just created a new xcode project with this .gitignore, but the ignore file is not being pushed to the remote repository
04:59 daey_ joined #git
05:00 ojacobson lizzin: did not add & commit .gitignore
05:01 lizzin good point. is should probably do that
05:01 raijin joined #git
05:02 lizzin ojacobson: thank you, that completely slipped my mind
05:02 dsantiago joined #git
05:02 ojacobson :)
05:03 CrazyBonz joined #git
05:09 aidalgol joined #git
05:10 sangy joined #git
05:13 phaleth joined #git
05:15 thierryp joined #git
05:16 diogenese joined #git
05:17 snthsnth joined #git
05:18 fiddlerwoaroof joined #git
05:19 OnBrokenWings joined #git
05:19 jimi_ joined #git
05:24 fatalhalt joined #git
05:24 Jameser joined #git
05:24 oskarkv joined #git
05:25 cyan__ joined #git
05:27 a_thakur joined #git
05:31 Shentino joined #git
05:33 FirewalkR joined #git
05:36 fedepad joined #git
05:36 netj joined #git
05:41 dsdeiz joined #git
05:41 dsdeiz joined #git
05:41 lindenle joined #git
05:42 raspado joined #git
05:44 hexagoxel joined #git
05:48 mmlb joined #git
05:50 roentgen joined #git
05:55 raijin joined #git
05:56 LucaTM joined #git
05:56 olalonde_ joined #git
05:58 olalonde_ left #git
05:59 xbob joined #git
06:00 Aleksei joined #git
06:01 xaa joined #git
06:02 raijin joined #git
06:02 cdown joined #git
06:04 cdown_ joined #git
06:06 Jameser_ joined #git
06:06 guideX joined #git
06:06 lindenle joined #git
06:06 guideX i'm a little confused on something, in my github repo, I have a forked repo there
06:07 Jameser__ joined #git
06:07 raijin joined #git
06:07 guideX I'm not real sure what that means, it's someone elses code
06:07 guideX if I delete it, will they loose the code?
06:09 cdown joined #git
06:10 pikajude joined #git
06:10 dreiss joined #git
06:13 xall joined #git
06:14 star_prone joined #git
06:14 Keridos_ left #git
06:15 Keridos joined #git
06:15 crameth joined #git
06:17 Kitty- joined #git
06:18 raijin joined #git
06:19 Rodya_ joined #git
06:19 mmmveggies joined #git
06:21 fuchstronaut joined #git
06:21 thomas joined #git
06:22 arand joined #git
06:23 OnBrokenWings joined #git
06:29 raijin joined #git
06:31 Vinnie_win joined #git
06:31 glebihan joined #git
06:36 Jameser joined #git
06:36 ddwolf joined #git
06:38 ddwolf I am configuring git-http-backend with apache2, bug got this: "Status line from script 'git-http-backend': 404 Not Found"
06:39 jrok joined #git
06:40 elastix joined #git
06:41 jrok left #git
06:43 timvisher joined #git
06:43 n3p joined #git
06:47 AlexxNica joined #git
06:49 z8z joined #git
06:50 guideX left #git
06:52 fedepad joined #git
06:55 a_thakur joined #git
06:55 a_thakur_ joined #git
07:00 Anja joined #git
07:07 laumann joined #git
07:09 dsdeiz joined #git
07:09 King_Hual joined #git
07:09 King_Hual joined #git
07:11 FirewalkR joined #git
07:12 lordjancso joined #git
07:13 elastix joined #git
07:17 thierryp joined #git
07:22 fuchstronaut joined #git
07:22 stuh84 joined #git
07:28 bansi joined #git
07:29 dharrigan joined #git
07:29 raijin joined #git
07:30 lindenle joined #git
07:37 ahr3n joined #git
07:39 raijin joined #git
07:40 GandalfTheWizard joined #git
07:41 Oebele joined #git
07:44 ediz__ joined #git
07:45 mrmadcat joined #git
07:57 Seveas ohai breaknode.
07:59 cyan__ joined #git
07:59 Seveas ddwolf: forgot to reload apache?
08:02 star_prone joined #git
08:04 marvi joined #git
08:06 Gloomy joined #git
08:07 timvisher joined #git
08:09 bq joined #git
08:09 bq how to commit the current edit into a new branch?
08:12 vdv joined #git
08:12 apotry joined #git
08:13 preaction bq: git checkout -b newbranch; git add ...; git commit
08:13 thiago joined #git
08:13 Rodya_ joined #git
08:14 thierryp joined #git
08:14 bq preaction: thanks. do i have to 'git add ' each time before 'git commit'?
08:14 preaction you can combine git add and git commit by doing "git commit <file>..." or "git commit -a" (-a for all)
08:19 a_thakur joined #git
08:20 mmmveggies joined #git
08:21 ahmedelgabri joined #git
08:22 xall joined #git
08:23 bq preaction: how to change to a master branch?
08:23 preaction git checkout
08:23 preaction this all seems like first-page tutorial stuff. what tutorial are you reading?
08:24 jstimm_ joined #git
08:25 CrazyBonz joined #git
08:26 bq preaction: i haven't used git for a long time.
08:26 preaction so refresh yourself with a tutorial or a cheat sheet
08:28 brokensyntax joined #git
08:30 sl33k joined #git
08:30 raijin joined #git
08:35 jaguarmagenta joined #git
08:36 raijin joined #git
08:42 Jameser joined #git
08:44 vuoto joined #git
08:47 qpdb joined #git
08:53 ahmedelgabri joined #git
08:56 dodobrain joined #git
08:57 raijin joined #git
09:00 romerocesar joined #git
09:00 _Patrick_ joined #git
09:05 Slush- joined #git
09:05 jaafar joined #git
09:08 mikecmpbll joined #git
09:11 Jameser joined #git
09:12 SwiftMatt joined #git
09:13 dsdeiz_ joined #git
09:16 mrkake joined #git
09:18 raijin joined #git
09:20 hanthings joined #git
09:21 mehola joined #git
09:23 fuchstronaut joined #git
09:23 timvisher joined #git
09:24 Jameser joined #git
09:25 ahmedelgabri joined #git
09:27 raijin joined #git
09:31 dharriga1 joined #git
09:32 lindenle joined #git
09:33 WayToDoor joined #git
09:35 robotroll joined #git
09:39 Jackneill joined #git
09:41 star_prone joined #git
09:42 Murii joined #git
09:42 fees joined #git
09:42 raijin joined #git
09:47 BSaboia joined #git
09:49 Ormu joined #git
09:50 Ormu is this the most official Git for Windows? https://git-scm.com/download/win
09:50 Ormu ?
09:52 j416 Ormu: git-scm.com is the main site, yes
09:53 harish_ joined #git
09:56 _Patrick_ joined #git
10:00 dodobrain joined #git
10:02 murgi0 joined #git
10:02 durham joined #git
10:03 murgi0 joined #git
10:10 mycyber joined #git
10:13 xall joined #git
10:16 star_prone joined #git
10:17 ocbtec joined #git
10:21 Phylock joined #git
10:21 bruce_lee joined #git
10:22 mmmveggies joined #git
10:24 fuchstronaut joined #git
10:24 Snugglebash joined #git
10:25 cagedwisdom joined #git
10:27 ahmedelgabri joined #git
10:29 mehola joined #git
10:32 Balliad joined #git
10:35 khmarbaise joined #git
10:36 jaguarmagenta joined #git
10:36 g105b joined #git
10:42 raijin joined #git
10:45 timvisher joined #git
10:45 Balliad joined #git
10:47 anuxivm joined #git
10:48 CrazyBonz joined #git
10:52 skyres joined #git
10:53 dsdeiz joined #git
10:53 dsdeiz joined #git
10:56 Sadeukko joined #git
10:57 Cassiopaya joined #git
10:58 NServer joined #git
10:59 courrier joined #git
10:59 ieee joined #git
11:00 medeirosthiiago joined #git
11:00 dsdeiz joined #git
11:00 dsdeiz joined #git
11:00 IlNominePatre joined #git
11:00 NServer joined #git
11:00 ieee question: is there a way to really reorder commit states and not just "patches", like rebase does?
11:01 ieee aka, can I directly alter the parent-child relation in the history graph?
11:02 bremner I don't think your understanding of rebase matches mine
11:03 ieee I'll explain myself better
11:03 ieee let's say a demented chain of commits in which you get file f.txt and just increment an index in it
11:04 ddwolf I am configuring git-http-backend with apache2, bug got this: "Status line from script 'git-http-backend': 404 Not Found"
11:04 ieee so commit 0 creates the file with '0' in it, commit 1 deletes the '0' and adds a '1' and so on
11:04 ddwolf yes I did reload apache2
11:05 ieee what I want is to have a history where the file has, say, 1, then 6, then 9, and so on...
11:06 ieee I can use rebase, but I'll get merge conflicts at each step
11:06 ieee they are easy to solve in this idiot case, not so much in real code
11:07 ieee bremner: better?
11:07 mischat joined #git
11:08 bremner ieee: I don't think there's any other option than using rebase. for conflicts, you could check out man git rerere
11:08 gitinfo ieee: the git-rerere manpage is available at http://jk.gs/git-rerere.html
11:08 Impaloo joined #git
11:09 phanimahesh joined #git
11:09 ieee I'm sad
11:09 ieee thanks anyway
11:09 bremner maybe you should care less about this piece of history ;)
11:10 ieee well, I have 3 different approaches to a certain problem, and I developed them as WIP comments
11:11 ieee one after another
11:11 bremner all in the same branch?
11:11 ieee now I need to put them in an order that makes sense, but leaving every middle state functioning
11:11 ieee yes, that was stupid of me, clearly
11:12 bremner maybe more use of branches will also make you less sad
11:12 ieee I'm solving it by making 3 branches and squashing middle states, in fact
11:12 ieee I hoped in some git-magic, but I deserve it for bad practices
11:13 NServer left #git
11:14 ddwolf I am configuring git-http-backend with apache2, bug got this: "Status line from script 'git-http-backend': 404 Not Found"
11:15 Bonfi96 joined #git
11:15 Bonfi96 left #git
11:19 khmarbaise joined #git
11:20 bremner ddwolf: FYI your message came through the first time
11:20 ddwolf bremner: what do you mean?
11:21 bremner ddwolf: I mean, please wait more before repeating yourseflf
11:21 ddwolf I dont' know what is the problem
11:21 ddwolf bremner: OK, I know what you mean:)
11:22 brokensyntax joined #git
11:22 styler2go joined #git
11:22 crameth joined #git
11:23 serialoverflow joined #git
11:25 fuchstronaut joined #git
11:29 ojdo joined #git
11:31 mehola joined #git
11:33 eivarv joined #git
11:33 vdv joined #git
11:35 nuck joined #git
11:38 dharrigan joined #git
11:38 dharrigan joined #git
11:40 Jameser joined #git
11:42 fedepad joined #git
11:42 fahadash joined #git
11:43 khmarbaise_ joined #git
11:43 khmarbaise_ joined #git
11:49 Impaloo joined #git
11:50 brokensyntax joined #git
11:50 Balliad joined #git
11:50 ToBeCloud joined #git
11:51 Balliad joined #git
11:51 Balliad joined #git
11:56 Sonderblade if you have 3 unpushed commits to master, what command is there to push only the first of them?
11:58 timvisher joined #git
11:58 canton7 Sonderblade, git push origin HEAD^^:master
11:59 Sonderblade thanks
12:01 sea-gull_ joined #git
12:02 rpg_ joined #git
12:06 netj joined #git
12:09 Murii joined #git
12:09 CrazyBonz_ joined #git
12:10 FirewalkR joined #git
12:14 eivarv joined #git
12:16 mycyber joined #git
12:18 star_prone joined #git
12:18 bruce_lee joined #git
12:23 mmmveggies joined #git
12:27 dreiss joined #git
12:32 Balliad joined #git
12:32 TomyLobo joined #git
12:34 nilg joined #git
12:35 lindenle joined #git
12:37 jaguarmagenta joined #git
12:38 dave0x6d joined #git
12:39 t0n1c joined #git
12:39 cebor joined #git
12:41 johnmilton joined #git
12:43 GandalfTheWizar1 joined #git
12:44 dsdeiz joined #git
12:44 dsdeiz joined #git
12:51 spacelord_ joined #git
12:52 aeae64ff8df64d2a joined #git
12:52 Balliad joined #git
12:52 sdothum joined #git
12:53 shinnya joined #git
12:55 timvisher joined #git
12:58 dan2k3k4 joined #git
13:12 sl33k joined #git
13:14 scorphus joined #git
13:15 lolmac joined #git
13:16 al-damiri joined #git
13:17 sl33k_ joined #git
13:18 khmarbaise joined #git
13:21 durham joined #git
13:25 dermoth_ joined #git
13:26 fuchstronaut joined #git
13:30 joki joined #git
13:30 srandoni121 joined #git
13:32 eivarv joined #git
13:35 malcon joined #git
13:36 pcuser joined #git
13:36 courrier joined #git
13:36 matthiaskrgr joined #git
13:37 sshine left #git
13:37 pcuser Hi, is there any way to extract the delta information from a bundle without the prereq refs? I have a bundle from a machine that is firewalled off, and I have to physically travel to it for a few hrs to get the orig repo.
13:37 m0viefreak joined #git
13:38 pcuser the bundle I have is only a partial bundle, but now I find that this can't be applied in a fuzzy manner, like a patch can. Nor can I convert it to a patch-like object
13:38 thiago joined #git
13:39 Ormu left #git
13:39 pcuser unbundle complains about missing prereqs. Unpack-objects says its not a valid pack file.
13:41 durham joined #git
13:42 srandoni121 left #git
13:42 xip joined #git
13:42 canton7 pcuser, partial bundles are just deltas compared to objects that you already have
13:43 canton7 so if you don't have those base objects, the deltas make no sense
13:43 pcuser no, I want the deltas - they contain strings (in theory) that I can interpret myself
13:43 pcuser I don't want to apply them to anything
13:43 pcuser this is explained here :
13:43 pcuser http://git.661346.n2.nabble.com/How-to​-extract-files-out-of-a-quot-git-bundl​e-quot-no-matter-what-td1679188.html
13:43 canton7 they're not diffs - they're binary deltas against any other objects that happened to be around
13:43 pcuser a binary delta is a diff of a kind
13:44 pcuser there is information in them. I can read it if we can decompress it.
13:44 madknight joined #git
13:44 pcuser but afaics, the patch in question never made it to git unpack-objects
13:45 pcuser (the --dump-delta flag)
13:46 JrCs joined #git
13:46 constant joined #git
13:47 _sfiguser joined #git
13:48 pcuser the machine with the full repo is behind a firewall, and I can't get to it, except physically
13:48 _sfiguser hello all, i'm working on a C project with other colleagues.. .and we are working on different branches... so following the branches workflow... the fact is that there are files which are used by different branches... how can we solve conflicts ?
13:48 _sfiguser i mean i need both changes to the same file...
13:48 _sfiguser for example the Makefile...
13:48 a_thakur joined #git
13:48 thiago joined #git
13:49 bremner !conflict
13:49 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
13:49 canton7 fix the merge conflicts when they occur
13:49 NeverDie joined #git
13:51 Guest9360 left #git
13:51 tgummerer joined #git
13:51 a3pq51 joined #git
13:52 timvisher joined #git
13:52 nettoweb joined #git
13:53 canton7 pcuser, from that thread: "FWIW, most Git deltas are "copy" instructions, they list a position
13:53 canton7 and count in the base to copy data *from*.  These take up less
13:53 canton7 space then "insert" instructions, where new text is placed into
13:53 canton7 the file.  As the delta generator favors a smaller delta, it tends
13:53 canton7 to create deltas that use the "copy" instruction more often than the
13:53 canton7 "insert" instruction.  So there is *very* little data in the delta,
13:53 canton7 just ranges to copy from somewhere else" ?
13:53 canton7 oops, that wasn't supposed to copy the linebreaks
13:57 pcuser canton7: that won't be true if I make a change to a file, such as here. Git can't magicall know I changed a flag from "if(stupid) do this", to "if (real_func) do that", without encoding that somehow. I think the answer is, there are no tools, and bundles are not very useful to me.
13:57 esc joined #git
13:57 pcuser if I want something, I have to write it myself, as per https://codewords.recurse.com/iss​ues/three/unpacking-git-packfiles
13:57 canton7 pcuser, I'm not sure I understand your issue then
13:58 canton7 I thought you were trying to get info out of a partial bundle, without having the prereq objects
13:58 pcuser that is true
13:58 pcuser the info is that I spent a day debugging a problem. I exported that using a bundle, then the repo I have is missing a single commit. Now the unbundle aborts.
13:59 pcuser I want to know what that change was, without having to return to the computer where I made the bundle
13:59 pcuser I cannot access it remotely
13:59 pcuser I do not recall the change
13:59 pcuser I know that change is in the pack file
13:59 pcuser I cannot get it, because it is encoded in a form that has no unpacking tool
13:59 fowr joined #git
14:00 pcuser If I knew this, I would not have used bundles, but rather diffs.
14:01 Balliad joined #git
14:02 MattE joined #git
14:03 nettoweb1 joined #git
14:04 bejeb joined #git
14:04 Furai joined #git
14:05 hariel joined #git
14:05 zivester joined #git
14:09 durham joined #git
14:11 eivarv joined #git
14:15 courrier_ joined #git
14:16 khmarbaise joined #git
14:17 durham joined #git
14:19 mycyber joined #git
14:19 ochorocho__ joined #git
14:21 durham joined #git
14:22 oskarkv joined #git
14:24 mmmveggies joined #git
14:27 fuchstronaut joined #git
14:29 Opertus joined #git
14:32 ShekharReddy joined #git
14:33 mehola joined #git
14:34 eivarv joined #git
14:34 Opertus joined #git
14:36 yqt joined #git
14:36 a_thakur joined #git
14:36 vuoto joined #git
14:37 jaguarmagenta joined #git
14:38 Opertus joined #git
14:38 danslo joined #git
14:40 Elysia joined #git
14:41 liquidjamm joined #git
14:42 Elysia joined #git
14:43 wrouesnel1 joined #git
14:45 liquidjamm joined #git
14:45 mrmadcat joined #git
14:46 ocbtec joined #git
14:49 bathtub_shark joined #git
14:49 justanotheruser joined #git
14:51 rgrinberg joined #git
14:51 Discovery joined #git
14:52 mmmveggies joined #git
14:52 courrier__ joined #git
14:53 timvisher joined #git
14:54 Cassiopaya joined #git
14:55 JanC_ joined #git
14:55 madewokherd joined #git
14:58 GT4066 joined #git
15:03 Zarthus joined #git
15:04 mrcookienb joined #git
15:05 lindenle joined #git
15:06 luxPerpetua joined #git
15:06 grayjoc joined #git
15:09 dreiss joined #git
15:09 DolphinDream joined #git
15:09 Goplat joined #git
15:10 Pieter_ joined #git
15:13 constant joined #git
15:13 e14 joined #git
15:15 Jackneill joined #git
15:20 CrazyBonz joined #git
15:24 cbreak pcuser: no
15:24 cbreak pcuser: it's encoded in a form that requires existing data
15:24 cbreak you do not have that data, so you can not decode it
15:24 cbreak that's delta compression at work
15:25 eizua joined #git
15:26 netj joined #git
15:27 star_prone joined #git
15:27 jozwior joined #git
15:27 fmcgeough joined #git
15:28 star_prone joined #git
15:28 fuchstronaut joined #git
15:32 kbdkode joined #git
15:32 Zarthus_ joined #git
15:35 Elysia joined #git
15:36 zarel joined #git
15:40 tribly joined #git
15:42 dviola joined #git
15:42 anonymuse joined #git
15:44 cdown joined #git
15:46 timvisher joined #git
15:46 jozwior joined #git
15:47 duderonomy joined #git
15:48 littleforest joined #git
15:48 scorphus joined #git
15:49 grayjoc joined #git
15:51 romerocesar joined #git
15:54 svm_invictvs joined #git
15:57 robotroll joined #git
16:00 Khisanth joined #git
16:10 vuoto joined #git
16:12 nettoweb joined #git
16:14 thunderblack joined #git
16:15 kulelu88 joined #git
16:18 eivarv joined #git
16:21 Darcidride joined #git
16:21 nettoweb1 joined #git
16:22 netj joined #git
16:23 _ix Good morning folks. My woking copy is clean -- is there anything dangerous with git rm -r --cached .
16:23 hashpuppy joined #git
16:23 ieee _ix: that command basically resets your index
16:23 _ikke_ right
16:24 jason237 joined #git
16:25 ieee the only instance in which I use it is to have a gitignore take effect, where I follow with git add .
16:26 _ix Cool.
16:26 _ix That's what I'm looking for.
16:26 _ix The dude who set this repo up probably meant to add the bin directory to the gitignore, but who knows?
16:26 ieee makes sense
16:27 ieee once you've given both command you'll have a series of dirs that aren't tracked anymore, as if you had git rm-ed them
16:27 FirewalkR joined #git
16:28 ieee commit and you're done
16:28 Gloomy joined #git
16:28 mangolisk joined #git
16:29 _ix By the way, is windows+git usually considered pretty terrible?
16:29 _ix I've had tons of little problems that I've never experienced in a posix system -- and when I research the issues, it's almost always someone running git in windows.
16:30 Fr0Master joined #git
16:30 ieee I used it, also across unix-windows
16:31 ieee the key is to set it up on windows to basically enforce any filesystem behaviour you'd have in unix
16:31 eizua joined #git
16:31 ieee and avoiding fancy things you know may have issues, like links
16:32 _ix ieee: Do you have any resources for how I might approach something like that?
16:32 clandestino joined #git
16:32 ieee _ix: I'm sorry, did that as problems popped up
16:32 _ix Something that I ran into initially was malformed .png files which was taken care of with .gitattributes
16:32 ieee I'm sure google knows, though
16:32 * _ix nods
16:32 _ix Thanks for the help just the same.
16:34 doppo joined #git
16:35 swills_ joined #git
16:38 anonymuse joined #git
16:38 jaguarmagenta joined #git
16:39 jason237 joined #git
16:40 swills__ joined #git
16:41 murgi0 joined #git
16:42 romerocesar joined #git
16:42 Kit_ joined #git
16:43 mmmveggies joined #git
16:43 nettoweb joined #git
16:44 Kit_ Hi. I'm starting with Git today and I have a question: Is it possible to, in one remote directorie, have two different files from two different local directories?
16:44 anonymuse joined #git
16:47 jaguarmagenta joined #git
16:47 eizua joined #git
16:49 SteffanW joined #git
16:51 supaket joined #git
16:53 khfeng joined #git
16:53 Balliad joined #git
16:53 ieee Kit_: no, a remote repo will mirror exactly your local repo (at least, the pushed branch)
16:54 ieee apart files purposely ignored
16:55 a_thakur joined #git
16:55 Kit_ In order to update the remote repository with the local one, you have to first update your local repo with your remote repo, right? I think that's called pull, is it?
16:55 nettoweb joined #git
16:55 murgi0 joined #git
16:56 Kit_ I mean, in order to push, you have to pull first, right? I think it's called push and pull
16:56 ieee Kit_: this depends on your working method
16:56 littleforest joined #git
16:57 ieee but yes, generally you pull from the remote, do your hacking and then push, other people do the same
16:57 Kit_ Because, I was thinking that maybe I could "git init" in my two local folders, and git push both to the same remote directory, and then that's it
16:58 Kit_ Since I'm the only one working on this repo, and I only work from this computer, I could never pull, and just push, right?
16:58 ieee git is not dropbox, it stores states, not files
16:59 ieee your remote repo will 'mirror' either just one, or both your folders if they are 'exactly the same'
16:59 johnmilton joined #git
17:00 Kit_ I understand that, but in this particular case (this are my configuration files) I was thinking about using Gitlab as a back up, kind of
17:00 ieee git is not a backup tool
17:00 Kit_ No, I get it, but would it work?
17:01 Kit_ I'm talking as a code hosting "thing"
17:01 Kit_ What Im saying is that instead of the remote repo(in this case gitlab) being the "main" one everything else mirrors, it would be the opposite
17:01 Kit_ The main one would be my pc, the local repo, and the remote would be a mirror of that
17:01 eivarv joined #git
17:02 ieee sure, I thought you had 2 local repos
17:02 Kit_ I do. But if I push both to the same remote directory and never pulled, it would work, right?
17:03 ieee no
17:03 ieee at least, not the way you want it to work, if I get you
17:03 Kit_ The first time I did this, I pushed only one of those, and then I created the second file directly on the gitlab editor, then I had problems because the one I created on gitlab was more recent than my local one
17:04 ieee yep
17:04 Kit_ What I would try to do now, is to create both locally, and then push them to the same directory
17:04 ieee branches aside, different local repos need to have different remote repos
17:04 ieee unless they are identical, but then there's no purpose in having 2 local copies
17:05 Kit_ This are two different files, in two different local directories. What I want to do is to push them to the same directoy
17:05 ieee you CANNOT do this
17:05 Kit_ to the same remote directory*
17:06 Kit_ I see
17:06 Kit_ Then I would have to put this 2 files in the same local directory and then push
17:06 ieee yes, that will work
17:06 Emperor_Earth_ joined #git
17:08 Kit_ Okay. I'll try with that then. Thanks!
17:11 ss22ever22 joined #git
17:12 mmmveggies joined #git
17:13 danslo joined #git
17:15 jaafar joined #git
17:17 vuoto joined #git
17:17 medeirosthiiago joined #git
17:21 Balliad joined #git
17:22 unreal joined #git
17:24 mmmveggies joined #git
17:25 DarkFox_ joined #git
17:26 qws-user-1228 joined #git
17:28 danslo joined #git
17:29 fuchstronaut joined #git
17:33 SteffanW joined #git
17:33 romerocesar_ joined #git
17:35 mehola joined #git
17:35 mischat joined #git
17:35 ss22ever22 joined #git
17:35 Rodya_ joined #git
17:37 Vacuoles joined #git
17:38 InfoTest joined #git
17:38 Vacuoles Hi, is is possible to create a directory while pushing for the first time to a new, just added remote repository? Thanks
17:38 drollwit joined #git
17:40 _ikke_ can you exmplain a little more?
17:40 _ikke_ What is your intention?
17:40 Vacuoles Wait
17:40 Vacuoles I think I got it
17:40 Vacuoles Give me a minute
17:40 shinnya joined #git
17:41 HoierM joined #git
17:42 vlt Vacuoles: Put a file in the directory to add it to the repo.
17:42 nettoweb joined #git
17:42 Gehenna joined #git
17:43 shinnya joined #git
17:43 clemf joined #git
17:43 aikuma joined #git
17:43 SwiftMatt joined #git
17:44 littleforest joined #git
17:50 quackgyver joined #git
17:51 murgi0 joined #git
17:52 star_prone joined #git
17:54 cspack_ joined #git
17:55 raijin joined #git
17:55 jason237 joined #git
17:57 nettoweb joined #git
17:57 barteks2x joined #git
17:59 rossome joined #git
18:03 nettoweb1 joined #git
18:04 raijin joined #git
18:05 mikatone joined #git
18:05 mikatone hi, git is uploading .gitignore files what can i do to prevent this from happening?
18:05 multi_io joined #git
18:06 mikatone I've added files to .gitignore with git-ignore command, any help is appreciated
18:07 mikatone anyone?
18:07 nettoweb joined #git
18:07 grawity 1) there is no 'git-ignore' command
18:08 grawity 2) .gitignore does not apply to files that you told git to track
18:08 jaguarmagenta joined #git
18:08 mikatone yes there is in apt-get :)
18:08 Suigetsu joined #git
18:09 mikatone grawity sudo apt-get install git-extras
18:09 Did16 joined #git
18:09 grawity mikatone: man gitignore
18:09 gitinfo mikatone: the gitignore manpage is available at http://jk.gs/gitignore.html
18:09 mikatone grawity will provide you with the ability
18:09 leeN joined #git
18:09 grawity mikatone: will provide you with the knowledge
18:10 nettoweb_ joined #git
18:10 mikatone grawity that is not of any help but thanks you anyway
18:11 raxc joined #git
18:11 bq joined #git
18:11 _ikke_ mikatone: does git ls-index <file> where file is a file that is pushed return anything?
18:12 mikatone _ikke_ git: 'ls-index' is not a git command. See 'git --help'.
18:12 littleforest joined #git
18:12 xall joined #git
18:12 timvisher joined #git
18:12 JamesBaxter joined #git
18:13 _ikke_ sorry, git ls-files
18:13 nettoweb joined #git
18:14 Rodya_ joined #git
18:14 raijin joined #git
18:15 Did16 left #git
18:17 ss22ever22 joined #git
18:23 raijin joined #git
18:24 mkoskar joined #git
18:24 ieee joined #git
18:25 nettoweb joined #git
18:25 mizu_no_oto joined #git
18:26 mmmveggies joined #git
18:27 rpg joined #git
18:27 bluezone joined #git
18:28 Guest34788 joined #git
18:28 Guest34788 joined #git
18:29 Kitty- joined #git
18:29 [Brain] joined #git
18:30 joki joined #git
18:30 fuchstronaut joined #git
18:31 luxPerpetua joined #git
18:36 DeltaHeavy joined #git
18:41 dsdeiz joined #git
18:41 dsdeiz joined #git
18:41 ss22ever22 joined #git
18:43 zivester joined #git
18:45 e14 joined #git
18:45 littleforest joined #git
18:46 Noldorin joined #git
18:47 star_prone joined #git
18:52 FirewalkR joined #git
18:55 timvisher joined #git
18:56 Uua joined #git
18:58 nckpz joined #git
19:00 raijin joined #git
19:02 Oebele joined #git
19:09 lightstalker joined #git
19:12 cspack_ left #git
19:13 paul424 joined #git
19:15 rahtgaz joined #git
19:18 xameada_ joined #git
19:22 uoir joined #git
19:22 altendky joined #git
19:23 mischat joined #git
19:24 NeverDie joined #git
19:26 DolphinDream joined #git
19:26 Balliad joined #git
19:27 littleforest joined #git
19:28 Anja joined #git
19:28 CustosLimen joined #git
19:30 xall joined #git
19:30 Emperor_Earth joined #git
19:33 dave0x6d joined #git
19:36 mehola joined #git
19:43 btree joined #git
19:46 nettoweb joined #git
19:47 cdown___ joined #git
19:47 phaleth joined #git
19:48 ash_workz joined #git
19:49 cagedwisdom joined #git
19:52 jaguarmagenta joined #git
19:53 timvisher joined #git
19:54 aviraldg joined #git
19:54 aviraldg joined #git
19:55 dreiss joined #git
19:56 danslo joined #git
19:58 Goplat joined #git
19:59 Emperor_Earth joined #git
20:01 Kitty- joined #git
20:01 malcon joined #git
20:03 HelloShitty left #git
20:03 HelloAtMega joined #git
20:06 ss22ever22 joined #git
20:08 ss22ever22 joined #git
20:09 luxPerpetua joined #git
20:09 mrmadcat joined #git
20:09 ss22ever22 joined #git
20:10 raijin joined #git
20:11 xameada_ joined #git
20:12 aidalgol joined #git
20:12 btree left #git
20:14 magellanicloud joined #git
20:14 nikivi joined #git
20:14 elastix joined #git
20:16 CustosLimen joined #git
20:21 Guest53270 joined #git
20:24 nikivi joined #git
20:26 mangolisk joined #git
20:30 sangy joined #git
20:32 fuchstronaut joined #git
20:35 johnnyfive joined #git
20:36 luxPerpetua joined #git
20:38 e14 joined #git
20:40 timvisher joined #git
20:40 Oebele joined #git
20:43 rpg joined #git
20:44 DeltaHeavy joined #git
20:53 Lyqyd joined #git
20:55 greendo joined #git
20:56 raijin joined #git
20:59 usm4n joined #git
21:01 nilg joined #git
21:03 mizu_no_oto joined #git
21:07 ws2k3 joined #git
21:08 henk_ joined #git
21:09 fatalhalt joined #git
21:09 ochorocho__ joined #git
21:09 Faylite joined #git
21:10 wagle joined #git
21:10 xall joined #git
21:11 Faylite joined #git
21:12 xall Say I'm in a dir with 3 other dirs and I want to know which of the 3 dirs was first created (or has the earliest created files within). What's the best way?
21:13 liquidjamm joined #git
21:14 Goplat joined #git
21:15 buffal0 joined #git
21:15 timvisher joined #git
21:18 raijin joined #git
21:20 multiproc joined #git
21:24 johnmilton joined #git
21:26 malcon joined #git
21:27 akanksha_ joined #git
21:36 mehola joined #git
21:39 vlt xall: With git?
21:39 raijin joined #git
21:40 joki joined #git
21:40 mmmveggies joined #git
21:41 xall Yeah. https://gist.github.com/mixu/dbca40ec642ee652136e seemed to work for what I needed
21:41 madewokherd joined #git
21:42 moestevens joined #git
21:43 mehola joined #git
21:47 xall vlt: oops
21:48 physikoi joined #git
21:51 bulletmark joined #git
21:51 buffal0 joined #git
21:56 snowkidind joined #git
21:58 danslo joined #git
21:58 rishi` joined #git
21:58 Lor_ joined #git
22:01 drizztbsd joined #git
22:01 moestevens joined #git
22:02 bisch I have this PR - https://github.com/angular-u​i/ui-select/pull/1793/files and am trying to figure out why it's showing some commits that are outside my branch (they're some I tried to pull in from the upstream master using rebase...)
22:02 buffal0 joined #git
22:03 buddyq joined #git
22:03 nivag joined #git
22:03 elastix joined #git
22:04 buddyq is it possible to connect github desktop to a repo not on github? I want to connect to a repo on a web server.
22:06 elastix joined #git
22:07 timvisher joined #git
22:07 raijin joined #git
22:07 bisch I seem to be having trouble getting git rebase -i to create what I would expect to be orphaned commits that would go away...  It keeps looking like a merge (two parents) commit?
22:09 bisch buddyq, There's https://help.github.com/desktop/guides/​contributing/adding-a-repository-from-y​our-local-computer-to-github-desktop/ - says you can add "any Git Repository"
22:10 buddyq hmm.... ok. It's not local.
22:13 bisch buddyq, It probably has an option for a reference - it say's "any Git repository".  What do you think of GitHub Desktop?  Might it help me get my brain around git/github?
22:13 buddyq i see. well,.... I can see a .git folder in the server root directory... the url does not seem to bring it in. Is there a way to find out what the url would be so I can hook into the repo?
22:13 buddyq Sorry. Total noob.
22:13 vopros joined #git
22:13 buffal0 joined #git
22:14 buddyq bisch: yes. I watched a great video on it which made a lot of sense. https://www.youtube.com/watch?v=BKr8lbx3uFY
22:14 bisch irc - where noobs entertain lurkers...
22:15 buddyq right. well hopefully they can help
22:15 bisch Where's the repo?  They usually tell you that on whatever site or system is hosting it...  probably git:/... or ssh://...
22:19 yqt joined #git
22:20 alex1a joined #git
22:21 FirewalkR joined #git
22:22 theskillwithin https://youtu.be/JPKOESR1k04
22:23 buffal0 joined #git
22:24 jmcantrell joined #git
22:25 raijin joined #git
22:25 medeirosthiiago joined #git
22:33 axisys joined #git
22:33 fuchstronaut joined #git
22:34 buffal0 joined #git
22:34 Achylles joined #git
22:41 Faylite_ joined #git
22:42 timvisher joined #git
22:43 e14 joined #git
22:44 buffal0 joined #git
22:45 jaguarmagenta joined #git
22:45 CEnnis91 joined #git
22:46 clemf joined #git
22:46 bulletmark joined #git
22:53 JexSys joined #git
22:59 Emperor_Earth joined #git
22:59 buffal0 joined #git
23:01 buffal0 joined #git
23:02 raijin joined #git
23:02 DarkFox_ joined #git
23:10 DolphinDream joined #git
23:15 apotry joined #git
23:19 ochorocho__ joined #git
23:19 cdown_ joined #git
23:19 e14 joined #git
23:21 unreal joined #git
23:22 cqi joined #git
23:22 cqi joined #git
23:22 tom99 joined #git
23:26 eivarv joined #git
23:28 timvisher joined #git
23:30 dreiss joined #git
23:30 nilg joined #git
23:31 star_prone joined #git
23:33 tom99 left #git
23:34 mablae__ joined #git
23:34 fuchstronaut joined #git
23:40 bq joined #git
23:41 bq joined #git
23:42 bq joined #git
23:43 bq joined #git
23:43 mmmveggies joined #git
23:46 cspack_ joined #git
23:50 Ahmed90 joined #git
23:50 mehola joined #git
23:51 stevenbenner joined #git
23:52 tessier joined #git
23:53 tessier Hello all! What's the best way to convert hg 2.2.2 repos to git? Googling reveals many different scripts and programs and techniques.
23:53 nilg` joined #git
23:58 danslo joined #git
23:59 dreiss joined #git

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