Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-23

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

All times shown according to UTC.

Time Nick Message
00:00 tristanp joined #git
00:01 shakalaka joined #git
00:02 NeverDie joined #git
00:02 ki0 joined #git
00:03 xall__ joined #git
00:05 yohnnyjoe joined #git
00:07 geko joined #git
00:08 bauruine joined #git
00:09 Xandaros joined #git
00:11 tristanp joined #git
00:11 bauruine joined #git
00:16 alex1a_ joined #git
00:18 Pulp joined #git
00:21 mizu_no_oto joined #git
00:21 romerocesar joined #git
00:25 mizu_no_oto joined #git
00:27 moestevens joined #git
00:27 SebastianFlyte joined #git
00:30 tristanp joined #git
00:33 Ryanar joined #git
00:37 SwiftMatt joined #git
00:39 bauruine joined #git
00:39 pijiu joined #git
00:40 svm_invictvs joined #git
00:40 Wennz joined #git
00:40 fuchstronaut joined #git
00:41 tristanp joined #git
00:42 romerocesar joined #git
00:43 tristanp joined #git
00:44 floatingman_1 joined #git
00:45 mizu_no_oto joined #git
00:47 realz joined #git
00:50 dan2k3k4 joined #git
00:50 NeverDie joined #git
00:51 dreiss joined #git
00:52 tristanp joined #git
00:52 fstd_ joined #git
00:53 tristanp left #git
00:53 fahadash joined #git
00:53 Rr4sT joined #git
00:55 dpower joined #git
00:55 moop joined #git
01:02 corsibu joined #git
01:04 tristanp joined #git
01:04 Lor_ joined #git
01:05 shakalaka joined #git
01:07 jnewt joined #git
01:09 jnewt how can i pattern match with git rm  (ie git rm *.c)  that just says it doesn't match (because i removed them from the filesystem)
01:09 d^sh joined #git
01:10 jnewt or even tab completion for git rm.
01:10 bremner quote "*.c"
01:11 jnewt bremner: thank you.
01:11 tristanp joined #git
01:12 bremner welcome. It's a pretty generic trick, should work for most git commands (and some other unixy commands like find)
01:15 NeXTSUN joined #git
01:15 thiago more to the point: it usually has nothing to do with git
01:15 thiago if your zsh is configured to reject no-matche-expansions, then you have to quote
01:16 mizu_no_oto joined #git
01:17 menip joined #git
01:19 SwiftMatt joined #git
01:21 cyphase joined #git
01:21 finalbeta joined #git
01:22 tristanp joined #git
01:22 Rodya_ joined #git
01:32 Dougie187 joined #git
01:34 realz joined #git
01:34 aikuma joined #git
01:35 mrpackethead joined #git
01:35 snowkidind joined #git
01:36 mkoskar joined #git
01:38 rooftopjoe joined #git
01:39 rooftopjoe hi. i'm working on a little game and i'd like separate repositories for the engine (which i want to release as open source) and the game (which consists of assets, scripts, and other data files). what is the common approach for the latter---to include the engine in the repository or to tell people to get it separately?
01:39 rooftopjoe i've seen people bundle 3rd party libraries in their repositories (and keep them in sync, presumably).
01:39 tristanp joined #git
01:42 e14 joined #git
01:46 romerocesar joined #git
01:46 EisNerd_ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | 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-bisect: No, not like that. Grow up.
01:51 free_speech joined #git
01:51 free_speech joined #git
01:51 free_speech joined #git
01:51 bulletmark joined #git
01:54 Dohplay joined #git
01:56 free_speech joined #git
01:56 cdown_ joined #git
01:56 pks joined #git
01:58 jeffreylevesque joined #git
02:01 sunri5e joined #git
02:03 corsibu joined #git
02:04 Bloomer joined #git
02:05 romerocesar joined #git
02:06 yohnnyjoe joined #git
02:07 mizu_no_oto joined #git
02:11 sdothum joined #git
02:11 ekinmur joined #git
02:20 mizu_no_oto joined #git
02:21 brokensyntax joined #git
02:24 xameada_ joined #git
02:24 xall__ joined #git
02:26 romerocesar joined #git
02:26 hexagoxel joined #git
02:27 Rodya_ joined #git
02:29 ki0 joined #git
02:32 mkoskar joined #git
02:34 Thorn joined #git
02:34 Thorn joined #git
02:39 Bloomer joined #git
02:40 CEnnis91 joined #git
02:41 menip joined #git
02:41 e14 joined #git
02:42 fuchstronaut joined #git
02:44 lb1c joined #git
02:45 CEnnis91 joined #git
02:46 lagothri1 joined #git
02:46 chachasmooth joined #git
02:47 romerocesar joined #git
02:50 dreiss joined #git
02:51 mizu_no_oto joined #git
02:55 Dougie187 left #git
02:55 CEnnis91 joined #git
02:57 EisNerd joined #git
03:08 romerocesar joined #git
03:08 Electrom_ joined #git
03:11 e14 joined #git
03:11 Prawnzy joined #git
03:12 shaggycat joined #git
03:14 Vortex35 joined #git
03:15 littleforest joined #git
03:21 SwiftMatt joined #git
03:22 Ben^ joined #git
03:22 Ben^ Hey
03:22 gitinfo Ben^: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
03:23 HedgeMage I'm a git...it's debatable whether I'm helpful or not.
03:23 Ben^ Is there a way to set the currently checked out commit to a later ref?
03:24 Ben^ I want git to think I should be on a later commit than I am, so I can selectively 'revert' individual files to the later commit
03:26 HedgeMage I'm sorry, but I utterly failed to parse your question...could you try running that by me again, perhaps focusing on your ultimate goal...it may be an XY problem.
03:26 HedgeMage !xy
03:26 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
03:26 Bombe joined #git
03:27 Ben^ I have an application installed on one machine, which has had changes (and commits) since it's original install.
03:28 Ben^ I want to set up a test environment on another machine, so I have installed that application on the second machine.
03:29 Ben^ I have then transferred the .git directory to the new machine. Now doing a COMMIT shows me what differences there are between the fresh install and what was committed to GIT on the production machine. I can selectively 'revert' files that SHOULD be included in the test environment (some should not, as the installation sets up some machine specific files)
03:29 Ben^ That all works nicely.
03:30 Ben^ But now I have made additional commits on the production machine, and done a remote-update on the test one. So far so good, except that to do what I did the first time; I would have to do a pull, which I don't want to do as it will try to merge, or ask me commit
03:30 Ben^ I just want to move the pointer of the current index to HEAD on the remote branch
03:30 Ben^ I know its a weird use case
03:30 HedgeMage you can fetch without merging
03:30 ki0 joined #git
03:31 HedgeMage then learn about git cherry-pick and try to make better use of separate branches so that you  don't cause yourself so much confusion
03:31 Ben^ I can delete and re-copy the entire .git from pdn - but that's a bit heavy handed
03:31 HedgeMage 'git fetch' will pull what you want without attempting to merge
03:32 xall__ joined #git
03:33 Ben^ fetch will download the tracked remote repo
03:33 Ben^ But the local branch will still be one commit behind. I want to force it to think it's on head
03:33 thiago git reset
03:34 Ben^ thanks thiago
03:35 Prawnzy joined #git
03:37 Ben^ ahh yes, a git reset --mixed is what I want. thanks
03:40 xall_ joined #git
03:41 HedgeMage ahh, thanks for jumping in, thiago, I was missing his intent
03:42 cagmz joined #git
03:46 pijiu joined #git
03:50 cdown joined #git
03:56 sssilver joined #git
04:05 svm_invictvs joined #git
04:07 Fissure joined #git
04:10 Limes_ joined #git
04:22 romerocesar joined #git
04:31 ki0 joined #git
04:31 sssilver joined #git
04:33 Cabanossi joined #git
04:34 solrize joined #git
04:34 solrize joined #git
04:35 tristanp joined #git
04:38 sssilver joined #git
04:42 daey_ joined #git
04:43 fuchstronaut joined #git
04:45 nikhita joined #git
04:46 skobes joined #git
04:47 languitar joined #git
04:52 cyphase joined #git
04:54 joki joined #git
04:55 romerocesar joined #git
05:01 Ayush joined #git
05:03 gtristan joined #git
05:06 inflames joined #git
05:06 gigq joined #git
05:13 umpc joined #git
05:13 Bloomer joined #git
05:16 romerocesar joined #git
05:24 aidalgol- joined #git
05:25 netj joined #git
05:28 BinaryBench joined #git
05:31 GT4066 joined #git
05:32 ki0 joined #git
05:37 romerocesar joined #git
05:42 netj joined #git
05:44 fuchstronaut joined #git
05:45 xall_ joined #git
05:46 emPi joined #git
05:48 arescorpio joined #git
05:50 gesker joined #git
05:51 diogenese joined #git
05:52 jnewt_ joined #git
05:55 phaleth joined #git
06:00 dermoth joined #git
06:04 gesker_ joined #git
06:06 emPi joined #git
06:09 bushidiux joined #git
06:10 finalbeta joined #git
06:10 wrouesnel2 joined #git
06:11 Guest65 joined #git
06:12 yqt joined #git
06:14 railssmith joined #git
06:14 romerocesar joined #git
06:15 Guest65 left #git
06:19 xall joined #git
06:19 subhojit777 joined #git
06:23 aidalgol joined #git
06:26 eivarv joined #git
06:28 star_prone joined #git
06:33 ki0 joined #git
06:34 sonvh joined #git
06:34 irqq joined #git
06:34 brokensyntax joined #git
06:35 d1b joined #git
06:35 monoxane joined #git
06:36 pwnz0r joined #git
06:38 sharkz- joined #git
06:38 twisted` joined #git
06:39 worstadmin joined #git
06:39 oncall-pokemon joined #git
06:41 finalbeta joined #git
06:45 fuchstronaut joined #git
06:48 mrmadcat joined #git
06:50 thott joined #git
06:55 watabou joined #git
06:56 oncall-pokemon joined #git
06:58 twisted` joined #git
06:58 bluezone joined #git
07:03 inflames joined #git
07:06 icedp joined #git
07:06 jknetl joined #git
07:12 chris2 joined #git
07:16 lordjancso joined #git
07:23 GenZai joined #git
07:25 overlord_tm joined #git
07:34 ki0 joined #git
07:34 pepijndevos joined #git
07:35 eivarv joined #git
07:35 MrWoohoo joined #git
07:35 pepijndevos How can I have modified files in a fresh checkout??? Git refuses to do anything because it'd "overwrite local changes" to a clean clone.
07:36 pepijndevos I tried nuking everything, checking out the files, disabling newline conversion... my filesystem is case sensitive. I'm out of iedas.
07:38 cyphase joined #git
07:40 pepijndevos Okay, SOMETHING on my machine really likes newline conversion...
07:41 pepijndevos I get warning: CRLF will be replaced by LF in pll.vhd. even after a  git config --global core.autocrlf false
07:42 ahmedelgabri joined #git
07:45 SteffanW joined #git
07:46 fuchstronaut joined #git
07:48 cagedwisdom joined #git
07:48 pepijndevos ... it was the gitattributes file.
07:49 xall joined #git
07:52 dodobrain joined #git
07:54 roentgen joined #git
07:56 aidalgol joined #git
07:57 danslo_ joined #git
07:58 umpc joined #git
07:58 mibr0 joined #git
08:01 ki0 joined #git
08:02 xall joined #git
08:05 romerocesar joined #git
08:07 star_prone joined #git
08:07 GenZai joined #git
08:07 heliomaster joined #git
08:07 heliomaster joined #git
08:08 yohnnyjoe joined #git
08:15 ki0 joined #git
08:17 OSryx joined #git
08:18 GenZai joined #git
08:19 dsdeiz joined #git
08:20 shaggycat joined #git
08:21 xall_ joined #git
08:21 OSryx joined #git
08:22 OSryx joined #git
08:22 Nikitaw99 joined #git
08:23 OSryx joined #git
08:24 jonirenicus joined #git
08:26 OSryx joined #git
08:27 romerocesar joined #git
08:27 TomyLobo joined #git
08:30 aidalgol joined #git
08:34 davimore joined #git
08:35 djb-irc joined #git
08:38 apotry joined #git
08:39 satifant joined #git
08:43 free_speech joined #git
08:46 fuchstronaut joined #git
08:47 dodobrain joined #git
08:47 romerocesar joined #git
08:48 shubhnik joined #git
08:48 mrpackethead joined #git
08:48 free_speech left #git
08:50 manuel joined #git
08:51 tittof joined #git
08:53 kimonorouge joined #git
08:53 Garen joined #git
08:54 tittof Hi, I'm using commit.template to get a default text for my commit messages but is there a way to further modify what git is using as text at the bottom of the commit message "after" the template?
08:54 eivarv joined #git
08:54 tittof the lines beginning with # where modified files are mentioned
08:57 satifant joined #git
08:59 rivarun joined #git
09:00 rivarun joined #git
09:03 mkoskar joined #git
09:05 djb-irc joined #git
09:06 sunri5e joined #git
09:08 mkoskar joined #git
09:08 romerocesar joined #git
09:09 GenZai joined #git
09:11 jozwior joined #git
09:12 titankiller joined #git
09:13 aidalgol joined #git
09:13 moei joined #git
09:15 introx joined #git
09:15 introx_ joined #git
09:17 yaewa joined #git
09:18 xall joined #git
09:19 ngladitz joined #git
09:19 ngladitz joined #git
09:24 corsibu joined #git
09:24 djb-irc joined #git
09:26 justanotheruser joined #git
09:26 eshlox joined #git
09:29 King_Hual joined #git
09:29 romerocesar joined #git
09:30 kazantip joined #git
09:30 OSryx left #git
09:31 ki0 joined #git
09:37 simenbrekken joined #git
09:38 bathtub_shark joined #git
09:38 GavinMagnus joined #git
09:38 netj joined #git
09:39 subhojit_ joined #git
09:43 solrize joined #git
09:43 solrize joined #git
09:44 sunri5e joined #git
09:47 rivarun joined #git
09:47 fuchstronaut joined #git
09:47 mikecmpbll joined #git
09:49 mkoskar joined #git
09:50 romerocesar joined #git
09:50 Shock_ joined #git
09:54 oskarkv joined #git
09:56 navidr joined #git
09:57 Murii joined #git
09:58 fuchstronaut joined #git
10:07 sunri5e joined #git
10:08 nd_ joined #git
10:09 Jameser joined #git
10:09 yohnnyjoe joined #git
10:11 romerocesar joined #git
10:15 xall_ joined #git
10:15 MeltedLux joined #git
10:18 moei joined #git
10:23 raphink joined #git
10:23 Balliad joined #git
10:25 drmt joined #git
10:25 afuentes joined #git
10:28 mrmadcat joined #git
10:28 robattil1 joined #git
10:31 tittof left #git
10:31 romerocesar joined #git
10:33 ams__ joined #git
10:34 ki0 joined #git
10:35 Darcidride joined #git
10:37 corsibu joined #git
10:41 jozwior joined #git
10:43 Nikitaw99 joined #git
10:45 LucaTM joined #git
10:46 shakalaka joined #git
10:49 xall joined #git
10:52 romerocesar joined #git
10:52 Darcidride joined #git
10:56 Macaveli joined #git
10:57 shakalaka joined #git
10:58 pokalyis joined #git
10:58 Jackneill_ joined #git
10:59 fuchstronaut joined #git
11:00 jknetl joined #git
11:01 Spec-Chum joined #git
11:02 Spec-Chum joined #git
11:04 xall_ joined #git
11:06 shakalaka joined #git
11:11 jost joined #git
11:11 mischat joined #git
11:12 mischat joined #git
11:13 romerocesar joined #git
11:14 robotroll joined #git
11:14 usm4n joined #git
11:19 pokalyis_ joined #git
11:20 eivarv joined #git
11:22 shinnya joined #git
11:25 jimi_ joined #git
11:25 jimi_ joined #git
11:29 ismithers joined #git
11:29 xall_ joined #git
11:34 romerocesar joined #git
11:35 ieee joined #git
11:35 sonvh joined #git
11:35 overlord_tm joined #git
11:37 nuck joined #git
11:40 vuoto joined #git
11:40 fees joined #git
11:41 jstein_ joined #git
11:42 raphink joined #git
11:42 raphink joined #git
11:44 kimonorouge joined #git
11:44 qis joined #git
11:45 qis Is there a way to ignore the executable bit on files on both, diffs and commits?
11:45 qis The new Windows 10 WSL shows all files as executable when viewing directories outside the WSL. (e.g. C:\ stuff)
11:46 osse qis: git config core.filemode false
11:49 Endarked joined #git
11:52 qis osse: Oh, I had to remove this setting, fix the permissions, commit and reenable the setting.
11:52 qis osse: Seems to work now. Thanks!
11:53 codfection joined #git
11:55 romerocesar joined #git
11:55 codfection joined #git
11:55 tjone270 joined #git
11:56 tjone270 joined #git
11:58 mikecmpbll joined #git
11:59 aliajder joined #git
11:59 converge joined #git
11:59 converge I did "git pull", but its missing some files from my repository. how can I have all my files in this cloned repository ?
12:00 GavinMagnus joined #git
12:00 fuchstronaut joined #git
12:00 qis hard reset and retry?
12:01 converge qis: just tried, and this file src/Controllers/AppController.php is still missing, but I can see it in the remote repository
12:02 qis perhaps you have a branch set?
12:03 converge yes, just found out that git pull doesnt restore deleted files
12:04 aliajder joined #git
12:04 aliajder left #git
12:04 grawity it treats them like any other uncommitted change
12:05 fahadash joined #git
12:09 titankiller joined #git
12:09 danslo_ joined #git
12:10 GenZai joined #git
12:10 yohnnyjoe joined #git
12:10 danslo_ joined #git
12:11 fahadash joined #git
12:15 romerocesar joined #git
12:16 kimonorouge joined #git
12:19 Macaveli joined #git
12:20 raijin joined #git
12:22 [Brain] joined #git
12:24 mrpackethead joined #git
12:27 emPi joined #git
12:28 anonymuse joined #git
12:28 Jameser joined #git
12:32 a3pq51 joined #git
12:33 rivarun joined #git
12:33 codfection joined #git
12:34 lohfu joined #git
12:37 cdown joined #git
12:38 Kulrak joined #git
12:38 Kulrak joined #git
12:44 CEnnis91 joined #git
12:52 ycon_ joined #git
12:53 ycon_ Hi all, I forgot to put a folder in my git ignore. I haven't pushed yet. I just did git add . & git commit
12:53 ycon_ how do I revert my last git add ?
12:53 hexa- git reset <file>
12:53 ycon_ hexa-: which <file>?
12:54 hexa- ah sorry, only read the last line
12:54 MeltedLux_ joined #git
12:54 sdothum joined #git
12:54 ycon_ I just ran "git reset" seems to have done it?
12:55 hexa- check git status
12:55 hexa- but since you've done a commit that shouldn't have done anything
12:55 irqq joined #git
12:55 hexa- you can rebase interactively, then remove, then amend
12:55 ycon_ hexa-: git reset won't touch my files though will it?
12:57 romerocesar joined #git
12:57 brk_ joined #git
12:57 eivarv joined #git
12:58 Faylite joined #git
12:58 ycon_ hexa-: fuck it added the folder I didn't want
12:58 osse ycon_: git rm --cached unwanteddir && git commit --amend
12:58 hexa- ycon_: fuck me as well x(
12:59 Learath2 joined #git
12:59 ycon_ yeah it pushed it. Whats a clean way I can resolve this?
12:59 ycon_ can I just delete the last hash commit? then just re-commit/push
13:00 brk_ joined #git
13:00 g105b joined #git
13:01 ycon_ it added my virtual env folder damit
13:01 fuchstronaut joined #git
13:01 buddyq joined #git
13:01 Rr4sT joined #git
13:02 osse ycon_: is there a chance anybody has pulled?
13:02 ycon_ osse: no chance at all
13:02 osse do what i said then push --force-with-lease
13:03 ycon_ osse: So first "git rm --cached unwanteddir && git commit --amend" then "git push --force-with-lease"?
13:03 osse indeed
13:04 emPi joined #git
13:05 brk_ joined #git
13:06 ycon_ ta
13:08 brk_ joined #git
13:14 blackwind_123 joined #git
13:17 g105b joined #git
13:17 e14 joined #git
13:17 GavinMagnus joined #git
13:18 romerocesar joined #git
13:20 bruce_lee joined #git
13:20 bruce_lee joined #git
13:21 emPi joined #git
13:25 ochorocho__ joined #git
13:26 emPi joined #git
13:26 Shentino joined #git
13:27 overlord_tm joined #git
13:28 Noldorin joined #git
13:30 Shentino joined #git
13:30 i7c joined #git
13:40 languitar joined #git
13:40 ycon_ osse: i'm using heroku
13:40 ycon_ which has its' own 'git'
13:40 ycon_ would that think it needs to upload that folder too?
13:40 skunkz joined #git
13:42 selckin git reset HEAD^ undos that last commit
13:42 kadoban joined #git
13:42 g105b joined #git
13:42 Ravana joined #git
13:43 ycon_ selckin: well i removed it from the normal git
13:43 ycon_ I just wonder if Heroku does its' own thing
13:45 selckin !github
13:45 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
13:45 selckin s/github/heroku/
13:47 nettoweb joined #git
13:48 blackwind_123 joined #git
13:49 SteffanW joined #git
13:49 subhojit777 joined #git
13:51 doener joined #git
13:51 xameada_ joined #git
13:52 sdothum joined #git
13:56 JyZyXEL joined #git
13:59 robotroll joined #git
14:01 fuchstronaut joined #git
14:02 alex1a_ joined #git
14:02 mizu_no_oto joined #git
14:02 sitaram joined #git
14:04 davimore joined #git
14:05 JyZyXEL joined #git
14:06 mellernoia joined #git
14:06 eihabarabia joined #git
14:06 subhojit_ joined #git
14:08 subhojit_ joined #git
14:08 subhojit_ joined #git
14:11 subhojit777 joined #git
14:12 mrpackethead joined #git
14:16 osse ycon_: if you fixed up the commit you first created so that the folder wasn't added in the first place
14:17 osse remove the "if". I mean that's what you did
14:17 osse I don't know how heroku works, but I assume it's not *that* stupid
14:18 ycon_ osse: thanks
14:19 Spacew00t joined #git
14:20 blackwind_123 joined #git
14:20 romerocesar joined #git
14:20 dendazen joined #git
14:21 Jameser joined #git
14:27 Ryanar joined #git
14:28 glebihan joined #git
14:30 Jameser joined #git
14:30 spinningarrow left #git
14:32 aapaaal joined #git
14:32 cdown joined #git
14:38 aapaaal joined #git
14:39 rogerraymond joined #git
14:40 jozwior joined #git
14:40 dan2k3k4 joined #git
14:40 GenZai joined #git
14:41 elementalest joined #git
14:41 elementalest joined #git
14:41 romerocesar joined #git
14:41 buzzLightBeer joined #git
14:47 NeXTSUN joined #git
14:50 subhojit_ joined #git
14:51 PioneerAxon joined #git
14:52 GavinMagnus left #git
14:55 Jameser joined #git
14:55 GenZai joined #git
14:56 Guest26 joined #git
15:01 Jameser joined #git
15:02 romerocesar joined #git
15:02 fuchstronaut joined #git
15:05 GavinMagnus joined #git
15:05 brokensyntax joined #git
15:08 GavinMagnus left #git
15:08 JamesBaxter joined #git
15:10 fuchstronaut joined #git
15:10 raijin joined #git
15:13 cdown_ joined #git
15:14 vuoto joined #git
15:15 rivarun joined #git
15:15 leprechau joined #git
15:15 acetakwas joined #git
15:15 grawity joined #git
15:15 fahadash joined #git
15:18 raijin joined #git
15:21 nosh joined #git
15:23 romerocesar joined #git
15:24 subhojit__ joined #git
15:25 mizu_no_oto joined #git
15:25 dreiss joined #git
15:25 ochorocho__ joined #git
15:27 JamesBaxter joined #git
15:29 serycjon joined #git
15:33 fahadash joined #git
15:39 QwertyDragon joined #git
15:39 kimonorouge joined #git
15:43 romerocesar joined #git
15:44 acetakwas joined #git
15:45 Tee_Pee joined #git
15:45 mellernoia joined #git
15:46 arand__ joined #git
15:46 davimore joined #git
15:47 InfoTest joined #git
15:47 mizu_no_oto joined #git
15:47 ochorocho__ joined #git
15:51 stnly joined #git
15:53 Ryanar joined #git
15:54 dsfreak93 joined #git
15:57 hariel joined #git
15:57 jozwior joined #git
16:00 mrpackethead joined #git
16:02 mischat joined #git
16:04 romerocesar joined #git
16:05 alhariel joined #git
16:05 andlabs joined #git
16:05 eivarv joined #git
16:05 andlabs Is there a way to git stash into a patch file that can be applied later if needed? If that makes any sense
16:06 andlabs or will simply git diff > xyz.diff suffice?
16:09 VladGh joined #git
16:12 CheckDavid joined #git
16:13 NeonSynth joined #git
16:15 cagmz joined #git
16:15 raphink joined #git
16:15 AfroThundr joined #git
16:15 osse andlabs: that will suffice
16:16 osse andlabs: well, depends a bit on whether you have staged changes or a combination
16:16 osse andlabs: git diff HEAD > file  to be sure
16:16 osse the idea is sound
16:16 AfroThundr joined #git
16:18 OnBrokenWings joined #git
16:19 tgies joined #git
16:20 sangy joined #git
16:20 vuoto joined #git
16:21 AfroThundr joined #git
16:24 pijiu joined #git
16:24 tgies joined #git
16:25 clandestino joined #git
16:25 kimonorouge joined #git
16:27 mischat joined #git
16:29 thott joined #git
16:30 Ikv joined #git
16:30 davimore_ joined #git
16:36 cagedwisdom joined #git
16:38 andlabs osse: okay, thanks
16:38 andlabs no staged changes; all that I modified were just a quick patch to get one platform to build while I don't have  a feature written for it
16:39 andlabs because it's going to take longer than expected and it's far too late to branch
16:39 sunri5e joined #git
16:40 larrybolt joined #git
16:40 osse andlabs: fi you have an existing stash you can  git diff stash~1 stash > file
16:41 andlabs hm
16:41 osse or stash@{1} or whatever is the correct one
16:41 andlabs good to know
16:41 osse andlabs: i on the other hand rather trust to keep track of my changes than myself. me: "what's this file? .. meh, delete it"
16:41 osse oops
16:42 osse I trust git i mean
16:42 nettoweb joined #git
16:42 andlabs yeah
16:42 andlabs my real issue is that I'm stupid and didn't develop this huge feature in a separate branch
16:42 andlabs so now I have it written for 2/3 of the target platforms but not the other one
16:45 nikivi joined #git
16:45 osse andlabs: make a new identical branch, use rebase -i to remove the unrelated commits
16:45 osse lots of possibilitiesa
16:45 zivester joined #git
16:46 danslo_ joined #git
16:46 led_belly joined #git
16:48 andlabs I'll keep that in mind for next time, thanks
16:48 BenderRodriguez joined #git
16:49 Guest25570 joined #git
16:49 emPi joined #git
16:51 tgies joined #git
16:52 sssilver joined #git
16:54 NeverDie joined #git
16:54 madewokherd joined #git
16:54 ayjay_t joined #git
16:56 tgies joined #git
16:59 shubhnik joined #git
17:00 DeltaHeavy joined #git
17:01 tgies joined #git
17:03 cso joined #git
17:04 drbean joined #git
17:04 e14 joined #git
17:06 tgies joined #git
17:06 romerocesar joined #git
17:11 tgies joined #git
17:11 e14_ joined #git
17:12 kimonorouge joined #git
17:13 tazle_ joined #git
17:13 Mikaela joined #git
17:16 tgies joined #git
17:17 larrybolt` joined #git
17:21 tgies joined #git
17:22 mischat joined #git
17:26 tgies joined #git
17:27 romerocesar joined #git
17:27 kimonorouge joined #git
17:28 johnny56 joined #git
17:28 codfection joined #git
17:30 star_prone joined #git
17:31 larrybolt` joined #git
17:31 tgies joined #git
17:31 finalbeta joined #git
17:31 raijin joined #git
17:31 dviola joined #git
17:35 qpdb joined #git
17:36 kier joined #git
17:37 Defcronyke joined #git
17:38 Defcronyke joined #git
17:41 aard_ joined #git
17:41 mischat joined #git
17:45 skunkz joined #git
17:46 tgies joined #git
17:46 paul424 joined #git
17:46 johnny56 joined #git
17:48 romerocesar joined #git
17:48 mischat joined #git
17:48 mrpackethead joined #git
17:50 nikivi joined #git
17:51 tgies joined #git
17:52 littlepython joined #git
17:52 littlepython what is git stash
17:52 bremner man git stash
17:52 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
17:53 ploop joined #git
17:55 sdlnv joined #git
17:56 rahtgaz joined #git
17:56 tgies joined #git
18:01 paul424 joined #git
18:02 mangolisk joined #git
18:02 Groscheri joined #git
18:02 sagerdearia joined #git
18:03 Megaf joined #git
18:03 GeekMan joined #git
18:03 ekinmur joined #git
18:03 finalbeta joined #git
18:05 mrmadcat joined #git
18:05 Endarked joined #git
18:06 tgies joined #git
18:06 overlord_tm joined #git
18:08 viran joined #git
18:09 mischat joined #git
18:09 romerocesar joined #git
18:10 e14 joined #git
18:10 maroloccio joined #git
18:10 viran Hello, I have a repo with master branch that has 2 commits. I want to squash them into 1 commit. I run git rebase -i master~2 master; I get the error fatal: Needed a single revision. invalid upstream master~2; what am I doing wrong?
18:10 mrmadcat_ joined #git
18:11 tgies joined #git
18:11 maroloccio i have branch A and B. i cherry pick from B into A commit X. why do i still see X on both sides if i do this? git log --left-right --cherry-mark --no-merges  --oneline A...B ?
18:11 viran That usually works, but there are usually a lot more commits...
18:11 maroloccio isn't -cherry-mark (or --cherry-pick) suppose to hide commits introducing the same diff?
18:12 tobiasvl viran: when you interactively rebase, the argument is the commit you want to retain as base
18:12 e14 joined #git
18:12 tobiasvl so just "git rebase -i master~2", and then you'll get a text editor that contains all commits between master~2 and master
18:13 viran tobiasvl: Ok, trying... thanks
18:13 mrmadcat joined #git
18:14 viran tobiasvl: I get the same error as before
18:14 raijin joined #git
18:15 tobiasvl really?
18:15 viran yeah, git rebase --root -i seems to work
18:16 mrmadcat joined #git
18:16 tobiasvl so you tried to run "git rebase -i master"?
18:17 tobiasvl "git rebase -i master~2" should work, I can't think of any situations that would give you the error "Needed a single revision. invalid upstream master~2"
18:17 dreiss joined #git
18:17 viran just "git rebase -i --root" while im on master... allowed me to rebase and sqash everything into one commit
18:17 viran squash*
18:18 tobiasvl sure
18:18 tobiasvl but "git rebase -i master~2" shouldn't have given you the same error as before
18:18 justan0theruser joined #git
18:18 viran not sure why, but it did
18:20 ochorocho__ joined #git
18:20 mizu_no_oto joined #git
18:21 tgies joined #git
18:22 mrmadcat joined #git
18:24 serycjon joined #git
18:26 finalbeta joined #git
18:26 tgies joined #git
18:26 fuchstronaut joined #git
18:27 Murii joined #git
18:28 kimonorouge joined #git
18:29 mkoskar joined #git
18:29 romerocesar joined #git
18:30 joki joined #git
18:30 osse maroloccio: did you have to resolve conflicts when you cherrypicked?
18:32 rkazak joined #git
18:32 mischat joined #git
18:34 SpeakerToMeat joined #git
18:35 finalbeta joined #git
18:35 davimore_ joined #git
18:35 pothepanda joined #git
18:36 tgies joined #git
18:38 sea-gull joined #git
18:38 maroloccio osse: actually.. not
18:38 Rodya_ joined #git
18:40 Endarked joined #git
18:40 osse maroloccio: can you do:  git diff commit~1 commit | git patch-id  for each of them?
18:40 osse the original and the cherry-picked commit ?
18:41 tgies joined #git
18:41 maroloccio osse: sure. patch -id is an awesome awesome idea :)
18:42 cso joined #git
18:42 osse maroloccio: maybe when you cherry-picked some of the content was left out because it was already there or something
18:42 maroloccio osse: ah-a!
18:42 maroloccio those are very smart ideas..
18:44 Overand left #git
18:45 finalbeta joined #git
18:45 theskillwithin joined #git
18:45 raijin joined #git
18:46 tgies joined #git
18:46 cagedwisdom joined #git
18:48 maroloccio osse: so here's something i did not know actually.. if a diff is applied higher up in a file or lower down.. it changes the diff id (of course, the hunk offset changes) in a way that asymmetrically can still be applied to the file BUT... is really a different diff, resulting in a different id. basically.. patch-id is only flexible in terms of whitespace.. not "scan forward in file to anchor the diff at the right
18:48 maroloccio place"
18:50 CEnnis91 joined #git
18:50 romerocesar joined #git
18:51 tgies joined #git
18:51 osse maroloccio: man page says line numbers are ignored
18:51 osse so I expect it to give the same id if the diffs "looks the same".
18:51 osse but maybe it doesn't
18:52 leeN joined #git
18:52 franl joined #git
18:53 davimore__ joined #git
18:54 blackwind_123 joined #git
18:54 maroloccio i can test that. diff the 2 diffs by skipping over the "header" lines..
18:55 apxm joined #git
18:55 xall_ joined #git
18:56 tgies joined #git
18:57 CEnnis91 joined #git
18:58 osse maroloccio: i hope they're actually different. git is kinda vague in telling how it determines how two commits are "equal", so I can only *guess* it's the mechanism that patch-id exposes.
18:59 maroloccio thank you osse. you have been very precious. i found the "hard to spot by naked eye" difference by doing this: diff -y  <(git diff 4bbdc~..4bbdc | tail -n +6) <(git diff ad1e~..ad1e | tail -n +6)
18:59 osse what was it? :O
18:59 maroloccio osse: patch-id was a great intuition.. should have done that as first thing
19:04 drmt joined #git
19:06 tgies joined #git
19:06 geoid joined #git
19:11 denimsoft joined #git
19:11 tgies joined #git
19:11 romerocesar joined #git
19:13 netj joined #git
19:14 ToBeCloud joined #git
19:15 Goplat joined #git
19:16 ToBeCloud joined #git
19:19 manuel joined #git
19:21 tgies joined #git
19:21 mehola joined #git
19:22 kimonorouge joined #git
19:24 Lyqyd joined #git
19:24 discopatrick how do i reset my local repo to a branch on origin - including removing any local untracked files, and any local files that are ignored by gitignore?
19:25 _ikke_ git reset --hard origin/<branch> && git clean -fdx
19:26 discopatrick thanks _ikke_ - i think i was missing the git clean part
19:29 e14 joined #git
19:31 tgies joined #git
19:32 romerocesar joined #git
19:32 ToBeCloud joined #git
19:35 HoierM joined #git
19:36 tgies joined #git
19:36 mrpackethead joined #git
19:38 e14 joined #git
19:41 tgies joined #git
19:43 littleforest joined #git
19:45 manuel joined #git
19:46 tgies joined #git
19:47 romerocesar joined #git
19:47 nilg joined #git
19:48 aliajder joined #git
19:48 NeverDie joined #git
19:49 acetakwas joined #git
19:49 aliajder left #git
19:51 tgies joined #git
19:51 ok91 joined #git
19:51 nettoweb joined #git
19:53 kimonorouge joined #git
19:56 tgies joined #git
19:57 thiago joined #git
20:00 HoierM joined #git
20:01 tgies joined #git
20:05 e14 joined #git
20:08 Darcidride joined #git
20:09 grumble joined #git
20:10 f4_ joined #git
20:10 Limes_ joined #git
20:11 tgies joined #git
20:13 rkazak joined #git
20:14 chamunks- joined #git
20:14 romerocesar joined #git
20:15 d5sx43 joined #git
20:15 Rodya_ joined #git
20:16 tgies joined #git
20:16 vuoto joined #git
20:17 HoierM joined #git
20:18 p4trix joined #git
20:19 kulelu88 joined #git
20:21 tgies joined #git
20:23 sagerdearia joined #git
20:25 rkazak joined #git
20:27 p4trix joined #git
20:28 NeonSynth_ joined #git
20:29 lindenle joined #git
20:30 einnjo joined #git
20:31 tgies joined #git
20:32 kimonorouge joined #git
20:33 aidalgol joined #git
20:33 Lor_ joined #git
20:34 re1 joined #git
20:35 re1 joined #git
20:36 tgies joined #git
20:40 Nikitaw99 joined #git
20:41 jeffreylevesque joined #git
20:41 tgies joined #git
20:46 allaroundArtist joined #git
20:46 tgies joined #git
20:46 overlord_tm joined #git
20:47 xall joined #git
20:47 Lor_ joined #git
20:49 e14 joined #git
20:54 m0viefreak joined #git
20:55 astrofog joined #git
20:56 tgies joined #git
20:56 railssmith joined #git
21:01 tgies joined #git
21:01 Shakeel_ joined #git
21:02 cdown_ joined #git
21:04 wrouesnel2 joined #git
21:06 tgies joined #git
21:11 tgies joined #git
21:13 pikajude joined #git
21:13 dodobrain joined #git
21:14 nettoweb joined #git
21:14 bmahe joined #git
21:15 ok91 joined #git
21:16 tgies joined #git
21:16 inflames joined #git
21:19 e joined #git
21:21 tgies joined #git
21:25 mrpackethead joined #git
21:26 tgies joined #git
21:28 astrofog joined #git
21:31 Fissure joined #git
21:31 tgies joined #git
21:35 sammyo joined #git
21:36 tgies joined #git
21:39 Spacew00t joined #git
21:41 paws_ joined #git
21:46 tgies joined #git
21:46 denimsoft joined #git
21:47 Rodya_ joined #git
21:47 star_prone joined #git
21:51 Balliad joined #git
21:51 tgies joined #git
21:53 ok91 joined #git
21:56 tgies joined #git
21:58 PocketKiller joined #git
21:58 lemonpepper24 joined #git
21:59 jack_ joined #git
22:01 tgies joined #git
22:01 ochorocho__ joined #git
22:08 shorty joined #git
22:08 acln joined #git
22:10 mehola joined #git
22:10 nettoweb joined #git
22:11 tgies joined #git
22:15 shorty Been searching online docs / help sites. Cannot find answer. Have repo that frequently has new files added. Other, unique repos, that were generated from base using GitHub classroom look like base-1, base-2, base-3, base-4, etc. Other people edit files that already existed at duplication time. Want changes in base to be merged into those repos, either when base pushes or they pull. Any guidance?
22:16 tgies joined #git
22:16 Rodya_ joined #git
22:16 jimi_ joined #git
22:16 Celelibi Hey there. Is it possible to globally ignore the files .*.swp without having to add them to .git/info/exclude for all the repositories?
22:17 shorty Celelibi: there is a git global config option you can set that will pull from a global .gitignore file you create.
22:17 BlaXpirit Celelibi, google "global gitignore"
22:19 Celelibi Nice.
22:21 tgies joined #git
22:24 romerocesar joined #git
22:24 acln joined #git
22:26 tgies joined #git
22:28 jimmyeatworld joined #git
22:30 e14_ joined #git
22:31 tgies joined #git
22:31 romerocesar joined #git
22:35 sagerdearia joined #git
22:36 tgies joined #git
22:38 nettoweb joined #git
22:39 mizu_no_oto joined #git
22:39 nilg joined #git
22:40 bluezone joined #git
22:41 tgies joined #git
22:43 unreal joined #git
22:46 tgies joined #git
22:46 tristanp joined #git
22:49 jumpman joined #git
22:49 e14 joined #git
22:49 bluezone joined #git
22:52 romerocesar joined #git
22:54 dodobrain joined #git
22:56 tgies joined #git
22:59 p4trix joined #git
23:00 solrize joined #git
23:01 tgies joined #git
23:02 ochorocho__ joined #git
23:06 tgies joined #git
23:06 converge joined #git
23:08 MrWoohoo joined #git
23:11 chamunks joined #git
23:11 tgies joined #git
23:13 mrpackethead joined #git
23:13 romerocesar joined #git
23:13 BenderRodriguez joined #git
23:21 tgies joined #git
23:26 tgies joined #git
23:26 Cork joined #git
23:28 WayToDoor joined #git
23:28 Ahmed90 joined #git
23:28 jeffreylevesque_ joined #git
23:30 jimi_ joined #git
23:31 tgies joined #git
23:31 Dazzyp joined #git
23:32 j416 joined #git
23:34 romerocesar joined #git
23:36 tgies joined #git
23:36 hahuang65 joined #git
23:41 tgies joined #git
23:41 buddyq joined #git
23:42 bannakaffalatta joined #git
23:43 buddyq hi guys, need some help. My gitignore files is supposed to be ignoring all wordpress plugins except ones I specify. I have installed a couple of plugins and deleted one and made some changes to files that are tracked and see ALL the files from plugins that have been deleted in red, etc. Why is it showing me that those files have been deleted if it shouldn't be looking at those files via gitignore?
23:45 romerocesar joined #git
23:45 shinnya joined #git
23:46 romerocesar joined #git
23:46 tgies joined #git
23:47 nettoweb joined #git
23:49 star_prone joined #git
23:50 Lyqyd joined #git
23:50 Remram joined #git
23:51 tgies joined #git
23:53 dreiss joined #git
23:55 jstimm joined #git
23:56 A5101 joined #git
23:56 tgies joined #git
23:58 mizu_no_oto joined #git
23:59 Shentino joined #git
23:59 pasky joined #git

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