Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-24

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

All times shown according to UTC.

Time Nick Message
00:03 cagmz joined #git
00:03 rossome joined #git
00:06 Hedgework joined #git
00:06 diogenese joined #git
00:07 tanuki joined #git
00:07 jetpack_joe joined #git
00:07 HedgeMage joined #git
00:13 FuzzySockets joined #git
00:13 HoierM joined #git
00:15 WaReZ joined #git
00:15 zacts joined #git
00:16 bayman joined #git
00:17 titanium17 joined #git
00:18 SwiftMatt joined #git
00:21 tesuji_ joined #git
00:21 hahuang61 joined #git
00:22 dhollinger joined #git
00:25 choki joined #git
00:37 bluezone joined #git
00:37 MrWoohoo joined #git
00:40 whaley left #git
00:40 pur3eval joined #git
00:43 jetpack_joe joined #git
00:43 qasaur joined #git
00:44 mwhooker joined #git
00:47 qpdb joined #git
00:47 blackwind_123 joined #git
00:51 kisonecat joined #git
00:55 pur3eval joined #git
01:02 Finnoloid joined #git
01:04 mehola joined #git
01:05 mingrammer joined #git
01:08 arescorpio joined #git
01:13 hecliunyx joined #git
01:17 SwiftMatt joined #git
01:21 jikz joined #git
01:22 texinwien_ joined #git
01:23 jetpack_joe joined #git
01:25 v0n joined #git
01:28 dhollinger joined #git
01:33 apotry joined #git
01:34 mwhooker joined #git
01:35 Rodya_ joined #git
01:36 nitesh joined #git
01:40 mehola joined #git
01:41 fuchstronaut joined #git
01:41 ahmedelgabri joined #git
01:46 netj joined #git
01:47 pur3eval joined #git
01:49 jaguarma_ joined #git
01:53 ochorocho__ joined #git
01:54 Rodya_ joined #git
01:57 reim joined #git
01:57 tanuki joined #git
01:57 jgornick joined #git
01:57 mehola joined #git
01:58 HoierM joined #git
01:58 pks joined #git
02:00 mingrammer joined #git
02:00 diogenese joined #git
02:06 relipse joined #git
02:09 reim joined #git
02:15 jungsubk joined #git
02:21 jgornick joined #git
02:22 hahuang61 joined #git
02:23 livingstn joined #git
02:24 realz joined #git
02:30 jgornick joined #git
02:31 chachasmooth joined #git
02:32 Dreamer3 joined #git
02:37 JanC_ joined #git
02:39 star_prone joined #git
02:47 mehola joined #git
02:49 mehola joined #git
02:54 mingrammer joined #git
02:55 dreiss joined #git
02:56 raijin joined #git
03:01 Biganon joined #git
03:01 Biganon Hi ; does * in a .gitignore now mean "all files AND all directories", whereas */ was needed before ?
03:02 moei joined #git
03:02 Biganon because it seems my * rule ignores my subdirectories as well (I have no */ rule)
03:02 sleepee joined #git
03:03 jimi_ joined #git
03:04 jeffreylevesque joined #git
03:04 jaguarmagenta joined #git
03:05 zacts joined #git
03:07 pur3eval joined #git
03:07 hexagoxel joined #git
03:09 romerocesar joined #git
03:09 mehola joined #git
03:10 jimi_sanchez joined #git
03:12 sdaugherty Biganon, https://git-scm.com/docs/gitignore explains the matching behavior. I think they are treated as shell glob patterns, with a few odd exceptions.
03:13 dopesong joined #git
03:13 raijin joined #git
03:13 sdaugherty Biganon, you can also use https://git-scm.com/docs/git-check-ignore to verify your .gitignore files
03:14 Biganon thank you !
03:14 sdaugherty git-check-ignore -v will tell you what's being ignored and why
03:19 mingrammer joined #git
03:20 cdg joined #git
03:20 k3rn31 joined #git
03:21 Biganon left #git
03:21 stoopkid joined #git
03:22 The_Phoenix joined #git
03:23 tjone270_ joined #git
03:24 The_Phoenix joined #git
03:25 The_Phoenix joined #git
03:25 Dougie187 left #git
03:27 The_Phoenix joined #git
03:29 HanClinto joined #git
03:33 xall joined #git
03:39 raijin joined #git
03:39 st0opkid joined #git
03:40 jaguarma_ joined #git
03:42 fuchstronaut joined #git
03:42 mwhooker joined #git
03:43 relipse joined #git
03:43 ahmedelgabri joined #git
03:52 fstd_ joined #git
03:55 ochorocho__ joined #git
03:58 tigos2 joined #git
03:59 HoierM joined #git
04:01 orbitphreak joined #git
04:05 raven-au joined #git
04:06 tigos2 joined #git
04:09 zivester joined #git
04:10 raven-au_ joined #git
04:17 danslo_ joined #git
04:21 jaguarmagenta joined #git
04:23 hahuang61 joined #git
04:27 star_prone joined #git
04:31 govg joined #git
04:31 k3rn31 joined #git
04:35 Literphor joined #git
04:37 xall joined #git
04:38 dopesong joined #git
04:47 HoierM joined #git
04:47 languitar joined #git
04:49 jaguarmagenta joined #git
04:50 nilg joined #git
04:52 Cabanossi joined #git
04:52 jyjon joined #git
04:53 bayman joined #git
04:55 sagerdearia joined #git
04:57 dreiss joined #git
04:57 justanotheruser joined #git
04:58 jaguarma_ joined #git
05:01 xameada joined #git
05:03 raven-au joined #git
05:10 Ocnod joined #git
05:14 freimatz joined #git
05:16 mcqr joined #git
05:18 danslo_ joined #git
05:19 mingrammer joined #git
05:20 ljc joined #git
05:20 realz joined #git
05:28 elastix joined #git
05:30 starkhalo joined #git
05:32 ome joined #git
05:32 mingrammer joined #git
05:36 phaleth joined #git
05:38 jyjon joined #git
05:38 scarabx joined #git
05:39 scarabx joined #git
05:40 tesuji joined #git
05:42 mariuscc joined #git
05:42 fuchstronaut joined #git
05:44 ahmedelgabri joined #git
05:54 Faylite joined #git
05:55 ochorocho__ joined #git
05:59 Asiajey joined #git
05:59 emPi joined #git
06:02 apotry joined #git
06:04 cdown joined #git
06:06 jstein_ joined #git
06:09 howdoi joined #git
06:15 star_prone joined #git
06:16 johnny56 joined #git
06:19 danslo_ joined #git
06:21 atrus joined #git
06:22 jaguarmagenta joined #git
06:24 hahuang61 joined #git
06:24 The_Phoenix joined #git
06:28 xall joined #git
06:31 jaguarma_ joined #git
06:33 zacts joined #git
06:33 jaguarmagenta joined #git
06:35 pur3eval joined #git
06:35 liuzhen joined #git
06:36 kini joined #git
06:36 diogenese joined #git
06:37 raijin joined #git
06:44 dreiss joined #git
06:53 pneuma joined #git
06:55 subhojit777 joined #git
06:57 Dro joined #git
07:14 xall joined #git
07:16 jaguarma_ joined #git
07:19 tanuki joined #git
07:20 danslo_ joined #git
07:20 harish_ joined #git
07:21 frogonwheels_ joined #git
07:28 vuoto joined #git
07:42 ahmedelgabri joined #git
07:42 SteffanW joined #git
07:43 fuchstronaut joined #git
07:43 Flava009 joined #git
07:44 ec\ joined #git
07:46 SteffanW joined #git
07:48 raijin joined #git
07:50 Doginal joined #git
07:51 PioneerAxon joined #git
07:51 t0by joined #git
07:51 multi_io joined #git
07:52 harish_ joined #git
07:52 pur3eval joined #git
07:55 robotroll joined #git
07:56 ochorocho__ joined #git
07:57 TomyLobo joined #git
07:57 choki joined #git
08:02 jaguarmagenta joined #git
08:02 moei joined #git
08:02 nioncode joined #git
08:02 fiete joined #git
08:03 GavinMagnus joined #git
08:03 mischat joined #git
08:04 star_prone joined #git
08:05 vuoto joined #git
08:05 noctux joined #git
08:13 tomog999 joined #git
08:13 star_prone joined #git
08:15 Doginal joined #git
08:21 mase-tech joined #git
08:25 hahuang61 joined #git
08:30 vuoto joined #git
08:30 sapiens_vector joined #git
08:30 vuoto joined #git
08:32 jaguarmagenta joined #git
08:33 cyphase joined #git
08:47 xall joined #git
08:48 vuoto_ joined #git
08:52 vuoto joined #git
08:53 satifant joined #git
08:53 RedShift joined #git
08:54 cdown joined #git
08:54 stantonk joined #git
09:00 ochorocho__ joined #git
09:03 lmatteis joined #git
09:04 sukra joined #git
09:05 AlexRussia joined #git
09:05 vuoto joined #git
09:12 stantonk joined #git
09:12 GavinMagnus left #git
09:17 catsup joined #git
09:17 CrazyBonz joined #git
09:20 danslo_ joined #git
09:23 kbs joined #git
09:25 MACscr joined #git
09:28 BryzNSTY joined #git
09:29 star_prone joined #git
09:29 chachasmooth joined #git
09:30 BryzNSTY I made a few edits to my project on github, but now id like to 'sync' that to my computer - how would I do that? (linux)
09:31 MACscr im switching dev servers and ive copied my ssh key and .git folder from the old server to the new server. how should i go about pulling the files to the new server? I thought i could simply do 'git pull', but no luck. Do i simply clone it?
09:31 RedShift git pull
09:31 aax joined #git
09:32 BryzNSTY RedShift: well, that was easy - thanks
09:34 jaguarma_ joined #git
09:34 MACscr RedShift: any suggestions for my question? =P
09:34 MACscr i would be glad to elaborate or provide additional details if needed
09:35 RedShift what do you mean with switching dev servers?
09:36 MACscr the system that i actually do all the work on
09:36 sukra git pull should work
09:36 sukra Can you elaborate on the "no luck" thing
09:37 MACscr just says its already up to date
09:37 sukra so its working...
09:37 sukra you'll have to rsync the files separately
09:37 MACscr yet none of the files from the repo are there
09:37 MACscr that makes zero sense
09:38 sukra or just clone it again
09:38 explodes joined #git
09:38 sukra afaik pull just fetches changes, not all the files
09:39 sukra so if you had rsynced the project dir from old server to new along with .git, you could've used git pull to fetch any new changes
09:40 sukra Maybe this will help
09:40 sukra http://stackoverflow.com/questions/1125968/how-to-force-git-pull-to-overwrite-local-files
09:42 MACscr thanks, you were write, a simple rsync is probably the best
09:42 moumitude joined #git
09:42 MACscr i just figured it would pull in files it didnt have
09:43 sukra You can, as the first answer in that thread suggests
09:43 sukra git fetch --all
09:43 sukra git reset --hard origin/master
09:43 grayjoc joined #git
09:43 sukra (assuming master is the branch you're after)
09:44 sukra If you do a git status on new server, you'll see a lot of "deleted" stuff
09:44 sukra git thinks you deleted everything
09:44 fuchstronaut joined #git
09:44 sukra so fetch all files, and do a git reset to restore everything
09:46 moneylotion joined #git
09:50 jaguarmagenta joined #git
09:50 MrWoohoo joined #git
09:52 ljc joined #git
09:53 nitin joined #git
09:54 geoid joined #git
09:57 Isla_de_Muerte joined #git
09:57 i7c joined #git
09:59 e89c8c95a050 joined #git
10:02 Faylite joined #git
10:05 phanimahesh joined #git
10:05 hahuang61 joined #git
10:07 stasmakarov joined #git
10:09 fiete joined #git
10:12 King_Hual joined #git
10:12 emmajane joined #git
10:13 jikz joined #git
10:15 hahuang61 joined #git
10:24 Dro joined #git
10:26 nnyk_ joined #git
10:30 quackgyver joined #git
10:33 sdothum joined #git
10:35 skylite joined #git
10:35 despoil joined #git
10:37 cyphase joined #git
10:40 Lomex joined #git
10:44 intellix joined #git
10:46 dangerousdave joined #git
10:47 LiohAu joined #git
10:49 narendraj9 joined #git
10:50 PioneerAxon joined #git
10:57 netj joined #git
11:01 grayjoc joined #git
11:01 ochorocho__ joined #git
11:04 doebi joined #git
11:06 Jackneill joined #git
11:06 Kicer86 joined #git
11:08 reim joined #git
11:11 AlexRussia joined #git
11:12 reim joined #git
11:16 raijin joined #git
11:17 ojdo joined #git
11:18 dharriga1 joined #git
11:20 azwieg103 joined #git
11:21 danslo_ joined #git
11:22 nwkj86 joined #git
11:31 Arban joined #git
11:33 qpdb joined #git
11:35 cdown_ joined #git
11:43 robotroll joined #git
11:45 fuchstronaut joined #git
11:45 izabera what is this chan's opinion on tig?
11:45 p4trix joined #git
11:49 Bladdezz joined #git
11:49 ahmedelgabri joined #git
11:55 CheckDavid joined #git
11:56 cbreak this channel does not have a single unified opinion on almost anything I think
11:57 qsx cbreak: “git is superior”? :>
11:57 i7c Yep. Only exceptions are that git is ossom!
11:57 i7c qsx \o
11:57 cbreak indeed
11:57 qsx well, for the sake of proving you wrong
11:57 qsx RCS \o/
11:57 i7c lol
11:57 sagittarian joined #git
11:57 qsx (don’t laugh, i’m actually using RCS)
11:57 * i7c laughs anyways.
11:57 i7c I'll just enjoy your pain.
11:58 qsx i got no pain from RCS
11:58 qsx izabera: well jokes aside, i haven’t heard anything bad about tig and the few times i used it myself, it was pretty okay
11:59 qsx i7c: ;; $Header: /var/nsd/zones/master/RCS/qsuscs.de.zone,v 1.10 2016/07/14 19:22:22 qsx Exp $
11:59 izabera qsx: ok but i'm a noob and i'm incredibly good at screwing up
11:59 qsx izabera: !book
11:59 gitinfo izabera: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
11:59 izabera nonono thank you very much i've got enough books
11:59 nnyk_ joined #git
11:59 izabera they'll last for a while
12:00 nwkj86 joined #git
12:06 WaReZ joined #git
12:09 sdaugherty RCS is still great if you need to version control a single file.
12:10 qsx and not necessarily share it, exactly
12:10 qsx though i might put it into a CVS repo one day
12:12 sleepee joined #git
12:15 Gamecubic joined #git
12:16 stantonk joined #git
12:16 edaught joined #git
12:18 hahuang61 joined #git
12:24 dopesong joined #git
12:24 bathtub_shark joined #git
12:25 dopesong_ joined #git
12:26 stasmakarov joined #git
12:26 jaguarmagenta joined #git
12:27 edaught_ joined #git
12:31 dopesong joined #git
12:34 ikmaak joined #git
12:36 ljc joined #git
12:41 pR0Ps joined #git
12:42 Repox joined #git
12:49 catsup joined #git
12:54 mariuscc joined #git
12:57 Jackneill joined #git
13:00 LiohAu joined #git
13:01 mehola joined #git
13:02 ochorocho__ joined #git
13:03 HanClinto joined #git
13:09 livingstn joined #git
13:10 cbreak joined #git
13:20 safe joined #git
13:21 linuxmint joined #git
13:22 danslo_ joined #git
13:24 astrofog joined #git
13:28 phanimah1sh joined #git
13:30 stasmakarov joined #git
13:32 leeN joined #git
13:34 vuoto joined #git
13:36 robotroll joined #git
13:41 nnyk_ joined #git
13:41 blahdodo joined #git
13:45 dopesong joined #git
13:45 fuchstronaut joined #git
13:45 fahadash joined #git
13:47 PioneerAxon joined #git
13:49 FuzzySockets joined #git
13:51 kus joined #git
13:54 livingstn joined #git
13:55 freimatz joined #git
13:57 dopesong joined #git
14:02 ahmedelgabri joined #git
14:02 subhojit_ joined #git
14:04 zivester joined #git
14:04 mehola joined #git
14:05 jaafar joined #git
14:06 dwmw2_gone joined #git
14:14 evie_hammond joined #git
14:18 SteffanW joined #git
14:18 stantonk joined #git
14:18 Rodya_ joined #git
14:19 hahuang61 joined #git
14:19 stantonk joined #git
14:19 ahmedelgabri joined #git
14:23 choki joined #git
14:25 johnmilton joined #git
14:27 jaguarmagenta joined #git
14:27 mingrammer joined #git
14:27 ochorocho__ joined #git
14:29 marijnfs joined #git
14:35 denimsoft joined #git
14:35 InfoTest joined #git
14:37 AlexRussia joined #git
14:42 Darcidride joined #git
14:46 rgrinberg joined #git
14:48 emmajane joined #git
14:48 rolha joined #git
14:49 nnyk_ joined #git
14:53 Manuel15 joined #git
14:53 Manuel15 joined #git
14:54 livingstn joined #git
14:59 Asiajey_ joined #git
15:00 e89c8c95a051 joined #git
15:01 Asiajey_ joined #git
15:03 Asiajey joined #git
15:05 mehola joined #git
15:06 chid joined #git
15:07 chid_ joined #git
15:11 emmajane joined #git
15:12 zeroed joined #git
15:14 e89c8c95a050 joined #git
15:19 vuoto joined #git
15:22 e89c8c95a051 joined #git
15:23 danslo_ joined #git
15:28 apipkin_ joined #git
15:28 narendraj9 joined #git
15:28 LeMike joined #git
15:30 zarel joined #git
15:31 lagothrix joined #git
15:32 CheckDavid joined #git
15:36 bedouin joined #git
15:36 narendraj9 joined #git
15:37 sangy joined #git
15:37 madewokherd joined #git
15:42 stantonk joined #git
15:44 e89c8c95a050 joined #git
15:46 fuchstronaut joined #git
15:47 gusnan joined #git
15:47 gusnan joined #git
15:49 zeroed joined #git
15:49 zeroed joined #git
15:56 harish_ joined #git
15:57 tjone270__ joined #git
15:57 xameada joined #git
15:59 Repox joined #git
16:01 tjone270 joined #git
16:01 cloudcell__ joined #git
16:03 zeroed joined #git
16:03 sanketdg joined #git
16:03 LeMike joined #git
16:06 mehola joined #git
16:08 rolha joined #git
16:09 scarabx joined #git
16:09 e89c8c95a051 joined #git
16:10 geoid joined #git
16:16 mellernoia joined #git
16:16 thiago joined #git
16:18 e89c8c95a050 joined #git
16:19 f3r70rr35f joined #git
16:19 hahuang61 joined #git
16:19 Darren_ joined #git
16:19 diegoviola joined #git
16:21 sukra joined #git
16:22 fatmarcel joined #git
16:22 choki joined #git
16:23 grayjoc joined #git
16:26 Darcidride joined #git
16:27 jaguarmagenta joined #git
16:28 e89c8c95a051 joined #git
16:28 sagerdearia joined #git
16:29 ahmedelgabri joined #git
16:31 SteffanW joined #git
16:32 e89c8c95a050 joined #git
16:34 plasticle joined #git
16:35 reim joined #git
16:36 harish_ joined #git
16:38 reim joined #git
16:46 astaves joined #git
16:50 kulelu88 joined #git
16:52 clemf joined #git
16:58 marijnfs joined #git
16:58 xameada joined #git
17:00 clemf joined #git
17:06 andlabs joined #git
17:06 Narwhaal joined #git
17:07 mehola joined #git
17:07 ResidentBiscuit joined #git
17:11 clemf joined #git
17:11 sukra joined #git
17:13 sukra joined #git
17:14 Darren_ joined #git
17:14 xall joined #git
17:15 yoan joined #git
17:17 netj joined #git
17:18 Dyonisos joined #git
17:19 sukra joined #git
17:20 baxx joined #git
17:20 spudowiar joined #git
17:20 clemf joined #git
17:22 Faylite joined #git
17:24 supaket joined #git
17:28 ochorocho__ joined #git
17:28 e89c8c95a050 joined #git
17:29 LiohAu joined #git
17:30 HanClinto joined #git
17:30 harish_ joined #git
17:33 ochorocho__ joined #git
17:33 Rodya_ joined #git
17:34 BenderRodriguez joined #git
17:39 sleezd joined #git
17:40 RebelCoder joined #git
17:41 RebelCoder guys, is there really no good GUI client for Linux ? Like Git Desktop or Source Tree ?
17:41 satifant !guis
17:41 gitinfo Popular GUIs for Git are listed on the website: http://git-scm.com/downloads/guis
17:42 satifant personally, i can recommend smartgit
17:42 RebelCoder Yeah... nothing from that list comes even close to Git Desktop or Sourcetree that are only Win+Mac... Very ironic...
17:43 Sucks joined #git
17:43 RebelCoder SmartGit is not open as far as I see ?
17:43 qsx well if you ask me the github client is a pile of shit, so …
17:43 mariuscc joined #git
17:45 Literphor joined #git
17:45 satifant smartgit is free for non-commercial use, for commercial use, you have to buy a licence, yes
17:47 fuchstronaut joined #git
17:47 RebelCoder joined #git
17:48 RebelCoder left #git
17:49 coe joined #git
17:50 jaguarmagenta joined #git
17:50 coe left #git
17:50 Rodya_ joined #git
17:54 ochorocho__ joined #git
17:54 quackgyver joined #git
17:54 djb-irc joined #git
17:57 zeller joined #git
17:58 zzz_ joined #git
17:58 xameada_ joined #git
18:00 xameada_1 joined #git
18:04 nwkj86 joined #git
18:05 raijin joined #git
18:07 mehola joined #git
18:13 D-Boy joined #git
18:14 Rodya_ joined #git
18:14 robotroll joined #git
18:20 stonerfish joined #git
18:20 hahuang61 joined #git
18:24 stantonk joined #git
18:26 rgrinberg joined #git
18:28 Rodya_ joined #git
18:29 cdg joined #git
18:30 acetakwas joined #git
18:30 cdg joined #git
18:30 Doginal joined #git
18:31 Doginal left #git
18:32 ahmedelgabri joined #git
18:32 cyphase joined #git
18:33 Endarked joined #git
18:33 Faylite joined #git
18:36 cdg joined #git
18:38 Silenced joined #git
18:40 Endarked joined #git
18:41 elastix joined #git
18:41 Silenced joined #git
18:45 JanC joined #git
18:47 xameada joined #git
18:48 zincrokx joined #git
18:48 dwmw2_gone joined #git
18:51 LiohAu joined #git
18:55 AlexRussia joined #git
19:01 jaguarma_ joined #git
19:08 Finnoloid joined #git
19:08 mehola joined #git
19:10 LeMike joined #git
19:14 LiohAu joined #git
19:17 blackwind_123 joined #git
19:18 ahmedelgabri joined #git
19:20 nidr0x joined #git
19:21 raininja joined #git
19:22 wagle joined #git
19:23 mingrammer joined #git
19:24 zero7 joined #git
19:26 mellernoia joined #git
19:28 xameada joined #git
19:28 xall joined #git
19:32 starkhalo joined #git
19:32 ochorocho__ joined #git
19:32 cYmen joined #git
19:33 cYmen When I create a tag it's always for the entire tree, right? I can't just tag a version of a subfolder, correct?
19:33 SwiftMatt joined #git
19:33 kulelu88 joined #git
19:34 _ikke_ correct. You tag commits
19:35 kulelu88 joined #git
19:36 kulelu88 joined #git
19:36 thiago you can tag other things
19:36 thiago you should not tag other things
19:36 _ikke_ Right
19:36 p4trix joined #git
19:36 _ikke_ Was just thinking about Junio having tagged his public key I believe
19:36 _ikke_ or something like that
19:36 mehola joined #git
19:37 unbalancedparen joined #git
19:38 jeffreylevesque joined #git
19:40 dopesong joined #git
19:41 PCatinean joined #git
19:45 Literphor joined #git
19:48 fuchstronaut joined #git
19:49 netj joined #git
19:50 FuzzySockets joined #git
19:52 blackwind_123 joined #git
19:52 ResidentBiscuit joined #git
19:53 kadoban joined #git
19:53 WayToDoor joined #git
19:54 netcarver joined #git
19:55 dangerousdave joined #git
19:56 WayToDoor joined #git
19:57 lmatteis joined #git
20:02 Guest48259 joined #git
20:06 dopesong joined #git
20:06 nnyk_ joined #git
20:10 blackwind_123 joined #git
20:12 geoid joined #git
20:12 cdg joined #git
20:13 Seveas yup
20:13 Seveas refs/tags/junio-gpg-pub
20:16 nilg joined #git
20:17 paul424 joined #git
20:17 mingrammer joined #git
20:19 Goplat joined #git
20:20 moritz and that tags a blob, or what?
20:20 _ikke_ yes, iirc a blob indeed
20:21 hahuang61 joined #git
20:21 Rodya_ joined #git
20:22 cdown joined #git
20:22 ochorocho__ joined #git
20:25 yoan joined #git
20:26 synthroid joined #git
20:33 ochorocho__ joined #git
20:33 HoierM joined #git
20:34 HoierM joined #git
20:39 Isla_de_Muerte joined #git
20:40 zacts joined #git
20:42 jaguarmagenta joined #git
20:46 Literphor joined #git
20:46 dopesong_ joined #git
20:47 shinnya joined #git
20:47 jaguarmagenta joined #git
20:49 ochorocho__ joined #git
20:50 stoopkid joined #git
20:52 romerocesar joined #git
20:52 nidr0x joined #git
20:53 yoan joined #git
20:54 shgysk8zer0 joined #git
20:56 Doginal joined #git
20:56 zacts joined #git
20:57 clemf joined #git
20:57 kab joined #git
20:59 yqt joined #git
21:01 EduardoMartins joined #git
21:02 jstimm joined #git
21:09 BenderRodriguez joined #git
21:09 dopesong joined #git
21:11 ResidentBiscuit joined #git
21:13 grayjoc joined #git
21:13 geoid joined #git
21:13 sobersabre joined #git
21:15 EvilPenguin joined #git
21:15 Ahmed90 joined #git
21:19 reim joined #git
21:19 moneylotion joined #git
21:19 romerocesar joined #git
21:20 RedneckDonut joined #git
21:20 WaReZ joined #git
21:21 aax joined #git
21:22 aidalgol joined #git
21:23 King_Hual joined #git
21:25 King_Hual joined #git
21:25 King_Hual joined #git
21:26 Sucks joined #git
21:27 vuoto joined #git
21:27 Codfection joined #git
21:29 sagerdearia joined #git
21:29 orbitphreak joined #git
21:32 rahtgaz joined #git
21:34 MZAWeb joined #git
21:36 RedneckDonut joined #git
21:36 leehambley joined #git
21:37 AaronMT joined #git
21:38 cdown joined #git
21:42 moneylotion joined #git
21:46 moneylotion joined #git
21:47 SimonNa joined #git
21:47 CussBot joined #git
21:47 geoid joined #git
21:48 moneylotion joined #git
21:48 mingrammer joined #git
21:49 fuchstronaut joined #git
21:52 leehambley joined #git
21:59 cyphase joined #git
22:00 ochorocho__ joined #git
22:00 harish_ joined #git
22:13 joki joined #git
22:14 Literphor joined #git
22:16 baxx joined #git
22:19 cdg_ joined #git
22:22 hahuang61 joined #git
22:26 stantonk joined #git
22:28 justanot1eruser joined #git
22:33 rinwa joined #git
22:40 cagmz joined #git
22:42 MTecknology It seems like git diff stops producing any output when I add files.
22:42 leehambley joined #git
22:42 mingrammer joined #git
22:43 leehambley I'm looking for participants who work in software development/operations to ask about their habits and what software they use, if anyone has 15 minutes to spare in the next couple of days to help me with a study. Please check https://calendly.com/customer-interviews/15min (sorry if this is considered spam, I'm casting the net outside my usual social circles, this will be my last message)
22:43 MTecknology Right now, when I try to run git diff, I see no output, command is done executing in under two seconds, and git status shows actual changes
22:48 eozelda joined #git
22:52 titanium17 joined #git
22:53 lindenle joined #git
22:54 lindenle_ joined #git
22:54 Finnoloid joined #git
22:55 cagmz joined #git
22:57 Rodya_ joined #git
22:58 Hello71 MTecknology: git diff --cached
22:59 Hello71 leehambley: yes it's spam
22:59 leehambley ACK Hello71 - there'll be no follow-up. Happy to respond to hate mail in a PM, I probably deserve it :)
23:00 lindenle_ joined #git
23:02 Ph_ joined #git
23:04 plasticle joined #git
23:04 lindenle joined #git
23:07 WayToDoor joined #git
23:07 lindenle_ joined #git
23:11 MTecknology Hello71: Perfect! Should Is there a config option to make that default?
23:11 Hello71 man git-diff
23:11 gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html
23:11 apotry joined #git
23:12 Hello71 !index
23:12 gitinfo The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
23:12 osse MTecknology: git diff and git diff --cached do fundamentally different things
23:12 osse if it was default then you'd have to do git diff --no-cached quite often
23:12 MTecknology oh...
23:12 MTecknology I seem to run into this issue a lot
23:13 osse MTecknology: git diff shows unstaged changes. git diff --cached shows already staged changes.
23:13 MTecknology almost always after adding files, though
23:13 osse exactly
23:13 osse MTecknology: git config --global alias.d diff && git config --global alias.ds 'diff --cached'
23:13 osse MTecknology: git d and git ds \o/
23:13 MTecknology :D
23:14 MZAWeb joined #git
23:14 kbs joined #git
23:14 Hello71 you think that git diff does git diff HEAD
23:14 osse MTecknology: and alias g=git in your .whateverrc of course
23:14 Hello71 which is a bad idea because... I don't actually know.
23:15 MTecknology I avoid shortening things like that, especially with how much I have to use hg for work
23:20 cyphase joined #git
23:27 spudowiar joined #git
23:27 mehola joined #git
23:27 ochorocho__ joined #git
23:28 mablae__ joined #git
23:33 MTecknology osse: so... what is unstaged vs. staged? I'm not understanding what I'm reading. Is there a really simple dummies explanation for four year olds?
23:35 kadoban MTecknology: The staging area is "what will become the next commit" essentially.
23:35 Rodya_ joined #git
23:36 MTecknology Now I get less why --cached is required once I add a file. :S
23:36 mingrammer joined #git
23:37 MTecknology ..... fuck
23:38 Rodya_ joined #git
23:38 MTecknology I accidentally did 'git reset <file>' instead of 'git checkout <file>' with a whole lot of changes I was about to commit...
23:38 MTecknology How much did I just screw myself?
23:39 adante joined #git
23:39 kadoban MTecknology: Well, that unstages the changes, but they're still in the working directory. It depends how much those two differ how bad that is.
23:39 MTecknology It looks like I might be okay... I got scared, though
23:40 MTecknology I need to spend some time to learn git instead of just using it. :(
23:40 MTecknology kadoban: I'm trying to make any of my changes in one file go away and commit everything else.
23:40 kadoban MTecknology: Welll, using it is one of the best ways to learn it, but if you haven't already you should do some initial reading to get up to basic speed.
23:41 kadoban MTecknology: I'd just stage it all (git add .), then unstage the one I don't want (git reset HEAD -- the_file) and then commit
23:41 MTecknology Unstaged changes after reset: bitlbee.conf
23:42 MTecknology git unadd  :D
23:44 Rodya_ joined #git
23:45 MTecknology kadoban: I've been using git for years, I just rarely have to get into anything beyond a very linear model edit->commit->push->(repeat)
23:45 kadoban Ah, branches are the best part of git, though it does okay in the very linear model I suppose.
23:45 MZAWeb joined #git
23:46 sctskw joined #git
23:46 MTecknology I guess I've used branches, tags, merging, etc. It's just not with any amount of frequency
23:49 fuchstronaut joined #git
23:52 leehambley joined #git
23:53 MTecknology kadoban: so... I've been building against head, just realized I need to be working against a specific release (which was properly tagged).
23:54 MTecknology I can't really just do it 'git checkout <version>' and start making modifications anymore, can I?
23:55 MTecknology All of the packaging is in debian/* and that's the only place I've been making any changes. The source code is sitting ....
23:55 MTecknology ya know what, no...
23:55 MTecknology debian packaging is a separate project. It's time to split it out!
23:55 kadoban MTecknology: You can just do 'git checkout <version>' sure. If you want to be making commits on top of that though, you should make a branch once you're there. Tags can't be modified with new commits.
23:55 Literphor joined #git
23:56 leehambley joined #git
23:56 MTecknology irunno... it'll be easier to split the packaging out as a whole separate thing. :(
23:56 MTecknology damnit
23:57 rolha joined #git
23:58 MTecknology kadoban: git checkout <tag>; git branch -b <tag>-debian-updates; git merge <that directory from head>; git commit -am 'Merging changes in head to build against <tag>." ?

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