Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-02

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

All times shown according to UTC.

Time Nick Message
00:00 ash_workz joined #git
00:00 cyphase joined #git
00:00 cdown_ joined #git
00:09 fuchstronaut joined #git
00:09 NoOutlet joined #git
00:15 cyphase joined #git
00:18 qpdb joined #git
00:19 bronson joined #git
00:19 jaguarmagenta joined #git
00:25 bronson joined #git
00:28 cyphase joined #git
00:28 danslo_ joined #git
00:30 bronson joined #git
00:31 m0viefreak joined #git
00:31 rgrinberg joined #git
00:33 durham joined #git
00:33 rwb joined #git
00:35 bronson joined #git
00:39 JamesBaxter joined #git
00:41 cyphase joined #git
00:41 mingrammer joined #git
00:43 a3Dman joined #git
00:43 bronson joined #git
00:44 jaguarmagenta joined #git
00:53 mischat joined #git
00:53 dreiss joined #git
00:53 Duikb00t-home joined #git
00:54 cdown_ joined #git
00:55 cyphase joined #git
00:55 flaguy48 joined #git
00:56 jaguarmagenta joined #git
00:59 githogori joined #git
01:03 ShekharReddy joined #git
01:07 mmlb joined #git
01:07 cyphase joined #git
01:09 mizu_no_oto joined #git
01:10 fuchstronaut joined #git
01:11 mizu_no_oto joined #git
01:13 mablae_ joined #git
01:13 realz joined #git
01:18 d^sh joined #git
01:25 sunri5e joined #git
01:26 CEnnis91 joined #git
01:28 fmcgeough joined #git
01:29 danslo_ joined #git
01:33 fuchstronaut joined #git
01:34 fstd_ joined #git
01:35 mingrammer joined #git
01:36 Sleepy63 joined #git
01:39 pks_ joined #git
01:42 monoprotic joined #git
01:42 shafun joined #git
01:46 arescorpio joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:53 dodobrain joined #git
01:53 mischat joined #git
01:57 dodobrain joined #git
02:06 chachasmooth joined #git
02:08 Rodya_ joined #git
02:08 Raed|Mobile joined #git
02:19 snthsnth joined #git
02:19 qws-user-1229 joined #git
02:20 Electrometro joined #git
02:22 z8z joined #git
02:29 mingrammer joined #git
02:29 cagmz joined #git
02:33 lagothrix joined #git
02:34 cyphase joined #git
02:35 lolmac joined #git
02:39 fuchstronaut joined #git
02:39 ctcrnitv joined #git
02:40 beatdown joined #git
02:40 ctcrnitv If I have a series of commits and want to go back to a previous commit
02:40 ctcrnitv and make changes that all the commits downstream will reflect
02:40 ctcrnitv what should I look into?
02:41 ctcrnitv It somewhat looks like branch and merge would be it?
02:41 theskillwithin I'm trying to automate a way in my package.json npm scripts to make a gh-pages branch based off a subfolder in side the repo.  the tricky part is making the /dist folder which is in .gitignore all the sudden the root of the gh-pahes branch.
02:41 theskillwithin tree="$(export GIT_INDEX_FILE="$(mktemp)"; cat .git/index >"$GIT_INDEX_FILE"; git add -f dist && git write-tree --prefix=dist)"
02:41 theskillwithin git update-ref refs/heads/gh-pages "$(git commit-tree -p gh-pages -m auto "$tree")"
02:42 JamesBaxter joined #git
02:42 theskillwithin ctcrnitv  not sure maybe rebase, revert? idk someone knows
02:42 theskillwithin https://github.com/robbyrusse​ll/oh-my-zsh/wiki/Cheatsheet
02:45 z8z joined #git
02:46 romerocesar joined #git
02:47 hexagoxel joined #git
02:48 jeffl35 left #git
02:54 mischat joined #git
02:57 NeverDie joined #git
03:04 chachasmooth joined #git
03:09 Urbany joined #git
03:09 skyres joined #git
03:10 NeverDie joined #git
03:13 cagedwisdom joined #git
03:14 Vortex35 joined #git
03:15 romerocesar joined #git
03:15 SwiftMatt joined #git
03:19 nebg joined #git
03:24 mingrammer joined #git
03:25 Saxon joined #git
03:31 danslo_ joined #git
03:33 Saxon1066 joined #git
03:34 treehug88 joined #git
03:40 fuchstronaut joined #git
03:41 Mission-Critical joined #git
03:43 rewt joined #git
03:44 l4v2 joined #git
03:44 e^1 joined #git
03:44 ahr3n joined #git
03:47 mozzarella joined #git
03:55 mischat joined #git
03:57 ShekharReddy joined #git
03:58 spriz joined #git
04:01 snthsnth joined #git
04:04 leangjia joined #git
04:04 rorro joined #git
04:07 daey_ joined #git
04:10 Kitty- joined #git
04:11 madewokherd joined #git
04:12 cagedwisdom joined #git
04:14 arand joined #git
04:16 snthsnth joined #git
04:16 Limes_ joined #git
04:19 dreiss joined #git
04:19 fahadash joined #git
04:20 Gloomy joined #git
04:24 Marbug joined #git
04:25 rgrinberg joined #git
04:28 e14 joined #git
04:32 danslo_ joined #git
04:34 watabou joined #git
04:34 jaguarmagenta joined #git
04:36 tristanp joined #git
04:37 sleepster joined #git
04:38 xameada joined #git
04:38 sleepster what's the simplest way to stand up a git server?
04:38 sleepster I thought I would be able to simply type "git server docker"
04:38 sleepster and then have a million different Dockerfiles
04:40 fuchstronaut joined #git
04:46 snthsnth joined #git
04:47 languitar joined #git
04:47 firebalrog joined #git
04:53 Lunatrius joined #git
04:56 mischat joined #git
04:57 lolmac joined #git
04:58 Cabanossi joined #git
04:59 phaleth joined #git
05:02 justanotheruser joined #git
05:07 wogi joined #git
05:09 mizu_no_oto joined #git
05:12 mingrammer joined #git
05:18 elastix joined #git
05:34 danslo_ joined #git
05:36 QwertyDragon joined #git
05:39 GandalfTheWizard joined #git
05:41 fuchstronaut joined #git
05:43 romerocesar joined #git
05:48 jnavila joined #git
05:48 fedepad joined #git
05:53 star_prone joined #git
05:56 theskillwithin tree="$(export GIT_INDEX_FILE="$(mktemp)"; cat .git/index >"$GIT_INDEX_FILE"; git add -f dist && git write-tree --prefix=dist)"
05:56 theskillwithin git update-ref refs/heads/gh-pages "$(git commit-tree -p gh-pages -m auto "$tree")"
05:57 mischat joined #git
06:00 firebalrog joined #git
06:01 theskillwithin https://i.imgur.com/mzdPCBF.png
06:03 badpeaches joined #git
06:05 Derperperd joined #git
06:06 cyan__ joined #git
06:06 mingrammer joined #git
06:14 nilg joined #git
06:14 hahuang62 joined #git
06:16 subhojit777 joined #git
06:20 beecushman joined #git
06:20 pothepanda joined #git
06:21 cyphase joined #git
06:28 ThomasLocke joined #git
06:29 wogi joined #git
06:35 danslo_ joined #git
06:36 jaequery joined #git
06:41 msonntag joined #git
06:42 fuchstronaut joined #git
06:45 sanketdg joined #git
06:50 AndreSomers joined #git
06:55 King_Hual joined #git
06:55 King_Hual joined #git
06:57 mischat joined #git
07:08 Guest3186 left #git
07:19 fedepad joined #git
07:19 AndreSomers joined #git
07:21 jnavila_ joined #git
07:24 Gloomy joined #git
07:25 subhojit_ joined #git
07:26 vuoto joined #git
07:30 ochorocho__ joined #git
07:32 dalias joined #git
07:34 moongazer joined #git
07:37 laumann joined #git
07:37 vuoto joined #git
07:38 Suigetsu joined #git
07:39 t0by joined #git
07:40 sl33k joined #git
07:40 t0by joined #git
07:42 star_prone joined #git
07:43 fuchstronaut joined #git
07:46 Jackneill joined #git
07:47 robotroll joined #git
07:55 mingrammer joined #git
07:58 mischat joined #git
07:59 jaguarmagenta joined #git
08:00 mingrammer joined #git
08:07 vuoto joined #git
08:11 fatalhalt joined #git
08:13 dsfreak93 joined #git
08:13 vuoto joined #git
08:15 hahuang62 joined #git
08:24 WayToDoor joined #git
08:26 dreiss joined #git
08:27 markovh joined #git
08:29 Suigetsu joined #git
08:32 manuel joined #git
08:33 AndreSomers joined #git
08:38 thomas_25 joined #git
08:39 multiproc joined #git
08:42 Alex64 joined #git
08:43 eivarv joined #git
08:44 fuchstronaut joined #git
08:45 dave0x6d joined #git
08:45 ahmedelgabri joined #git
08:48 bernardio joined #git
08:52 timvisher joined #git
08:59 mischat joined #git
08:59 zg joined #git
09:00 zg Hi, I'm trying to set up git_daemon
09:00 zg I'm seeing this error: "'/usr/local/git/myfirstrepo.git/' does not appear to be a git repository", but that folder exists and is a git repo (using `git init --bare`)
09:01 moritz zg: could it be a permissions problem?
09:01 moritz that is, the user that git daemon runs under doesn't have permissions for that repo?
09:01 zg perhaps
09:02 moritz also, don't put your git repos under /usr/local/, that's meant for executables. Data such as git repos is much better suited in /var/
09:03 zg On freebsd?
09:04 moritz I'm not really familiar with freebsd, but I'd be surprised if they had very different conventions from linux
09:05 moritz https://en.wikipedia.org/wiki/​Filesystem_Hierarchy_Standard "Many modern UNIX systems (like FreeBSD via its ports system) install third party packages into /usr/local while keeping code considered part of the operating system in /usr."
09:06 khmarbaise joined #git
09:06 zg https://www.freebsd.org/doc​/handbook/dirstructure.html
09:08 beatdown The Linuxisms in the Unix world these days sickens me.
09:08 * beatdown vomits
09:09 grawity kindly please keep your bodily fluids out of this channel
09:09 msonntag joined #git
09:10 * zg breathes in grawity's face
09:10 bithon joined #git
09:11 zg moritz: how do I figure out what user git_daemon is being run as
09:14 zg ps aux | grep git ;)
09:16 beatdown Ah yeah, you're a systemd dev :/
09:16 dalias joined #git
09:16 zg beatdown: ?
09:17 zg left #git
09:17 catsup joined #git
09:18 AndreSomers joined #git
09:21 m1dnight1 joined #git
09:22 star_prone joined #git
09:26 eivarv joined #git
09:28 star_prone joined #git
09:29 slayerjain joined #git
09:31 cdown joined #git
09:32 zeroed joined #git
09:32 zeroed joined #git
09:36 arand joined #git
09:36 manuel joined #git
09:37 manuel joined #git
09:38 noyb joined #git
09:38 xameada joined #git
09:38 ash_workz joined #git
09:38 tristanp joined #git
09:38 WayToDoor joined #git
09:39 manuel joined #git
09:41 AndreSomers joined #git
09:44 fuchstronaut joined #git
09:45 laumann joined #git
09:47 thomas_25 joined #git
09:51 DJ_Spies joined #git
09:52 mehola joined #git
09:55 prawnzy joined #git
09:56 kotk joined #git
09:58 mycyber joined #git
09:59 a_thakur joined #git
10:00 jstein_ joined #git
10:01 mischat joined #git
10:01 mingrammer joined #git
10:04 wogi joined #git
10:04 wogi joined #git
10:08 JSharpe joined #git
10:10 a3pq51 joined #git
10:11 reizuki__ joined #git
10:12 reizuki hello, I'd like to ask about best practice when pulling patches made to stable branch into the dev branch
10:13 reizuki do you use merge or rebase in this case? The goal is to ensure that future similar pulls go as smoothly as possible
10:14 reizuki should git pull --rebase be kept mostly to private feature branches?
10:15 grawity the best practice is "don't rebase something that has already been made public"
10:15 elastix joined #git
10:16 grawity as for pulling stuff from stable into dev, not sure tbh
10:16 FilipNortic joined #git
10:17 reizuki according to the "no public rebases" rule merge should be the safest bet
10:18 hahuang62 joined #git
10:19 manuel joined #git
10:20 manuel joined #git
10:20 stamina joined #git
10:21 mischat joined #git
10:22 manuel joined #git
10:23 satifant joined #git
10:24 manuel joined #git
10:24 tx0ru4 joined #git
10:25 manuel joined #git
10:28 codfection joined #git
10:28 xaa joined #git
10:33 a_thakur joined #git
10:43 crameth joined #git
10:44 irco joined #git
10:45 Wind0r joined #git
10:45 fuchstronaut joined #git
10:53 star_prone joined #git
10:55 markovh joined #git
10:56 mingrammer joined #git
10:58 thomas_25 joined #git
11:02 multiproc joined #git
11:03 ahmedelgabri joined #git
11:05 star_prone joined #git
11:07 leeN joined #git
11:09 markovh joined #git
11:12 snufft joined #git
11:17 Reujea0_ joined #git
11:19 NoOutlet Definitely merge.
11:19 Reujea0_ Could please someone help me cherry pick this https://android.googlesource.com/kernel/commo​n/+/bc84b4adb1469e3d05ad76c304a4c545feaf1f88 into here https://github.com/Packmaa​n7144/kernel_nvidia_s8515 ?
11:20 rorro joined #git
11:22 NoOutlet Do you have that repo (the one with the commit) as one of your remotes?
11:23 jaguarmagenta joined #git
11:23 bithon git gut git
11:25 ^7heo alias gut="git status"
11:25 bithon we actually need a git gut command
11:25 bithon and i don't want an alias
11:25 ^7heo bithon: what for?
11:25 bithon that's where my contribution to git ends. i gave you an amazing idea, now do something with it
11:26 ^7heo mm
11:26 ^7heo I would say we need more like a `git duff` command
11:26 bithon perhaps it could find an appropriate repo for you based on your mood for the day
11:27 ^7heo here's mine: duff = "!f() { echo 'DRINK DUFF!!!'; }; f"
11:27 star_prone joined #git
11:28 bithon oh yeah!
11:28 ojdo joined #git
11:28 dave0x6d joined #git
11:30 aard_ joined #git
11:32 eivarv joined #git
11:35 nuck joined #git
11:35 robotroll joined #git
11:36 _ikke_ bithon: Just place git-gut in $PATH, and you have a git gutt command
11:38 hakan_ joined #git
11:39 ^7heo bithon: I used to have the duff alias to be an ASCIIART but I was annoyed that it would fill my term each time.
11:39 ^7heo bithon: so yeah.
11:40 danslo_ joined #git
11:40 jaguarmagenta joined #git
11:41 Reujea0_ Could please someone help me cherry pick this https://android.googlesource.com/kernel/commo​n/+/bc84b4adb1469e3d05ad76c304a4c545feaf1f88 into here https://github.com/Packmaa​n7144/kernel_nvidia_s8515 ?
11:42 ^7heo can't you solve the merge by yourself?
11:42 thomas_25 joined #git
11:42 Reujea0_ i dont know how
11:43 ^7heo I don't want to sound annoying or anything but
11:43 hakan_ left #git
11:43 ^7heo usually solving deltas that the machine cannot solve
11:43 ^7heo is by using your brain.
11:45 _ikke_ Using a merge tool helsp
11:46 jost_ joined #git
11:46 fuchstronaut joined #git
11:46 mattcen joined #git
11:47 zeroed joined #git
11:49 jnavila joined #git
11:49 m0viefreak joined #git
11:50 Reujea0_ no i dont
11:50 _ikke_ !eek
11:50 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
11:51 jaguarmagenta joined #git
11:54 anonymuse joined #git
11:54 Furai joined #git
11:54 Limes_ joined #git
11:57 navidr joined #git
11:58 bithon _ikke_: Yeah, but everyone to have access to such an amazing command
11:59 CamonZ joined #git
12:01 markovh joined #git
12:02 bremner sometimes you have to know when a joke has run its course...
12:03 ^7heo and sometimes you just can be oblivious to anything for your own satisfaction.
12:03 diogenese joined #git
12:03 eihabarabia joined #git
12:04 ahmedelgabri joined #git
12:10 bithon bremner: such an issue only occurs once you're actually absnet from the chat for a while and therefore have allowed for your joke meter to buffer up
12:11 parasite joined #git
12:12 jaguarmagenta joined #git
12:13 bithon also chill the fuck out mate, it's all in good spirit. didn't mean to annoy anyone :)
12:19 hahuang62 joined #git
12:22 jknetl joined #git
12:23 sdothum joined #git
12:24 markovh joined #git
12:24 ToBeCloud joined #git
12:25 trewe joined #git
12:34 nikivi joined #git
12:37 Gamecubic joined #git
12:39 rbern joined #git
12:39 timvisher joined #git
12:41 danslo_ joined #git
12:44 mingrammer joined #git
12:46 Glooomy joined #git
12:47 fuchstronaut joined #git
12:53 mischat joined #git
12:55 delboy1978uk joined #git
12:57 delboy1978uk how do i remove the contents of an upload folder that has been put ito version control without deleting the files? i have the folder in gitignore but a few files managed to slip through the net
12:57 delboy1978uk is it rm cached or something?
12:59 thomas_25 joined #git
13:01 jozwior joined #git
13:02 VampiricPadraig joined #git
13:02 VampiricPadraig joined #git
13:03 zeroed joined #git
13:05 osse delboy1978uk: You are very close. Add two dashes in front of cached and boom
13:05 delboy1978uk osse: thanks!
13:06 markovh joined #git
13:08 mehola joined #git
13:09 WayToDoor joined #git
13:10 cyan__ joined #git
13:12 theskillwithin http://kopy.io/n68xs  so close yet so far
13:13 vuoto joined #git
13:14 CEnnis91 joined #git
13:19 fuchstronaut joined #git
13:20 delboy1978uk git rm --cached application/uploads/* gave me zsh: argument list too long: git, so there are too many files in that folder. Then I tried ending a*, and it came up with fatal: pathspec 'application/uploads/all-rounder.png' did not match any files, so there are untracked files in there too. how can i remove now?
13:21 theskillwithin I have been trying to figure out a git command that will make branch gh-pages just contain build/ folder as its root despite being in .gitignore
13:21 star_prone joined #git
13:21 _ikke_ delboy1978uk: escape the *
13:22 osse or rm --cached -r application/uploads
13:22 _ikke_ right
13:22 pothepanda joined #git
13:23 delboy1978uk thanks again! :-D
13:23 jimi_ joined #git
13:24 theskillwithin http://kopy.io/wsFrl   git push --force origin $(git commit-tree -m "auto" master:dist):gh-pages
13:24 mischat joined #git
13:27 tinajohnson___ joined #git
13:32 leangjia joined #git
13:32 piling joined #git
13:33 LeMike joined #git
13:35 dilfridge joined #git
13:36 hexa- joined #git
13:38 mingrammer joined #git
13:38 raijin joined #git
13:39 Shentino joined #git
13:39 roentgen joined #git
13:40 codfection joined #git
13:41 ahmedelgabri joined #git
13:43 thomas_25 joined #git
13:45 dviola joined #git
13:47 laumann joined #git
13:47 timvisher joined #git
13:48 freimatz joined #git
13:50 delboy1978uk hmm. production site working repository reporting Your branch is ahead of 'origin/master' by 7 commits. how can i see which commits these are?
13:51 nedbat delboy1978uk: git log --oneline --decorate --graph
13:52 blackwind_123 joined #git
13:52 nedbat delboy1978uk: to see only those commits, add:   origin/master...master
13:52 SteffanW joined #git
13:52 delboy1978uk thanks nedbat
13:52 delboy1978uk :)
13:53 codfection joined #git
13:53 theskillwithin http://kopy.io/wsFrl    http://kopy.io/n68xs
13:56 prawnzy joined #git
14:03 shafun joined #git
14:03 tvw joined #git
14:07 brokensyntax joined #git
14:14 vuoto joined #git
14:15 ahmedelgabri joined #git
14:16 WizJin joined #git
14:17 star_prone joined #git
14:17 markovh joined #git
14:20 e14 joined #git
14:20 fuchstronaut joined #git
14:22 jaguarmagenta joined #git
14:25 mischat joined #git
14:25 markovh joined #git
14:27 mizu_no_oto joined #git
14:27 Balliad joined #git
14:32 mischat joined #git
14:32 thiago joined #git
14:32 barteks2x joined #git
14:33 mingrammer joined #git
14:33 elastix joined #git
14:36 jaafar joined #git
14:38 markovh joined #git
14:39 mehola joined #git
14:41 e14 joined #git
14:42 danslo_ joined #git
14:49 shufan joined #git
14:49 star_prone joined #git
14:49 Eaol joined #git
14:50 fees joined #git
14:53 JanC_ joined #git
14:55 star_prone joined #git
14:56 e14 joined #git
14:57 rgrinberg joined #git
14:58 Esya joined #git
15:00 firebalrog joined #git
15:02 markovh joined #git
15:03 cdown joined #git
15:03 markovh joined #git
15:07 zacts joined #git
15:08 Brain joined #git
15:10 firebalrog joined #git
15:11 WayToDoor joined #git
15:12 narendraj9 joined #git
15:12 soee joined #git
15:13 shufan left #git
15:14 shafun joined #git
15:14 soee hi, if i'm on branch `dev` and have one local commit  that is not pushed to remote, than can i push it to completely new branch 'test' (so push & crate new branch)?
15:17 synchronous joined #git
15:18 fuzzmz joined #git
15:19 cdown__ joined #git
15:21 osse soee: git push origin dev:test
15:21 fuchstronaut joined #git
15:21 snowkidind joined #git
15:23 nedbat soee: or, make a new local branch first.
15:23 nedbat so that your local and remote branches will match
15:24 soee ye i created it locally first than pushed
15:24 soee can i push commit to 2 branches ?
15:25 ^er-chribbio joined #git
15:26 jstein_ joined #git
15:26 nedbat soee: you can have any number of branches pointing to the same commit.
15:27 bauruine joined #git
15:27 fuchstronaut joined #git
15:28 soee nedbat: but if im on branch 'dev' and have a local commit here, how can i put to remove 'dev' and 'test' ?
15:28 soee *push
15:28 soee *to remote
15:29 nedbat soee: there are other ways (as osse showed), but I would make my two local branches (dev and test) point to that commit, and then push both branches
15:30 soee how can i make both point to it ?
15:30 elastix joined #git
15:30 delboy1978uk joined #git
15:31 soee or shall i try: git cherry-pick <commit> ?
15:31 nedbat soee: that depends: do you want dev and test to be literally the same (same tip commit, same history)?
15:31 afuentes joined #git
15:31 star_prone joined #git
15:32 nedbat soee: or do you want them to have different history, but the same change on the tip
15:32 SpeakerToMeat joined #git
15:32 soee nedbat: no, both will grow separately but some changes from dev should land in test
15:33 ahmedelgabri joined #git
15:33 star_prone joined #git
15:35 nedbat soee: sounds like you want a cherry pick then
15:35 markovh joined #git
15:36 annoymouse joined #git
15:36 soee nedbat: aye, just tried that and seems to work fine. Thank you for your time :)
15:36 dviola joined #git
15:38 narendraj9 left #git
15:43 jeffreylevesque joined #git
15:43 a_thakur joined #git
15:43 archaic joined #git
15:44 tristanp joined #git
15:45 tristanp joined #git
15:45 cyphase joined #git
15:47 kulelu88 joined #git
15:57 eivarv joined #git
15:57 prawnzy joined #git
16:02 delboy1978uk joined #git
16:07 wget joined #git
16:07 wget joined #git
16:09 jaguarmagenta joined #git
16:10 cyan__ joined #git
16:11 t0by joined #git
16:13 glebihan joined #git
16:18 Rodya_ joined #git
16:18 NeXTSUN joined #git
16:21 hahuang62 joined #git
16:21 overlordtm joined #git
16:21 mingrammer joined #git
16:22 GingerGeek joined #git
16:22 GingerGeek joined #git
16:23 laumann joined #git
16:28 phillly joined #git
16:29 d1z joined #git
16:29 dunaeth joined #git
16:30 d1z I'm having a problem, I'm trying to add a file to the git like this: git add /etc/systemd/system/getty.target.wants/getty@tty1.service , but I get no output and git status shows that it wasn't added. I tried the -f flag but that didn't work either (I wasn't getting the *path is ignored so you need to -f* anyway)
16:30 a_thakur_ joined #git
16:31 d1z ah it looks like it's a symlink
16:34 ahmedelgabri joined #git
16:34 paul424 joined #git
16:36 markovh joined #git
16:36 overlord_tm joined #git
16:38 oskarkv joined #git
16:41 nilg joined #git
16:42 raijin joined #git
16:43 beecushman joined #git
16:43 dreiss joined #git
16:48 cptZissou joined #git
16:49 helium-3 joined #git
16:51 bttf joined #git
16:56 _ikke_ Yeah, symlinks are only tracked as links
16:56 glebihan joined #git
17:02 inflames joined #git
17:05 jaguarmagenta joined #git
17:06 markovh joined #git
17:08 markovh joined #git
17:08 phaleth_ joined #git
17:11 thomas_25 joined #git
17:12 mizu_no_oto joined #git
17:12 Kitty- joined #git
17:14 Murii joined #git
17:15 mingrammer joined #git
17:21 BenderRodriguez joined #git
17:28 ToBeCloud joined #git
17:29 fuchstronaut joined #git
17:29 eivarv joined #git
17:30 mizu_no_oto joined #git
17:30 [cust] joined #git
17:30 jimmyeatworld joined #git
17:34 ahmedelgabri joined #git
17:37 khmarbaise joined #git
17:40 watabou joined #git
17:46 jeffreylevesque joined #git
17:46 raijin joined #git
17:47 madewokherd joined #git
17:48 rewt joined #git
17:49 armyriad joined #git
17:51 cspack joined #git
17:52 thomas_25 joined #git
17:52 sladkoOTqgodi-f joined #git
17:55 dreiss joined #git
17:58 Limes_ joined #git
17:58 prawnzy joined #git
18:00 delboy1978uk joined #git
18:00 NeverDie joined #git
18:02 gro joined #git
18:02 jon-mac joined #git
18:03 nsh_ joined #git
18:04 nyarmith joined #git
18:04 akanksha_ joined #git
18:05 multi_io joined #git
18:05 _Vi joined #git
18:06 nsh_ joined #git
18:06 Goplat joined #git
18:09 SpeakerToMeat joined #git
18:10 Anja joined #git
18:10 mingrammer joined #git
18:10 gro joined #git
18:10 gro joined #git
18:14 aard_ joined #git
18:15 nilg joined #git
18:20 realz joined #git
18:21 BenderRodriguez joined #git
18:21 hahuang62 joined #git
18:26 dreiss joined #git
18:30 tyreld_ joined #git
18:30 fuchstronaut joined #git
18:33 nydel07 joined #git
18:35 Urbany joined #git
18:38 njbair joined #git
18:41 mizu_no_oto joined #git
18:44 Rodya_ joined #git
18:45 ahmedelgabri joined #git
18:46 fatalhalt joined #git
18:47 xameada joined #git
18:50 mischat joined #git
18:50 Snugglebash joined #git
18:50 mischat joined #git
18:51 mischat joined #git
18:52 cyphase_eviltwin joined #git
18:52 mischat joined #git
18:52 jason237 joined #git
18:53 mischat joined #git
18:54 mischat joined #git
18:55 cagedwisdom joined #git
18:56 qpdb joined #git
18:57 dan2k3k4 joined #git
19:00 spriz joined #git
19:00 nilg joined #git
19:03 laumann joined #git
19:03 jimmyeatworld joined #git
19:06 robotroll joined #git
19:08 mgoodwin is there a single command to mimic: `git rebase other/master && git rebase --skip`
19:08 nedbat mgoodwin: how do you know you want to skip the commit?
19:09 tvw joined #git
19:09 mgoodwin because I did it manually and there's a conflict but I don't want it to confuse the person I'm giving instructions to
19:09 mgoodwin because it does indeed need to be skipped
19:09 nedbat mgoodwin: i see, so this is a one-off, not like you do this all the time and need a shortcut
19:10 nedbat mgoodwin: but it's just one commit?
19:11 magellanicloud joined #git
19:12 mgoodwin right
19:14 nedbat mgoodwin: then is sounds like you know you don't need that commit, and you are just looking to checkout other/master?  why is this a rebase?
19:15 sl33k joined #git
19:18 anli joined #git
19:19 anli I do not see the remotes in tortoisegit any longer
19:20 anli Oh, maybe thats because I am using the origin direcly :)
19:23 dreiss joined #git
19:25 sl33k_ joined #git
19:27 xameada joined #git
19:29 cloudbud joined #git
19:30 cloudbud I am a newbie to git , is rebase a command that i should focus on ?
19:30 bastelfreak joined #git
19:30 HedgeMage cloudbud: focus on learning commands as you need them, in the context of a real project.
19:30 fuchstronaut joined #git
19:31 nyarmith left #git
19:31 cloudbud Thanks HedgeMage, can yoi give me few important commands that are important and used regulary
19:31 HedgeMage cloudbud: directionless rote learning won't stick with you as long, because it lacks context and personal importance.
19:32 i7c man giteveryday
19:32 gitinfo the giteveryday manpage is available at http://jk.gs/giteveryday.html
19:32 HedgeMage cloudbud: that^^^
19:32 HedgeMage cloudbud: But seriously, use it as a reference...start using git, learn things as you need them.  It will stick with you :)
19:32 cloudbud thanks bro :)
19:33 cagedwisdom joined #git
19:33 vuoto joined #git
19:34 irco joined #git
19:36 jaguarmagenta joined #git
19:38 cloudbud If i want to move a file to a previous edit i can run git reset and git checkout. WHich one is better ?
19:38 sl33k joined #git
19:40 i7c They’re different. checkout changes HEAD (pointer to the current revision) and updates the working directory accordingly. reset changes which revision the current branch points to.
19:40 i7c cloudbud, do you just want the previous version of one file?
19:41 cloudbud yes
19:41 i7c Then you can do git checkout <previous version> -- path/to/that/file.xy
19:41 i7c where previous version is a commit hash or another rev like HEAD~ for the previous commit etc.
19:43 i7c In this specific case (just checking out some files) HEAD remains unchanged.
19:45 Rodya_ joined #git
19:45 nikivi joined #git
19:45 ResidentBiscuit joined #git
19:46 ahmedelgabri joined #git
19:46 sangy joined #git
19:47 jstein_ joined #git
19:47 cbreak joined #git
19:48 danslo_ joined #git
19:48 mizu_no_oto joined #git
19:48 kerrick joined #git
19:48 Ender13 joined #git
19:49 dikiaap joined #git
19:50 Snugglebash joined #git
19:51 prawnzy joined #git
19:52 kyan joined #git
19:55 mischat joined #git
19:57 magellanicloud joined #git
19:59 mattcen joined #git
20:00 dreiss joined #git
20:03 cdown joined #git
20:05 thomas_25 joined #git
20:05 Remram[m] left #git
20:05 stamina joined #git
20:06 cyphase joined #git
20:07 Shakeel_ joined #git
20:07 Darcidride joined #git
20:09 Remramm joined #git
20:10 SwiftMatt joined #git
20:17 hypercube32 joined #git
20:18 cdown_ joined #git
20:21 mehola joined #git
20:22 ahr3n joined #git
20:22 hahuang62 joined #git
20:23 perrier-jouet joined #git
20:23 khmarbaise joined #git
20:27 mattcen joined #git
20:28 fatalhalt joined #git
20:29 CMOTD joined #git
20:29 CMOTD_ joined #git
20:31 HappyLoaf_ joined #git
20:31 fuchstronaut joined #git
20:31 thiago joined #git
20:34 Snugglebash joined #git
20:34 jason237 joined #git
20:36 afuentes joined #git
20:36 jozwior joined #git
20:38 johnmilton joined #git
20:41 mizu_no_oto joined #git
20:44 Derperperd joined #git
20:45 cloudbud what is the difference between forking and pull
20:45 osse cloudbud: same as between apples and oranges
20:45 WaReZ joined #git
20:45 i7c :)
20:46 cloudbud osse : can you come to the point, see I am learning git and trolling a user like this is not expected from a wise person like you :)
20:46 kulelu88 cloudbud: a fork is when you "split" the repo into the original version and a duplicate of the original
20:46 cloudbud pull does the same
20:46 johnmilton joined #git
20:47 ahmedelgabri joined #git
20:47 kulelu88 no, pull "fetches" the repo for you from the remote host
20:47 Atm0spher1c joined #git
20:47 kulelu88 when you pull, you are pulling from a the original repo and your interactions are with the original (eg. git push)
20:47 osse cloudbud: I am just trying to say that the difference between them is not very interesting.
20:48 osse they are unrelated
20:48 kulelu88 osse: if you can't help the user and believe he/she is trolling, it is better to not answer
20:48 cloudbud okay what is forking and pulling
20:48 danslo_ joined #git
20:48 osse kulelu88: i don't believe that
20:48 kulelu88 cloudbud: have you read the documentation from github at least?/
20:49 jason237 joined #git
20:49 osse cloudbud: they way most people use "fork" it is not a Git term. it means creating a new copy of a repo that you work with.
20:49 osse cloudbud: pulling is integrating changes from a different repo into your own
20:50 cloudbud yes i m learning the commands. fork is like the creating a copy of main repo and both the repos work side by side
20:50 cloudbud and do we merge after forking ?
20:50 jaguarmagenta joined #git
20:50 khmarbaise_ joined #git
20:50 osse immediately after forking they are identical. but later, yes
20:50 random-nick joined #git
20:53 mizu_no_oto joined #git
20:57 nikivi joined #git
20:59 mischat joined #git
21:00 johnny56 joined #git
21:04 cloudbud I have generated the keys and added the keys in my git hub account, but when i am pushing changes to my github account its askibg for password and username
21:04 aidalgol joined #git
21:04 osse cloudbud: what does git remote -v say ?
21:05 cloudbud it gives https of my repo
21:05 mingrammer joined #git
21:05 osse cloudbud: that is wrong. you need to use the SSH urls
21:06 annoymouse joined #git
21:06 cloudbud okay
21:06 osse git remote set-url origin git@github.com:cloudbud/blah.git
21:06 cloudbud okay
21:06 bmahe joined #git
21:06 Electrometro joined #git
21:08 jottr joined #git
21:09 bmahe joined #git
21:10 Darcidride joined #git
21:11 HappyLoaf_ joined #git
21:11 cloudbud i forked https://github.com/svanzoest-cookbooks/apache2 and i cloned after that. I am trying to edit the COntributing.md file and trying to push changes to my repo. But when I am checking my repo on github it has old file
21:11 snthsnth joined #git
21:12 cloudbud ok got my errror
21:13 bmahe joined #git
21:14 MrWoohoo joined #git
21:15 antlarr joined #git
21:17 nettoweb joined #git
21:19 buffal0 joined #git
21:20 manuel joined #git
21:22 sangy joined #git
21:22 Electrometro joined #git
21:23 hahuang62 joined #git
21:23 qpdb joined #git
21:26 akanksha_ joined #git
21:27 noyb joined #git
21:28 Vampire0 joined #git
21:29 meloc joined #git
21:30 astrofog joined #git
21:30 mischat joined #git
21:32 fuchstronaut joined #git
21:37 tzafrir joined #git
21:37 dreiss joined #git
21:40 HappyLoaf_ joined #git
21:42 NeverDie How do I revert all the work I've done in a directory to the latest commit?
21:42 NeverDie Work that I haven't committed yet.
21:43 watabou joined #git
21:43 osse git status tells you how
21:43 osse shortcut: git reset --hard
21:43 NeverDie osse: Tyvm.
21:44 OnOut2k16 joined #git
21:44 random-nick how do I pull a tag? git pull <remote> "tag <tag>"?
21:45 Electrometro joined #git
21:46 osse git pull <remote> <tag>
21:47 random-nick thank you
21:50 paws_ joined #git
21:54 Rodya_ joined #git
21:55 Kitty- joined #git
21:59 mingrammer joined #git
22:00 raijin joined #git
22:04 mizu_no_oto joined #git
22:09 aard_ joined #git
22:10 star_prone joined #git
22:11 rgrinberg joined #git
22:17 xameada joined #git
22:20 rgrinberg joined #git
22:33 fuchstronaut joined #git
22:34 jottr_ joined #git
22:35 theskillwithin I have been trying to figure out a git command that will make branch gh-pages just contain build/ folder as its root despite being in .gitignore
22:37 shinnya joined #git
22:38 theskillwithin http://kopy.io/wsFrl    http://kopy.io/n68xs
22:38 osse theskillwithin: you cannot change what is considered the top level
22:38 osse ah
22:39 osse "unable to delete" => git commit-tree prints nothing
22:39 osse so $() is empty
22:40 theskillwithin osse do you have a solution to that?  been pounding my head on this for awhile
22:40 osse theskillwithin: what is dist?
22:40 afuentes joined #git
22:41 theskillwithin osse dist is just my "build" folder... dist is not tracked in my repo only my src file which is used to create dist in my npm scripts
22:41 theskillwithin https://github.com/theskillwithin​/hrtcup/blob/master/package.json
22:41 theskillwithin src folder*
22:41 osse then you have to use write-tree first
22:42 osse the tree doesn't exist yet
22:43 theskillwithin I think I tried something like that in my 2nd kopy
22:43 theskillwithin git write-tree --prefix=dist
22:44 osse and to do that you need to add first
22:44 theskillwithin git add -f dist && git write-tree --prefix=dist)
22:45 osse or maybe git update-index
22:45 theskillwithin -f is for force cuz its in .gitignore?
22:45 osse yes
22:45 osse it
22:46 theskillwithin " <MinusFour>theskillwithin: you could use --orphan and then only commit the build folder"
22:46 osse yes but that won't do the "pretend it's the top level" thing
22:46 theskillwithin ahh
22:48 osse export GIT_DIR=.git; cd dist; GIT_WORK_TREE=$PWD GIT_INDEX=/tmp/lol; git add .; git push ....; unset GIT_DIR GIT_WORK_TREE GIT_INDEX
22:48 * osse crosses fingers
22:49 theskillwithin export GIT_DIR=.git; cd dist; GIT_WORK_TREE=$PWD GIT_INDEX=/tmp/lol; git add .; git push origin gh-pages; unset GIT_DIR GIT_WORK_TREE GIT_INDEX
22:49 osse hmm, might need $PWD/.git on the GIT_DIR
22:49 osse no you need the write-tree magic
22:50 osse git push origin -f $(git write-tree):refs/heads/gh-pages
22:50 osse (I added refs/heads for you. you're welcome)
22:51 theskillwithin thx =]
22:52 theskillwithin ah hm fatal: Not a git repository: '/Users/Austin/Projects/hrtcup/dist/.git'
22:52 osse I was right about the fact that I was wrong
22:52 theskillwithin GIT_DIR=$PWD/../.git maybe
22:52 osse Depends on whether you do it before or after cd
22:53 osse Feel free to copy in the actual paths
22:54 hahuang62 joined #git
22:54 theskillwithin osse  gettling close I think!  http://kopy.io/ic42p
22:56 theskillwithin dang thats the closest I have gotten in days
22:56 osse You should put && between the commands instead of ;
22:56 watabou_ joined #git
22:56 osse Also you exported before cd, so no .. In GIT_DIR
22:57 theskillwithin export GIT_DIR=$PWD/../.git && cd dist && GIT_WORK_TREE=$PWD GIT_INDEX=/tmp/lol && git add . && git push origin -f $(git write-tree):refs/heads/gh-pages && unset GIT_DIR GIT_WORK_TREE GIT_INDEX
22:58 theskillwithin osse that is odd I was getting this error fatal: Not a git repository: '/Users/Austin/Projects/hrtcup/dist/.git'   saying it was looking in the dist folder for .git.   but now that I am switching  ; to && maybe I will have to rearange the commands to make sense
22:59 osse Using cd changes the meaning of $PWD
22:59 xameada joined #git
22:59 theskillwithin what does export do?
22:59 osse Sets environment variables
22:59 ItalicAlec joined #git
23:00 theskillwithin osse the unset at the end is that part of making it work, or part of putting things back after we did it
23:00 osse Putting things back
23:01 theskillwithin prob after i get it working ill add a cd back to .. and git stash at the end so its back at master fresh
23:01 jaguarmagenta joined #git
23:01 afuentes joined #git
23:02 ItalicAlec hello all.  Question. I have some local files and a remote git repo. I'd like to push local files up into the empty, new git repo.  How do I do this?  Thanks Much.
23:02 vlt ItalicAlec: Create a local repo, add and commit the files, push to remote.
23:03 Sasazuka joined #git
23:03 mischat joined #git
23:05 theskillwithin lol osse  maybe github doesn't like what I am doing  http://kopy.io/5SQUM
23:06 * theskillwithin is googling
23:06 ItalicAlec hello all.  Question. I have some local files and a remote git repo. I'd like to push local files up into the empty, new git repo.  How do I do this?  Thanks Much.
23:07 vlt ItalicAlec: ^
23:07 theskillwithin first git clone remote repo
23:07 theskillwithin then add your new files
23:07 theskillwithin then git add -A
23:07 theskillwithin git commit -m "msg"
23:07 theskillwithin git push origin master
23:08 buffal0 joined #git
23:09 DJ_Spies_ joined #git
23:09 Rodya_ joined #git
23:09 Noldorin joined #git
23:11 ItalicAlec @theskillwithin these are website files.  Should I be inside web directory when I git clone or where?
23:11 theskillwithin ItalicAlec I was talking about cloning to your local computer
23:12 theskillwithin ItalicAlec what is the remote? is it github, bitbucket?
23:13 ItalicAlec @theskillwithin  it's AWS CodeCommit
23:13 Vgr joined #git
23:13 snthsnth joined #git
23:14 jaguarmagenta joined #git
23:16 theskillwithin idk how aws works.
23:17 theskillwithin you have + but don't know what git clone is?
23:17 ItalicAlec @theskillwithin.  it's basically exactly like any git repo server.  That's what AWS said.
23:18 theskillwithin makes sense
23:18 theskillwithin ya you should be able to  clone your repo locally
23:18 mablae__ joined #git
23:18 theskillwithin git clone (put provided url to repo)          so with github I do git clone git@github.com:damonbauer/npm-build-boilerplate.git     for example
23:18 dave0x6d joined #git
23:19 theskillwithin if you have ssh keys setup, otherwise use https
23:19 theskillwithin now you haz a clean repo locally,  once you dirty it with changes  you can commit those changes by saying git add -A   then git commit -m "msg here"      then you can push those changes back up git push origin master
23:20 ItalicAlec theskillwithin I thought when you run git clone <URL>/reponame that this will pull down files from the remote server into a folder locally.  is that not so?  So if I'm in /home/user/public_html and i run the git clone cmd, I get /home/user/public_html/REMOTEREPO
23:21 theskillwithin ItalicAlec  try something like this maybe        cd  /home/user/
23:21 theskillwithin git clone (REPO URL) public_html/
23:21 ItalicAlec theskillwithin: yah, I'm ok with that last set of cmds you sent.  I understand doing those steps.  It's just getting a local folder with files pushed up to a remote, empty repo.
23:21 theskillwithin I think that will now name your repo folder public_html/
23:21 ItalicAlec that's a bit confusing to me
23:21 theskillwithin are you using linux locally?
23:21 ItalicAlec theskillwithin.  will try now
23:21 ItalicAlec i am
23:21 ItalicAlec ubuntu
23:22 theskillwithin ah ok
23:23 theskillwithin you can even try having public_html being a folder INSIDE your repo if you want to store a build system in ur repo and that generates the public_html folder  and keep your repo 1 level higher in the folder structure of the server.  I have seen that before
23:23 theskillwithin just an option if you need it
23:23 theskillwithin thats if u just want to store stuff outside of public_html tho
23:23 Saxon1066 left #git
23:23 ItalicAlec hmmm, so that would end up being like /home/user/REPO/public_html  ???
23:23 theskillwithin otherwise you could .gitignore and use symbolic links to store stuff outside your git repo, say large folders you dont need in tehre
23:24 lightstalker joined #git
23:24 theskillwithin ItalicAlec   cd /home/user      git clone (REPO URL) public_html/               notice here at the end of my git clone statement I am specifying what folder name I want my repo to be cloned into
23:25 theskillwithin git cline git@github.com:damonbauer/npm-build-boilerplate.git public_html
23:25 theskillwithin I am on osx, I used to dual boot to ubuntu but then osx update broke dual boot =[
23:26 ItalicAlec I tried that but got the HELP reply with what the avialable arguments are.
23:26 theskillwithin https://github.com/robbyrussell/oh-my-zsh  this is nice, I think there is a way to use this with ubuntu cuz I have done it before.    then you can use these https://github.com/robbyrussell​/oh-my-zsh/wiki/Cheatsheet#git
23:26 ItalicAlec sorry, no
23:26 ItalicAlec I got ...
23:26 fatalhalt joined #git
23:26 ItalicAlec fatal: could not create work tree dir 'public_html'.: Permission denied
23:27 theskillwithin ItalicAlec hmm maybe public_html needs to be deleted first then it can create the new folder?  or maybe the other wqy around?   maybe  use sudo?  not sure  try some stuff out
23:27 Guest9 joined #git
23:27 theskillwithin brb
23:28 ItalicAlec hmm. ok, let me try with sudo.  would mv public_html (not delete)
23:29 tanuki_ joined #git
23:30 ItalicAlec working still... backing stuff basically.  :)
23:34 fuchstronaut joined #git
23:35 Noldorin joined #git
23:36 Megaf joined #git
23:37 ItalicAlec thanks much theskillwithin.  very much appreciate your assistance.  Having some issues here I need to deal with.  no success yet.
23:39 theskillwithin np
23:39 danimal2 joined #git
23:40 justanotheruser joined #git
23:41 thiefg joined #git
23:42 canuk joined #git
23:43 ahr3n_ joined #git
23:46 nd_ joined #git
23:46 pmartnhoj joined #git
23:46 pmartnhoj hi,  cloning a reasonably large repo (~5gb) is taking a long time (30 minutes so far) doing git pack-objects on the remote. Is this usual or is there anything I can do to speed this up?
23:48 mingrammer joined #git
23:49 thiefg pmartnhoj: is the clone happening at the speed of your internet connection or is it slower?
23:49 dodobrain joined #git
23:50 Derperperd joined #git
23:51 pmartnhoj it is over lan, 2xcpu at 100% on the remote and about 20mbit data
23:51 nsanden_ joined #git
23:54 thiefg pmartnhoj: do other (smaller) repos clone at a faster rate?
23:55 nsanden_ after a git pull, i want to copy some files around - if it matters, the use case is i have my project in /home/domain1/app/ and i want to copy the files from /home/domain1/app/web/ to /home/domain1/public_html (so that they become web accessible) - should i look into git hooks? my own bash script? how should i solve this?
23:56 pmartnhoj thiefg: yes, 9.25 MiB/s for a 40MB repo
23:59 thiefg pmartnhoj: so the 5gb is at 20Mb/s and the 40mb is 9MiB/s?
23:59 pmartnhoj yes

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