Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-11

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

All times shown according to UTC.

Time Nick Message
00:05 ResidentBiscuit joined #git
00:08 MattMaker joined #git
00:08 BackEndCoder joined #git
00:08 cyphase joined #git
00:11 romerocesar_ joined #git
00:14 aspiers_ joined #git
00:14 romerocesar joined #git
00:16 citizen-stig joined #git
00:17 romerocesar_ joined #git
00:18 kyan_ joined #git
00:23 kyan_ joined #git
00:24 runlevl4 joined #git
00:24 ochorocho__ joined #git
00:25 cyphase joined #git
00:27 MattMaker joined #git
00:30 IndigoTiger joined #git
00:31 rubie joined #git
00:32 tesuji joined #git
00:32 imacinto joined #git
00:32 imacinto joined #git
00:33 cyphase joined #git
00:35 romerocesar joined #git
00:38 pouet joined #git
00:39 Puffball joined #git
00:41 deadprez joined #git
00:41 romerocesar joined #git
00:48 deadprez joined #git
00:48 deadprez_ joined #git
00:52 raijin joined #git
00:56 romerocesar_ joined #git
00:57 ekinmur joined #git
00:58 mycyber joined #git
01:00 rbr joined #git
01:00 inflames i stashed uncommited changes with git stash -u -k but now they seem to be unrecoverable, help!!!!
01:01 inflames woah
01:01 inflames i can pop the entire stash and find them
01:01 inflames nevermind
01:01 inflames wooo
01:01 inflames was worried
01:01 star_prone joined #git
01:01 romerocesar joined #git
01:02 jhe_ joined #git
01:06 hahuang61 joined #git
01:06 Lyqyd joined #git
01:07 i7c inflames, you can also access a single entry of the stash without popping all of the stuff on top.
01:07 Gurkenglas joined #git
01:08 i7c Read the last section of "pop" in man git-stash
01:08 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
01:08 i7c Also works with apply
01:09 mingrammer joined #git
01:09 inflames i7c, i don't see it there
01:10 inflames i see --index and <revision>
01:10 inflames er --index and <stash>
01:10 inflames but nothing for individual files
01:12 i7c Oh you want an individual file from the stash?
01:12 i7c You can do git checkout stash@{X} -- path/to/file
01:12 i7c where X is the stash entry.
01:12 jeffl35 joined #git
01:13 inflames oh you can?
01:13 inflames that's awesome, never knew that
01:13 inflames so often i diff to pull changes from a stash
01:13 inflames awesome
01:14 i7c :]
01:14 dreiss joined #git
01:14 i7c inflames, there’s also checkout -p if you didn’t know about that one either.
01:15 osse stashes are there for you to mold as you wish. they're like clay, man!
01:15 i7c It puts changes from another revision to your working tree and index asking hunk for hunk.
01:15 i7c Similar to add -p
01:16 chrisshattuck joined #git
01:16 pouet joined #git
01:16 romerocesar_ joined #git
01:21 pks- joined #git
01:21 SwiftMatt joined #git
01:24 DieguezZ joined #git
01:25 ochorocho__ joined #git
01:27 romerocesar joined #git
01:32 sonikspin joined #git
01:34 inflames very cool stuff
01:35 inflames i am really still learning more advanced git, but it's insanely capable and excellent for replacing my hacky methods of duplicating projects and mashing them back together
01:36 Electrometro joined #git
01:36 i7c amen
01:38 romerocesar_ joined #git
01:40 pouet joined #git
01:41 d^sh joined #git
01:46 Vampire0_ joined #git
01:46 Mobutils joined #git
01:48 romerocesar joined #git
01:49 kyan joined #git
01:49 realz joined #git
01:49 PaulCapestany joined #git
01:52 mycyber joined #git
01:53 rbern joined #git
01:54 Dougie187 joined #git
01:55 dreiss joined #git
01:57 chrisshattuck joined #git
02:01 romerocesar joined #git
02:01 jfran joined #git
02:03 diogenese joined #git
02:03 mingrammer joined #git
02:05 deadprez joined #git
02:07 chachasmooth joined #git
02:10 saml joined #git
02:12 hexagoxel joined #git
02:14 fstd_ joined #git
02:17 ekinmur joined #git
02:17 romerocesar_ joined #git
02:19 KeelOfSteel joined #git
02:21 ResidentBiscuit joined #git
02:23 Bennux joined #git
02:23 paulh_ joined #git
02:25 ojdo joined #git
02:25 dreiss joined #git
02:26 checkItOut_ joined #git
02:27 romerocesar joined #git
02:30 theskillwithin joined #git
02:32 lagothri1 joined #git
02:32 citizen-stig joined #git
02:33 imacinto joined #git
02:33 rgrinberg joined #git
02:35 mycyber joined #git
02:37 phoenixz joined #git
02:37 duderonomy joined #git
02:38 prawnzy joined #git
02:39 deadprez joined #git
02:39 e14 joined #git
02:39 romerocesar joined #git
02:41 fakenerd joined #git
02:45 greendo joined #git
02:45 sagerdearia joined #git
02:51 groundnuty hey, I would like to do git ls-files and exclude all paths that have 'doc' in them
02:51 groundnuty the --exclude=<pattern> seems not designed for it...
02:51 groundnuty any ideas?
02:52 d0nn1e joined #git
02:54 texasmynsted joined #git
02:56 compeman joined #git
02:59 stonercoder joined #git
03:02 deadprez joined #git
03:03 chachasmooth joined #git
03:07 hahuang61 joined #git
03:12 romerocesar_ joined #git
03:13 kyan joined #git
03:15 Vortex34 joined #git
03:17 qpdb joined #git
03:18 prawnzy joined #git
03:20 kingpinlz_ joined #git
03:22 SwiftMatt joined #git
03:26 ochorocho__ joined #git
03:27 MattMaker joined #git
03:29 deadprez joined #git
03:29 snthsnth joined #git
03:30 navidr joined #git
03:32 Emperor_Earth joined #git
03:33 dunpeal joined #git
03:35 rubie joined #git
03:36 theskillwithin joined #git
03:37 Pyrogerg joined #git
03:45 sxlijin joined #git
03:45 BrianBlaze420 joined #git
03:49 Mobutils joined #git
03:50 go1111111 joined #git
03:51 eizua joined #git
03:51 mingrammer joined #git
03:56 deadprez joined #git
03:57 deadprez joined #git
04:01 mizu_no_oto joined #git
04:05 guilherme joined #git
04:06 Cabanossi joined #git
04:07 pouet joined #git
04:08 Puffball joined #git
04:14 DolpheenDream joined #git
04:15 qws-user-1229 joined #git
04:17 chrisshattuck joined #git
04:22 citizen-stig joined #git
04:23 Donald_ET3 joined #git
04:26 pouet joined #git
04:29 rgrinberg joined #git
04:31 snthsnth joined #git
04:33 imacinto joined #git
04:40 satbyy joined #git
04:41 ShekharReddy joined #git
04:46 mingrammer joined #git
04:47 languitar joined #git
04:49 dermoth joined #git
04:49 dendazen joined #git
04:50 mycyber joined #git
04:53 chrisshattuck joined #git
04:54 daey_ joined #git
04:55 Puffball joined #git
04:55 _ng joined #git
04:55 BrianBlaze420 joined #git
04:58 prawnzy joined #git
05:02 kadoban joined #git
05:03 Cabanossi joined #git
05:05 Pyrogerg joined #git
05:05 pouet joined #git
05:07 |prawnzy joined #git
05:08 hahuang61 joined #git
05:10 |prawnzy joined #git
05:10 madewokherd` joined #git
05:12 rgrinberg joined #git
05:14 |prawnzy left #git
05:14 prawnzy joined #git
05:15 prawnzy joined #git
05:17 relipse joined #git
05:20 sagerdearia joined #git
05:21 nilg joined #git
05:22 circ-user-F6zEO joined #git
05:26 dodobrain joined #git
05:27 ochorocho__ joined #git
05:33 dunpeal joined #git
05:37 SwiftMatt joined #git
05:40 dsdeiz joined #git
05:40 dsdeiz joined #git
05:46 tyreld joined #git
05:52 pouet joined #git
05:54 garyserj joined #git
05:58 dsdeiz_ joined #git
06:05 deadprez_ joined #git
06:05 a_thakur joined #git
06:07 Pyrogerg joined #git
06:10 romerocesar joined #git
06:12 citizen-stig joined #git
06:14 synruby joined #git
06:19 PioneerAxon joined #git
06:20 BrianBlaze420 joined #git
06:22 AndreSomers joined #git
06:23 chrisshattuck joined #git
06:24 pouet joined #git
06:28 mangolisk joined #git
06:34 mingrammer joined #git
06:35 synruby i learned git in 1 hour on codecademy
06:36 tjone270 joined #git
06:37 mycyber joined #git
06:37 imacinto joined #git
06:38 _ikke_ groundnuty: git ls-files . ":!*doc*"
06:38 synruby you can learn it for free. its easy https://www.codecademy.com/learn/learn-git
06:40 _ikke_ What do they cover?
06:41 chrisshattuck joined #git
06:41 synruby they cover the very basics a novice would need to get started
06:41 circ-user-F6zEO joined #git
06:41 synruby and i think its the only track thats easy to grasp in codecademy
06:44 armyriad joined #git
06:52 darkbit joined #git
06:55 cyan__ joined #git
06:56 vuoto joined #git
07:03 pouet joined #git
07:05 darkbit joined #git
07:07 synruby left #git
07:08 hahuang61 joined #git
07:08 qws-user-1228 joined #git
07:10 BrianBlaze420 joined #git
07:10 vuoto joined #git
07:14 t0by joined #git
07:17 raatiniemi joined #git
07:20 ayjay_t joined #git
07:20 a_thakur joined #git
07:22 BackEndCoder joined #git
07:23 sim642 joined #git
07:24 roxlu_ joined #git
07:27 ochorocho__ joined #git
07:28 sanketdg joined #git
07:29 mingrammer joined #git
07:29 sanketdg joined #git
07:30 AndreSomers joined #git
07:31 sanketdg joined #git
07:33 sanketdg joined #git
07:33 dreiss joined #git
07:34 dunpeal joined #git
07:42 a3pq51 joined #git
08:00 parasite_ joined #git
08:00 overlord_tm joined #git
08:01 citizen-stig joined #git
08:03 Sadeukko joined #git
08:06 bocaneri joined #git
08:07 snthsnth joined #git
08:08 bocaneri joined #git
08:14 hyperair joined #git
08:18 DANtheBEASTman i find myself using `git stash; git stash branch <some branch>` often and am considering making an alias for it, or is there a better way to do what i'm doing here?
08:20 snthsnth joined #git
08:20 cagedwisdom joined #git
08:24 irqq joined #git
08:24 wgrant joined #git
08:27 osse DANtheBEASTman: checkout -b <some branch>
08:27 DANtheBEASTman right, but that requires foresight that i don't always have lol
08:27 DANtheBEASTman so i wanted to make an alias that moves all changes i've made to a new branch
08:27 osse DANtheBEASTman: what foresight?
08:28 glebihan_ joined #git
08:29 shinnya joined #git
08:29 DANtheBEASTman i have a git checkout alias already, but unless i'm mistaken, that wouldn't move all of your changes to a new branch
08:30 osse DANtheBEASTman: uncommitted changes don't belong anywhere to begin with
08:30 osse !float
08:30 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
08:31 DANtheBEASTman hmmmmmmmmm
08:34 gb joined #git
08:34 krzysiekj joined #git
08:34 larrybolt joined #git
08:34 osse rekt
08:36 gb ?
08:37 spudowiar joined #git
08:38 imacinto joined #git
08:39 mingrammer joined #git
08:41 erguven joined #git
08:41 elastix joined #git
08:41 cagedwisdom joined #git
08:45 robotroll joined #git
08:45 _ng joined #git
08:48 prawnzy joined #git
08:48 ruskie joined #git
08:49 zivester joined #git
08:57 pouet joined #git
08:57 Jackneill joined #git
08:58 drizztbsd joined #git
09:01 satbyy joined #git
09:01 satbyy joined #git
09:02 mingrammer joined #git
09:04 lolmac joined #git
09:06 Darcidride joined #git
09:09 hahuang61 joined #git
09:09 satifant joined #git
09:12 shirty joined #git
09:17 catsup joined #git
09:18 osse !
09:19 King_Hual joined #git
09:19 King_Hual joined #git
09:21 romerocesar joined #git
09:25 ochorocho__ joined #git
09:29 mkoskar joined #git
09:35 dunpeal joined #git
09:38 nilg joined #git
09:42 ams__ joined #git
09:43 Rajeshk joined #git
09:44 ahmedelgabri joined #git
09:50 DieguezZ joined #git
09:51 aidalgol joined #git
09:56 satbyy joined #git
09:56 satbyy joined #git
09:56 mingrammer joined #git
10:00 Xizor joined #git
10:01 catsup joined #git
10:01 citizen-stig joined #git
10:02 raven-au joined #git
10:04 cdown_ joined #git
10:05 InfoTest joined #git
10:05 Emperor_Earth joined #git
10:05 sapiens_vector joined #git
10:06 stamina joined #git
10:06 izak joined #git
10:08 kyan joined #git
10:13 ahmedelgabri joined #git
10:13 bongjovi joined #git
10:16 a_thakur joined #git
10:17 u1106 joined #git
10:18 bernardio joined #git
10:21 Fuco left #git
10:22 shirty joined #git
10:24 DieguezZ joined #git
10:33 bremner
10:35 osse
10:36 nwkj86 joined #git
10:37 dunpeal joined #git
10:38 eivarv joined #git
10:40 imacinto joined #git
10:40 tombruijn joined #git
10:42 tematibr joined #git
10:47 frobnic
10:47 i7c ¡
10:49 prawnzy joined #git
10:50 edaught joined #git
11:02 dsdeiz_ joined #git
11:03 nikivi joined #git
11:04 DieguezZ joined #git
11:07 pouet joined #git
11:10 hahuang61 joined #git
11:14 dling joined #git
11:17 ahmedelgabri joined #git
11:18 mohabaks joined #git
11:23 BackEndCoder joined #git
11:23 roelmonnens joined #git
11:24 AndreSomers joined #git
11:26 ochorocho__ joined #git
11:29 roelmonnens joined #git
11:30 AndreSomers joined #git
11:35 CheckDavid joined #git
11:35 m1dnight1 joined #git
11:39 phaleth joined #git
11:43 Eryn_1983_FL joined #git
11:43 citizen-stig joined #git
11:43 robotroll joined #git
11:44 jost__ joined #git
11:44 paws_ joined #git
11:47 dendazen joined #git
11:49 ItSANgo joined #git
11:52 t0by joined #git
11:57 AndreSomers joined #git
11:58 t0by joined #git
11:58 JanC_ joined #git
12:02 hellyeah joined #git
12:02 hellyeah anyone here?
12:02 hellyeah i need to create "pull request" for merging my repo with other repo right?
12:02 _ikke_ Depends on the context
12:02 _ikke_ I assume you are talking about gitub
12:02 _ikke_ github
12:03 ochorocho__ joined #git
12:12 mohabaks joined #git
12:13 bruce_lee joined #git
12:13 bruce_lee joined #git
12:15 dling` joined #git
12:18 sdothum joined #git
12:19 red82 joined #git
12:20 BackEndCoder joined #git
12:20 anuxivm joined #git
12:21 jimi_ joined #git
12:29 ahmedelgabri joined #git
12:33 cdg joined #git
12:37 dling joined #git
12:38 PCatinean joined #git
12:40 dsdeiz joined #git
12:41 imacinto joined #git
12:41 imacinto joined #git
12:41 chrisshattuck joined #git
12:42 tombruijn joined #git
12:42 circ-user-F6zEO joined #git
12:44 runlevl4 joined #git
12:46 rgrinberg joined #git
12:50 prawnzy joined #git
12:53 overlord_tm joined #git
12:58 roflin joined #git
12:59 kyan joined #git
12:59 nd joined #git
13:01 HoierM joined #git
13:05 imacinto joined #git
13:06 pouet joined #git
13:06 Noldorin joined #git
13:09 roflin joined #git
13:11 hahuang61 joined #git
13:14 moestevens joined #git
13:14 JanC_ joined #git
13:16 johntramp joined #git
13:16 darkbit joined #git
13:17 imacinto joined #git
13:19 mycyber joined #git
13:20 lacrymology joined #git
13:22 blackwind_123 joined #git
13:26 zeroed joined #git
13:27 mniip joined #git
13:29 imacinto joined #git
13:29 imacinto joined #git
13:34 Snich joined #git
13:35 flavius joined #git
13:36 satbyy joined #git
13:36 satbyy joined #git
13:37 str joined #git
13:37 BackEndCoder joined #git
13:38 cdg joined #git
13:39 akitada joined #git
13:41 NwS joined #git
13:50 fakenerd joined #git
13:50 pouet joined #git
13:54 fakenerd_ joined #git
13:56 sanketdg joined #git
13:58 pouet joined #git
14:00 GandalfTheWizard joined #git
14:02 MacGyver joined #git
14:06 Noldorin joined #git
14:13 xlegoman joined #git
14:14 r4z joined #git
14:15 nd joined #git
14:16 anuxivm joined #git
14:16 chrisshattuck joined #git
14:19 Noldorin joined #git
14:20 madewokherd joined #git
14:20 lagothri1 joined #git
14:22 anuxivm joined #git
14:23 anuxivm joined #git
14:23 howitdo joined #git
14:23 howitdo joined #git
14:24 overlord_tm joined #git
14:25 rubie joined #git
14:25 pouet joined #git
14:25 quetz joined #git
14:27 justanotheruser joined #git
14:28 efrahim joined #git
14:29 anuxivm joined #git
14:29 ochorocho__1 joined #git
14:29 dreiss joined #git
14:30 Zamerick joined #git
14:31 simonlinj joined #git
14:31 Gurkenglas joined #git
14:31 ahmedelgabri joined #git
14:32 m0viefreak joined #git
14:32 efrahim Hi, I'm learning git, so I have a simple question: Standing in branch "X" having another branch "Y" will "$ git pull Y" add changes in "Y" to "X" without affecting "Y"? (pictures in manual seem to imply that "Y" will stop/be gone after such a pull)
14:32 imacinto joined #git
14:32 imacinto joined #git
14:34 anuxivm joined #git
14:36 mizu_no_oto joined #git
14:39 simonlinj joined #git
14:41 snowkidind joined #git
14:42 zeroed joined #git
14:46 spriz joined #git
14:48 Surfer2010 joined #git
14:49 JamesBaxter joined #git
14:49 johnmilton joined #git
14:50 zivester joined #git
14:51 prawnzy joined #git
14:51 anuxivm joined #git
14:53 stonercoder joined #git
14:54 ayjay_t joined #git
14:55 imacinto joined #git
14:57 thiago joined #git
14:58 GenZai joined #git
14:58 jknetl joined #git
15:00 afuentes joined #git
15:02 e14 joined #git
15:03 red82 joined #git
15:03 anuxivm joined #git
15:05 pouet joined #git
15:07 howdoi joined #git
15:11 SnichOne joined #git
15:11 hahuang61 joined #git
15:15 m1dnight- joined #git
15:16 m1dnight` joined #git
15:17 m1dnight_ joined #git
15:19 imacinto joined #git
15:21 SnichOne joined #git
15:21 chrisshattuck joined #git
15:27 iLembus joined #git
15:37 kulelu88 joined #git
15:40 ManiacTwister joined #git
15:40 guilherme joined #git
15:40 PasiFist joined #git
15:40 imacinto joined #git
15:40 imacinto joined #git
15:43 dzho oh, gone
15:47 spriz joined #git
15:48 imacinto joined #git
15:49 al-damiri joined #git
15:49 Acais joined #git
15:54 mfilippov joined #git
15:55 simonlinj joined #git
15:56 ManiacTwister joined #git
16:00 e14 joined #git
16:00 utrack joined #git
16:02 iLembus joined #git
16:05 pouet joined #git
16:05 mfilippov left #git
16:11 relipse joined #git
16:12 mfilippov joined #git
16:12 kulelu88 joined #git
16:15 howitdo joined #git
16:15 howitdo joined #git
16:17 imacinto joined #git
16:21 diogenese joined #git
16:23 mfilippo1 joined #git
16:23 diogenese joined #git
16:23 chrisshattuck joined #git
16:23 andlabs joined #git
16:26 ayjay_t joined #git
16:29 t0by joined #git
16:29 diogenese joined #git
16:29 SwiftMatt joined #git
16:30 ProbabilityMoon joined #git
16:32 pouet joined #git
16:32 ahmedelgabri joined #git
16:35 ShekharReddy joined #git
16:37 pouet joined #git
16:38 mohabaks joined #git
16:40 dprophit joined #git
16:40 Noldorin joined #git
16:40 dprophit left #git
16:41 texasmynsted joined #git
16:42 romerocesar joined #git
16:45 diogenese joined #git
16:47 duderonomy joined #git
16:48 kaczsynski joined #git
16:50 Jellyg00se joined #git
16:51 eivarv joined #git
16:51 heroux_ joined #git
16:52 prawnzy joined #git
16:52 romerocesar joined #git
16:52 MattMaker joined #git
16:52 stux|away joined #git
16:52 pouet joined #git
16:53 Gitzilla joined #git
16:54 imacinto joined #git
16:56 howitdo joined #git
16:57 zeroed joined #git
17:00 _nwkj86 joined #git
17:00 navidr joined #git
17:02 chrisshattuck joined #git
17:03 howitdo joined #git
17:04 overlord_tm joined #git
17:04 ahmedelgabri joined #git
17:04 al-damiri hi #git, i need to do a git diff on a repo that has a directory "node_modules" folder committed in the source. how can i do the diff b/w two branches while ignoring everything under the directory "node_modules" ?
17:05 chrissha_ joined #git
17:06 ringer1 joined #git
17:07 mehola joined #git
17:08 canton7 al-damiri, http://stackoverflow.com/questions/438​0945/exclude-a-directory-from-git-diff looks promising
17:08 chrisshattuck joined #git
17:08 heroux joined #git
17:09 vuoto joined #git
17:10 ringer1 What paritular learning resource(s) would you recommend to a programmer from the last millenium who just woke up from hibernation, & heard of this thing called "git" -- not an idiot but almost totally ignorant
17:10 al-damiri canton7: i tried this: `git diff old_api..master -- . ':!node_modules'` but it still diffs the directories inside node_modules.
17:11 al-damiri e.g.: diff --git a/auth/node_modules/bhttp/README.md b/auth/node_modules/bhttp/README.md
17:12 hahuang61 joined #git
17:15 stux|RC-only joined #git
17:16 Didac joined #git
17:18 canton7 ringer1, !book, !bottomup, others listed
17:18 gitinfo ringer1: 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
17:18 gitinfo ringer1: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/​pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
17:18 heroux joined #git
17:19 shmuli joined #git
17:19 cagedwisdom joined #git
17:20 kingpinlz_ joined #git
17:22 elijahss joined #git
17:25 finalbeta joined #git
17:25 imacinto joined #git
17:28 rahtgaz joined #git
17:28 ekinmur joined #git
17:30 d0nn1e joined #git
17:31 dreiss joined #git
17:32 joko joined #git
17:33 joko Hello, is it possible to sync every branch in two remote repositories automatically?
17:33 thiago yes, so long as "automatically" means "using a script that you wrote that gets run somehow"
17:35 markelite joined #git
17:35 simonlinj joined #git
17:35 n_alone joined #git
17:35 joko thiago: suppose I have a fork repository of an official one and I would like to push any new branches or prunings from the original to the fork one
17:36 shmuli joined #git
17:39 nikivi joined #git
17:39 Slush- joined #git
17:40 moestevens joined #git
17:46 imacinto joined #git
17:49 re1 joined #git
17:53 dsdeiz joined #git
17:53 BlueProtoman joined #git
17:53 imacinto joined #git
17:53 imacinto joined #git
17:53 jknetl joined #git
17:54 elastix joined #git
17:54 BlueProtoman How can I checkout a git repo with files whose names differ only in capitalization on a case-insensitive file-system (in my case, HFS on macOS)?
17:55 raijin joined #git
17:55 lexac1 joined #git
17:56 a3pq51 joined #git
17:56 multi_io joined #git
17:58 rewt BlueProtoman, you have to fix the repo on a case-sensitive system to not have different files with filenames that differ only in case
17:58 zeroed joined #git
17:59 SteffanW joined #git
17:59 thierryp_ joined #git
17:59 chrisshattuck joined #git
18:01 ringer1 gitinfo,  thx, Pro Git is on my list now, anything quick start (I am already learning 4-5 major technolgies and need enough Git to git by a few weeks)
18:01 gitinfo ringer1: you're welcome, but please note that I'm a bot. I'm not programmed to care.
18:01 ringer1 I'll get the pdf bottom up too -- thx gitinfo
18:01 gitinfo ringer1: you're welcome, but please note that I'm a bot. I'm not programmed to care.
18:02 ringer1 thx canton7
18:02 ringer1 gitinfo, you can be healed
18:02 lacrymology joined #git
18:05 gitinfo No, I'm forever a meaningless bot
18:06 moestevens joined #git
18:09 jsolano joined #git
18:10 tgunr joined #git
18:10 Goplat joined #git
18:11 shmuli joined #git
18:13 tgunr wow, what a crowd, someone might explain why I am getting the same few files constantly being reported as modified. At first I just thought I had missed some commit, so I checked them in. Still reported as modified. So I decided I didn't really need them so issued a `git rm --cached file' and committed the delete, still being reported as modified
18:14 msonntag joined #git
18:14 tgunr How do I get rid of these pesky files?
18:15 SteffanW joined #git
18:16 thiago tgunr: are you on Windows?
18:16 tgunr And no, it is not line endings
18:16 tgunr Linux
18:16 thiago git diff reports no changes?
18:17 tgunr yes, git diff shows changes
18:17 BlueProtoman left #git
18:17 wuffinger joined #git
18:18 thiago tgunr: then there are changes
18:18 thiago git checkout -- filename  to drop the changes
18:18 tombruijn joined #git
18:18 tgunr even after multiple git commits
18:18 mozzarella joined #git
18:19 tgunr bingo
18:19 tgunr error: unable to unlink old 'pve/.clusterlog' (Permission denied)
18:20 tgunr dang, can't rm the file
18:21 tgunr er symlink in this case
18:22 elastix joined #git
18:28 BlueProtoman joined #git
18:30 snthsnth joined #git
18:32 madebymarkca joined #git
18:32 shmuli joined #git
18:32 rbern joined #git
18:35 aard_ joined #git
18:36 chrisshattuck joined #git
18:39 roxlu_ joined #git
18:39 holgersson joined #git
18:41 cyan__ joined #git
18:43 simonlinj joined #git
18:43 mizu_no_oto joined #git
18:43 pikajude joined #git
18:43 pikajude joined #git
18:44 red82 joined #git
18:46 shtrb joined #git
18:46 watabou joined #git
18:47 shtrb what is git svn's eqivalent for DeflateCompressionLevel setting in svn ? (I'm getting a problem in doing git svn rebase and the workaround is to set that value to the middle (5) )
18:47 Didac joined #git
18:49 ShekharReddy joined #git
18:51 j416 shtrb: what is the problem?
18:51 shtrb disconnection by peer (~7000 files in a single commit)
18:52 shtrb using gits-svn against cloudforge
18:52 j416 that's.. a ton of files
18:52 shtrb yes
18:53 prawnzy joined #git
18:53 shtrb I did a commit (using git-svn) it seems to be registered on the server  but it failed mid work because of disconnection - now when I try to do git svn rebase ... I'm screwd
18:54 shtrb all because of dir rename ....
18:55 j416 shtrb: is it your commit?
18:55 j416 ah
18:55 j416 you're doing it the wrong way
18:55 shtrb yes
18:55 j416 I fell in that trap once
18:55 shtrb I did git mv
18:55 shtrb what should have I done ?
18:55 j416 I forget the details, but you can do it in a way that makes it register as a svn rename
18:55 shtrb git mv + git svn dcommit
18:55 j416 let's see if I can find details hm
18:55 shtrb svn rename = svn delete + copy as far as I remember
18:56 j416 for git yes
18:56 j416 er
18:56 j416 no, svn tracks renames
18:56 j416 afaik
18:56 shtrb perhaps I'm wrong  but I was sure it's just copy+delete
18:57 thiago split it into smaller commits
18:57 shtrb bloody hell you are correct , svn move should have worked (the question is why git mv didn't register as git svn move )
18:57 j416 shtrb: ah, I was mistaken, now I see what I did
18:58 jstein_ joined #git
18:58 j416 shtrb: maybe it helps you, anyway: if you have a dir with a ton of files, deleting all those files but not the directory makes git-svn take eons. If you delete the directory as well, it finishes in no-time, because all it does is send a delete file command
18:59 j416 I don't remember the details, perhaps it was that I deleted all files but one or so, and that triggered it
18:59 j416 the key was to work on directory basis, not on individual files
18:59 shtrb back to my issue using msysgit 2.10.0.windows.1 error in mingw64/shar/perl5/site_perl/Git/SVN/ra.pm line 312
18:59 j416 perhaps that is what you did
18:59 shtrb too late for me :-(
19:00 j416 should've made sure it registered as an svn rename, it would have been almost instantaneous. ./
19:00 j416 :/
19:00 j416 can you not redo it?
19:01 shtrb what I did was to move full dir , the dcommit was able to push most of it (acording to the docs at least svn 1.7 will still do A+D in that case )
19:01 stonercoder joined #git
19:01 j416 (sure it's registered on the server?)
19:01 shtrb my problem is to do git svn rebase or something to be able to be on the same line as the repository
19:01 shtrb yes
19:01 shtrb checked on it
19:01 shtrb and did svn update (actuall svn  ) from a different machine
19:02 shtrb tried also doing fetch
19:02 j416 you could perhaps temporarily move the repo to a local place
19:02 shtrb with no success
19:02 j416 to avoid network error
19:02 j416 i.e. make a copy of the server repo and use that with the same url via hosts magic, or so
19:02 j416 (not sure if it has to be the same url for the commit magic to work, I forget)
19:03 shtrb this will take few days for me (over few gbs of svn)
19:03 shtrb you mean to checkout and then rewirte the locations correct ?
19:03 j416 like, make the server local
19:03 j416 remove the network
19:04 j416 in whichever way you prefer to do that
19:04 shtrb I got that , few GB of data ... will take me ages with svn admin
19:04 j416 it's a shot in the dark though; don't know if it'd improve things
19:04 j416 svn admin?
19:04 j416 you could just copy the files
19:04 shtrb moment perahsp I didn't catch your idea
19:05 shtrb I thought you mean to copy the server data (my "remote")
19:05 j416 move whatever is on the server, to a local place, make sure that the local place works with the same url
19:05 rubie joined #git
19:05 j416 s/move/copy/
19:05 j416 when the heavy commit has been downloaded, delete the local copy and proceed with using the remote
19:05 j416 maybe.
19:06 shtrb I see , I think getting stuff from a server (copy) to a local instance is not feasable option (I'm not the only git-svn client)
19:06 j416 ok
19:06 shtrb back to the question is there something like the deflate compresion enable ?
19:07 shtrb I think svn works by getting the deltas gzips so that is why it can get the data and only unzip locally
19:07 Acais joined #git
19:07 stamina joined #git
19:13 hahuang61 joined #git
19:15 fling joined #git
19:15 fling joined #git
19:17 Darcidride joined #git
19:22 rubie joined #git
19:23 runlevl4 joined #git
19:23 filcab joined #git
19:25 cdg joined #git
19:25 daynaskully joined #git
19:25 jfran joined #git
19:26 al-damiri hi #git, i need to do a git diff on a repo that has a directory "node_modules" folder committed in the source. how can i do the diff b/w two branches while ignoring everything under the directory "node_modules" ?
19:26 al-damiri i tried this: `git diff old_api..master -- . ':!node_modules'` but it still diffs the directories inside node_modules.
19:27 thiago I think it needs to have * at the end
19:27 j416 why'd they commit node_modules :/
19:27 moritz al-damiri: git ls-files|grep -v node_modules | xargs git diff old_api..master -- # but that limits it to files present in HEAD
19:27 j416 you ought to filter-branch that away
19:27 j416 if possible
19:28 j416 oh, maybe it's a vendoring thing. still quite a huge thing to commit though. :D
19:28 jungsubk joined #git
19:28 _ADN_ joined #git
19:28 al-damiri j416: yes it was a mistake. they're aren't being committed anymore and doesn't exist in the latest code. though i need to compare to older commits.
19:28 chrisshattuck joined #git
19:29 j416 al-damiri: I suppose that means you've gone so far that altering history to remove it is no longer a viable option? :/
19:29 al-damiri j416: yup. already pushed to a remote repo so cannot force overwrite.
19:29 j416 I remember rm -rf'ing that folder used to take eons
19:30 al-damiri moritz: :( xargs not available in windows i believe?
19:30 j416 al-damiri: well pushing itself doesn't prohibit changing history. But I suppose, perhaps someone would get confused by it. Oh well.
19:30 al-damiri even though the git windows installer comes with mingw.
19:30 shtrb gnuwin or git bash should have them
19:30 al-damiri i get this: xargs: git: No such file or directory
19:30 al-damiri shtrb: let me try
19:31 shtrb I have them over git bash
19:31 shtrb *it
19:33 al-damiri moritz: seems like it's working : )
19:34 al-damiri moritz: a question, i found the same command but the grep was slightly different, it had this instead: `grep -v '^node_modules/'`
19:34 al-damiri and it was not working. is it because of the "^"?
19:34 al-damiri i.e. -v and "^" cancel each other out?
19:35 shtrb ^ on windows have a special meaning
19:35 al-damiri shtrb: ah yes.
19:35 pioiytr joined #git
19:35 al-damiri i think it's for new line?
19:35 shtrb it's escape character
19:35 al-damiri shtrb: got it. thanks.
19:35 shtrb no , to escape (in cmd.exe)
19:35 shtrb np
19:38 * shtrb thinks he broke his system with that git mv
19:39 shtrb tried to hack around with git svn fetch -rXXX:YYYY (in a checkedoud dir to skip the huge commit and it seem to check the entire repository)
19:41 MattMaker joined #git
19:42 chrisshattuck joined #git
19:50 afuentes joined #git
19:52 L-11 joined #git
19:54 stonercoder joined #git
19:55 stamina joined #git
19:55 mfilippov joined #git
19:58 dwt joined #git
19:58 JamesBaxter joined #git
20:00 psacrifice joined #git
20:01 mfilippov joined #git
20:01 chrisshattuck joined #git
20:02 ksefchik joined #git
20:04 sonikspin joined #git
20:05 MattMaker joined #git
20:06 Impaloo joined #git
20:10 vuoto joined #git
20:12 Hobbyboy joined #git
20:13 zivester joined #git
20:15 _ADN_ joined #git
20:15 blahdodo joined #git
20:17 Fleuv joined #git
20:17 Fleuv Hi, why is git still asking for a password while my ssh config is properly configured and working fine with ssh
20:19 hellyeah i have same problem
20:19 KnownSyntax joined #git
20:20 qws-user-1228 joined #git
20:21 mangolisk joined #git
20:22 chris2 check you use git over ssh, and check you use the same hostname
20:22 Fleuv how to do the first?
20:22 chris2 git remote -v
20:22 chris2 should say git://
20:22 chris2 and not https:// or something
20:23 chris2 and there you see the hostname too
20:23 lidow joined #git
20:24 shmuli joined #git
20:25 ShekharReddy joined #git
20:25 MattMaker joined #git
20:26 mizu_no_oto joined #git
20:28 AnarchyAo joined #git
20:28 e14 joined #git
20:31 paws_ joined #git
20:31 skylite_ joined #git
20:35 finalbeta joined #git
20:36 murph joined #git
20:37 shtrb left #git
20:38 PresidentBiscuit joined #git
20:39 bmahe joined #git
20:40 mehola joined #git
20:41 skinux joined #git
20:41 skinux How do I tell local Git to use the other branch?
20:41 skinux I mean...I need to switch local Git to master branch
20:41 osse git checkout master
20:41 chrisshattuck joined #git
20:41 skinux I did that and it says I'm up-to-date with master
20:42 osse sounds good
20:42 skinux Wait, do I need to do another command to make it use the master for GitHub as well?
20:42 osse probably git pull
20:42 skinux That'll pull what is there to my local files, won't it?
20:43 skinux I want to push to GitHub master branch, right now it's pushing to 0.80 on GitHub
20:43 osse yes
20:43 ToBeCloud joined #git
20:45 osse i don't understand what you want
20:45 red82 joined #git
20:46 Gurkenglas joined #git
20:47 preaction_ joined #git
20:47 skinux Right now, if I do git push, it pushes to 0.80 branch of my repo. I WANT it to push to master branch
20:47 psacrifice joined #git
20:47 osse skinux: git branch --set-upstream-to origin/master
20:48 drizztbsd joined #git
20:54 prawnzy joined #git
20:54 Chunk2 joined #git
20:54 Hobbyboy joined #git
20:55 greendo joined #git
20:56 MattMaker joined #git
20:57 aswen joined #git
20:57 preaction joined #git
20:59 Klumben joined #git
21:01 imacinto joined #git
21:04 skinux How do I pull everything from local git repo? I pulled from GitHub as Git said I had to, but that over-wrote some changes.
21:05 mizu_no_oto joined #git
21:06 Corosus joined #git
21:08 imacinto joined #git
21:08 imacinto joined #git
21:08 dreiss joined #git
21:12 mizu_no_oto joined #git
21:12 KnownSyntax joined #git
21:12 KnownSyntax joined #git
21:14 hahuang61 joined #git
21:16 snthsnth joined #git
21:16 spudowiar joined #git
21:20 Danilaw joined #git
21:21 Danilaw left #git
21:23 ayjay_t joined #git
21:26 tyreld joined #git
21:26 clemf joined #git
21:30 mmlb joined #git
21:34 dhk joined #git
21:39 whitby joined #git
21:41 aidalgol joined #git
21:41 eihabarabia joined #git
21:41 Corosus joined #git
21:41 chrisshattuck joined #git
21:42 dhk left #git
21:43 thierryp joined #git
21:43 nikivi joined #git
21:44 nsh joined #git
21:46 clemf joined #git
21:48 clemf joined #git
21:49 cagmz joined #git
21:50 clemf joined #git
21:51 kadoban joined #git
21:53 shmuli joined #git
21:54 clemf joined #git
21:54 utanapischti joined #git
21:56 imacinto joined #git
21:56 imacinto joined #git
21:56 dreiss joined #git
21:56 clemf joined #git
21:57 larrybolt joined #git
22:04 clemf joined #git
22:07 Vgr joined #git
22:07 Ryanar joined #git
22:09 clemf joined #git
22:10 Impaloo joined #git
22:14 clemf joined #git
22:15 Lyqyd joined #git
22:16 a3Dman_ joined #git
22:17 mrpackethead joined #git
22:18 sdothum joined #git
22:18 shtrb joined #git
22:19 shtrb muahaha fixed it (I'm so happy)
22:19 darkbit joined #git
22:19 shtrb had to downgrade to git 1.8.2 (windows)
22:20 cagedwisdom joined #git
22:20 shtrb thanks j416 ^ was my solution (I would still like to know if there is a git svn equvalent to the deflate mode )
22:20 SM_ joined #git
22:22 clemf joined #git
22:23 anuxivm joined #git
22:24 clemf joined #git
22:27 anuxivm left #git
22:28 anuxivm joined #git
22:28 shtrb does git client support deflate out of the box (I'm thinkning about filing a bug about it)
22:28 romerocesar joined #git
22:29 mizu_no_oto joined #git
22:29 clemf joined #git
22:30 romerocesar joined #git
22:32 netj joined #git
22:35 larrybolt joined #git
22:36 ekinmur joined #git
22:42 Guest42023 joined #git
22:46 j416 downgrade.. I wonder why that worked. huh.
22:46 * j416 zzZ
22:46 romerocesar_ joined #git
22:47 clemf joined #git
22:48 raijin joined #git
22:48 PabloR joined #git
22:49 Gfurst joined #git
22:49 clemf joined #git
22:49 PabloR Assuming I `git commit`my project but don’t push it to github or any similar site, and by mistake I delete the whole project folder from my computer, do I still have access to it somehow? Do I save the files by committing the project somewhere or just a reference no longer accessible if the main folder is deleted?
22:50 Impaloo joined #git
22:51 snthsnth joined #git
22:52 clemf joined #git
22:54 NwS joined #git
22:54 elementalest joined #git
22:54 elementalest joined #git
22:56 rishi joined #git
22:57 clemf joined #git
22:58 osse PabloR: the only place files are stored (except for the actual files themselves) are in .git
22:59 ndun4 joined #git
23:00 PabloR osse does it mean that if I delete by mistake the whole project folder I no longer have access to it even if I committed it in git then?
23:00 clemf joined #git
23:00 osse PabloR: depends on whether .git is inside or outside
23:00 osse by default: yes
23:01 MrWoohoo joined #git
23:03 PabloR osse But .git is normally within the project folder, correct? Unless you make a copy somewhere else?
23:03 clemf joined #git
23:03 PabloR And even if you make a copy of .git somewhere else, you still can't access the original files then?
23:05 clemf joined #git
23:06 PabloR osse Bottom line: unless I made a copy of the project folder (in my own computer or outside disk) or pushed to github (or similar) I definitely lost the files. Correct?
23:07 rbern joined #git
23:08 romerocesar joined #git
23:08 osse PabloR: You can restore everything except uncommitted changes/files even if you only have .git
23:09 osse Yes, .git is normally inside
23:09 shinnya joined #git
23:09 ksefchik joined #git
23:09 PabloR osse. Ah ok, I didn't know you still can get your files back from .git only.
23:10 osse That's where they come from when you use checkout/reset etc
23:11 larrybolt joined #git
23:11 osse Android remote repos consist of only that dir, essentially
23:11 DolpheenDream joined #git
23:12 elastix joined #git
23:13 clemf joined #git
23:13 PabloR ok, I didn't understand when I read something like somehow git only saved references but not complete files. Thanks
23:13 mellernoia joined #git
23:14 hahuang61 joined #git
23:15 mycyber joined #git
23:16 dsantiago joined #git
23:17 mablae_ joined #git
23:17 daynaskully joined #git
23:18 t-mart joined #git
23:19 Ryanar joined #git
23:19 lebster i branched off of develop into feature1,,, then before i merged into develop rebased my feature1 branch. I need to add more stuff, can i do it on feature1 and rebase it again before i merge itno develop again? or do i need to delete it and branch off
23:20 _Patrick_ joined #git
23:21 clemf joined #git
23:23 relipse joined #git
23:25 madebymarkca joined #git
23:25 clemf joined #git
23:25 r4z joined #git
23:27 Vampire0 lebster, that is effectively what rebase does. It takes the new base commit (branch point) and applies the commits from your branch one after the other onto it
23:27 mehola joined #git
23:27 Vampire0 lebster, so yes, you can use rebase
23:30 PabloR osse can the .git file be forced to live outside the project folder somehow or the only way is by copying it manually?
23:30 clemf joined #git
23:32 PabloR Or even better, be saved in 2 places simultaneously, within and outside the project?
23:33 lebster Vampire0:  ok ty. I have another question. i read that after i rebase im not suppose to merge into develop.. i read it says im supposed to push into develop. do you know what that means? lol and is it really bad that im merging after rebasing?
23:38 Gurkenglas joined #git
23:38 clemf joined #git
23:40 Vampire0 lebster, well, that is more like non-sense
23:41 Vampire0 lebster, or rather the effect will be the same
23:41 unreal_ joined #git
23:42 Vampire0 lebster, if you say "git push feat1 to remote develop" and feat1 is a fast-forward to develop (e. g. directly after rebase and no new commits on develop), then it is exactly the same as doing a fast-forward (this is the default if possible) merge of feat1 into develop and then pushing develop to remote develop
23:43 Vampire0 lebster, but any way you also want those changes in your local develop branch, so you save nothing
23:43 Vampire0 Either you merge feat1 into develop and push develop, or you push feat1 to remote develop and then pull develop
23:43 lebster ic
23:43 lebster i usually do git ckechout develop ; git merge feat1 --no-ff
23:44 lebster well actually
23:44 lebster i do
23:44 lebster git checkout develop; git pull ; git checkout feat1 ; git rebase develop; git checkout develop; git merge feat1 --no-ff
23:45 greendo joined #git
23:48 Gurkenglas joined #git
23:48 romerocesar joined #git
23:50 ResidentBiscuit joined #git
23:50 clemf joined #git
23:54 boombatower joined #git
23:58 boombatower joined #git
23:59 shirty joined #git

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