Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-11

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

All times shown according to UTC.

Time Nick Message
00:00 droidicus joined #git
00:00 sentriz joined #git
00:02 romerocesar joined #git
00:04 sesquipedalian joined #git
00:07 TurBoss left #git
00:07 Rodya_ joined #git
00:08 gumby joined #git
00:08 Infamous joined #git
00:09 kenansulayman joined #git
00:09 TurBoss joined #git
00:10 TurBoss thiego i found the problem
00:10 TurBoss they are symlinks
00:10 Literphor joined #git
00:10 Vgr_ joined #git
00:10 Vgr joined #git
00:11 gws_ osse: thanks for your help with the rebase/update-ref/whateverthatwas. I'm sure I accidentally did something strange to my repo that has a one-line fix if I only knew the problem  : p
00:13 thiago TurBoss: that would indeed be a problem
00:13 supsup joined #git
00:13 espindola joined #git
00:14 supsup can we ask questions about githubs api in here?
00:15 thiago supsup: no, use #github for that
00:15 supsup thanks
00:15 TurBoss left #git
00:17 raijin joined #git
00:22 anirudhj joined #git
00:22 supsup why can i store a .md file as a non-blob but a .rst file gets stored as a blob?
00:23 mischat joined #git
00:25 Eugene supsup - do you have nulls in it?
00:26 supsup unsure really i'm trying to read a file from github just notice some files are stored fine like .md files and others when i click on them they are in blobs
00:26 Eugene git actually stores both as a blob(it doesn't care about the contents), but the diff visualizer uses nulls as part of the "is it a binary" before outputting
00:28 supsup why can you access content that does not have blob in it's path easily (with path) but you have to  access stuff with blobs in it's path by sha?
00:28 supsup example:  https://github.com/datacenter/acitoolkit/blob/master/README.md   this is easy to retrieve
00:28 supsup this is hard:  https://github.com/datacenter/acitoolkit/blob/master/docs/source/introduction.rst
00:29 Eugene I don't see a SHA anywhere in your link ?
00:29 Eugene github's behaviour is not the same as git by itself, but I don't see anything out-of-place. Can you try explaining a different way maybe?
00:30 SwiftMatt joined #git
00:30 supsup i guess it's just github specific
00:30 supsup but the url changes to have blob in it
00:30 supsup even tho the path does not
00:30 Eugene Not here.
00:31 chris3492 If I install a newer version of git on my server will this cause an issue if the users dont change their version?
00:31 supsup you do not see blob after acitoolkit?
00:31 supsup o
00:31 supsup hurm
00:31 Eugene The URL schema looks the same for both
00:31 supsup yeah nm i guess i'm blind it's in front of readme also
00:31 Eugene !next
00:31 gitinfo Another satisfied customer. NEXT!
00:31 preaction chris3492: no
00:32 romerocesar joined #git
00:33 Eugene chris3492 - I'm not aware of any backwards-incompatible changes to the git protocol or repo format in a long time. It should be fine.
00:33 ensyde__ joined #git
00:33 watabou joined #git
00:37 zturner joined #git
00:43 IWishIKnew joined #git
00:44 maroloccio joined #git
00:45 watabou joined #git
00:45 maroloccio is there a git log view which shows me "how many commits back this was" (e.g. annotate with HEAD~34)
00:48 cdown joined #git
00:49 Schwarzbaer_ joined #git
00:54 interne7y joined #git
00:56 cosmicfires eclipse won't connect to my local git repository, any ideas?
01:00 CrypticGator joined #git
01:02 Wulf4 joined #git
01:03 romerocesar joined #git
01:03 Orbitrix joined #git
01:06 Eugene Alcohol.
01:07 cqi joined #git
01:08 doppo joined #git
01:08 texinwien joined #git
01:09 nevodka joined #git
01:13 JanC joined #git
01:18 fstd_ joined #git
01:19 pks joined #git
01:23 harish joined #git
01:23 romerocesar joined #git
01:33 romerocesar joined #git
01:36 jaguarmagenta joined #git
01:36 ajf- joined #git
01:37 drodger joined #git
01:37 GT joined #git
01:38 interne7y joined #git
01:38 skalpin I'll drink to that
01:39 kadoban joined #git
01:40 anirudhj joined #git
01:46 diogenese joined #git
01:46 fracting1 joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and comedy salvation | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git pull a day keeps the conflict's away
01:49 Goplat joined #git
01:49 jhass no
01:50 macwinne_ what would be in the new commit?
01:50 preaction macwinne_: !gcs explains details
01:50 gitinfo macwinne_: [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
01:51 macwinne_ cool, thanks!
01:52 v0n joined #git
01:55 CrypticGator joined #git
01:56 mizu_no_oto joined #git
01:59 Wulf4 joined #git
02:01 |2321 joined #git
02:02 drbean_ joined #git
02:05 d0nn1e joined #git
02:12 WaReZ joined #git
02:12 clemf joined #git
02:14 nilsi joined #git
02:18 preaction joined #git
02:21 chachasmooth joined #git
02:21 doppo joined #git
02:22 atomicb0mb joined #git
02:23 anu0 joined #git
02:27 rossome joined #git
02:27 z8z joined #git
02:28 d4rklit3 joined #git
02:33 romerocesar joined #git
02:34 fscala joined #git
02:34 ToBeCloud joined #git
02:38 skraito joined #git
02:38 skraito [09:32] <krptonite-leader> hi guys , come to ##krptonite and ##worldgamer
02:38 skraito [09:33] <krptonite-leader> i sold all 0x71 (xc) Our to all governor
02:38 skraito [09:33] <krptonite-leader> good luck to you
02:38 skraito [09:33] <krptonite-leader> if you don't want to come
02:38 hhee joined #git
02:38 Grimm_ joined #git
02:39 BSAlb joined #git
02:40 preaction i'd rather not
02:41 robogoat joined #git
02:43 cdown_ joined #git
02:44 romerocesar joined #git
02:45 chachasmooth joined #git
02:45 skraito left #git
02:48 doppo joined #git
02:50 linuxmint joined #git
02:53 hexagoxel joined #git
02:55 doppo joined #git
02:56 chachasmooth joined #git
02:56 cqi joined #git
03:09 Arsonide joined #git
03:14 romerocesar joined #git
03:16 raininja joined #git
03:20 JZA joined #git
03:21 k3rn31 joined #git
03:23 zh joined #git
03:24 linuxmint joined #git
03:26 zh left #git
03:26 eijk_ joined #git
03:27 Literphor joined #git
03:29 eletuchy joined #git
03:32 mehola joined #git
03:32 Sasazuka joined #git
03:35 justanotheruser joined #git
03:37 jaguarmagenta joined #git
03:41 interne7y joined #git
03:51 snits joined #git
03:52 k3rn31 joined #git
03:58 interne7y joined #git
03:58 shgysk8zer0 joined #git
04:08 fission6 joined #git
04:17 Literphor joined #git
04:18 Cabanossi joined #git
04:18 eletuchy joined #git
04:21 macwinne_ curious, when I have a modified, but I want to discard the modifications.. i see it says to do "git checkout -- <file>".. however, if I do "git checkout <file>" it seems to work the same
04:23 preaction macwinne_: -- is for safety when it just so happens you've got a file with the same name as a branch or tag
04:23 macwinne_ got it
04:23 preaction it's a divider between sets of arguments, and also says "i'm done with options"
04:24 macwinne_ so if git checkout without a branch or tag doesn't mess around with HEAD.. but when there is a branch or tag, then HEAD is modified?
04:25 preaction HEAD is a pointer to the current commit or ref checked out in the working tree. if you're using "git checkout <file>", it grabs the file from the commit pointed to by HEAD. if you're using "git checkout <commitish>", it makes your working tree look like that commitish and updates HEAD appropriately
04:27 linuxmint joined #git
04:28 macwinne_ ahh
04:28 macwinne_ thank you!
04:30 BombStrike joined #git
04:40 jennings joined #git
04:43 al-damiri joined #git
04:45 phaleth joined #git
04:47 tinajohnson___ joined #git
04:57 lordjancso joined #git
05:04 nilg joined #git
05:10 jaguarmagenta joined #git
05:15 romerocesar joined #git
05:17 Grimm_ joined #git
05:18 psprint joined #git
05:18 psprint Hello. A silly question: can I download only subdirectories when cloning? And then commit to subdirectories, pull normally?
05:19 kadoban psprint: Not really
05:22 Meow-J joined #git
05:22 psprint kadoban: you probably mean: git repo is set of blobs, one hardly can extract a path from all the blobs
05:24 psprint so maybe I can dowload only last commit, and then commit, update, pull without having to download previous references?
05:25 psprint s/commit, update, pull/commit, pull/
05:25 Sasazuka joined #git
05:26 Literphor joined #git
05:33 likewhoa joined #git
05:34 Motoko joined #git
05:35 romerocesar joined #git
05:39 svankmajer joined #git
05:39 svankmajer joined #git
05:40 Literphor left #git
05:42 psprint it's apparently the --depth=N option. Will I be able to pull to that repository?
05:46 thelesserevil joined #git
05:48 drodger joined #git
05:49 justanotheruser joined #git
05:50 abhishekr700 joined #git
05:52 abhishekr700 d
05:52 abhishekr700 ANyone here?
05:52 abhishekr700 I need help
05:53 drodger joined #git
05:54 freimatz joined #git
05:55 abhishekr700 Please respond if someone can help me...
05:58 harish_ joined #git
06:02 freimatz joined #git
06:03 Guest23972 joined #git
06:10 jaguarmagenta joined #git
06:12 jennings abhishekr700: Ask your question. If someone knows the answer, they'll share.
06:12 abhishekr700 Ok
06:12 abhishekr700 So here is what happened
06:12 abhishekr700 i used cm source and added my own features to make a custom kernel
06:13 abhishekr700 Now recently they changed their default branch and pushed so many commits that I cannot figure out where they added commits
06:13 abhishekr700 git pull
06:13 abhishekr700 in original cm source
06:13 abhishekr700 Took quite a time
06:13 abhishekr700 and downloaded about 600 mb
06:13 abhishekr700 so you can imagine
06:14 abhishekr700 that
06:14 abhishekr700 There are a lot of commits recently done
06:14 abhishekr700 instead of finding where the commits started
06:14 abhishekr700 I want to just fork the repo
06:14 robbyoconnor joined #git
06:14 abhishekr700 and add all commits from my custom kernel
06:15 abhishekr700 Is this possible
06:15 abhishekr700 ??
06:15 abhishekr700 +Jennings?
06:16 abhishekr700 Jennings : ?
06:22 jennings abhishekr700: When you say you "added your own features", I'm guessing you mean you made your own commits locally. What happens if you do "git pull origin <their-default-branch>"?
06:22 abhishekr700 Its not that
06:22 abhishekr700 I downloaded a zipbal of cm source
06:22 abhishekr700 then made a new repo
06:22 abhishekr700 and pushed commits there
06:23 abhishekr700 also I had their original cm source
06:23 abhishekr700 I did a git pull
06:23 abhishekr700 And I got lots of conflicts
06:23 abhishekr700 So I guess they changed many things
06:24 jennings what do you get if you run "git remote -v"?
06:24 bipolar joined #git
06:25 sauvin joined #git
06:25 abhishekr700 In which repo?
06:25 abhishekr700 Mine or the cm one
06:27 jennings If they changed a lot of things that conflict with what you changed, then there's not really any generic advice for that. You have to figure out how to resolve those conflicts.
06:28 abhishekr700 No
06:28 abhishekr700 I did git pull in the original repo
06:28 abhishekr700 the cm one
06:28 abhishekr700 I have that too on my pc
06:28 abhishekr700 I just wanted to update it
06:29 jennings What's the result of "git remote -v" in both repos?
06:29 abhishekr700 obviously
06:29 abhishekr700 the I get
06:29 abhishekr700 remote urls in both of respective repos
06:30 jennings paste it, please.
06:31 albel727 joined #git
06:33 dreiss joined #git
06:35 abhishekr700 abhishekr700@Xubuntu-64:~/android/Z00L_cmkernel$ git remote -v originhttps://www.github.com/abhishekr700/Z00L_cmkernel (fetch) originhttps://www.github.com/abhishekr700/Z00L_cmkernel (push) abhishekr700@Xubuntu-64:~/android/Z00L_cmkernel$
06:36 abhishekr700 for the cm one I get change in url
06:36 abhishekr700 https://github.com/Cyanogenmod/android_kernel_asus_msm8916
06:36 abhishekr700 both for fetch and push
06:37 dmitrij_9567 joined #git
06:37 dmitrij_9567 left #git
06:38 jennings When you're in the Cyanogenmod repo, and you do "git pull origin master", what happens?
06:40 abhishekr700 I just did it
06:41 abhishekr700 It downloaded about 600 mb of data
06:41 Rish joined #git
06:41 abhishekr700 then returned so many conflicts
06:41 abhishekr700 that they couldnt fir on terminal screen
06:43 jennings If you have "master" checked out and there are conflicts, that means you made some commits in the Cyanogenmod repo, so you have to resolve them.
06:44 jennings The conflicts are specific to the changes you made, so I can't really help you solve them.
06:46 elastix joined #git
06:47 dmitrij_4586 joined #git
06:47 abhishekr700 Can you just tell me how do I cherry pick all commits from a repo
06:47 mase-tech joined #git
06:47 fscala joined #git
06:48 wrouesnel1 joined #git
06:49 jennings The command is "git cherry-pick", the instructions how to use it are here: https://git-scm.com/docs/git-cherry-pick
06:49 abhishekr700 I mean all commits
06:49 jennings But I don't think that's what you want to do. You'll still have conflicts. If you and they both made changes to the same lines, git can't resolve that for you.
06:50 bipolar joined #git
06:54 bipolar joined #git
06:54 ketas joined #git
06:58 Fijit joined #git
06:59 subhojit777 joined #git
07:10 dmitrij joined #git
07:11 dmitrij left #git
07:21 ynanm joined #git
07:23 ediz__ joined #git
07:23 WayToDoor joined #git
07:24 ahmedelgabri joined #git
07:24 ediz__ joined #git
07:28 Bmw-01 joined #git
07:32 circ-user-0DHXl joined #git
07:41 mohabaks joined #git
07:41 emPi joined #git
07:42 lvns joined #git
07:45 stuh84 joined #git
07:49 mangolisk joined #git
07:49 nilg` joined #git
07:52 harish joined #git
08:00 a3Dman joined #git
08:00 a3Dman joined #git
08:03 a3Dman joined #git
08:03 toogley joined #git
08:08 PCatinean joined #git
08:09 dopesong joined #git
08:13 GavinMagnus joined #git
08:15 ocbtec joined #git
08:17 fees joined #git
08:17 MattMaker joined #git
08:17 ketas- joined #git
08:18 ceaucari joined #git
08:18 bruce_lee joined #git
08:19 watabou joined #git
08:19 xbob joined #git
08:24 mariuscc joined #git
08:27 paul424 joined #git
08:27 jagob joined #git
08:27 ecksit joined #git
08:29 a3Dman joined #git
08:31 jbitdrop joined #git
08:40 vuoto joined #git
08:43 nilsi_ joined #git
08:45 dkpi joined #git
08:45 jaguarmagenta joined #git
08:47 subhojit777 joined #git
08:48 cdown joined #git
08:49 david007 joined #git
08:54 piling_ joined #git
08:55 tjone270 joined #git
08:59 hiennaj joined #git
09:05 __name__ joined #git
09:07 nwkj86 joined #git
09:09 cyan__ joined #git
09:14 keltvek joined #git
09:16 muthu joined #git
09:23 Ali2 joined #git
09:24 stuh84 joined #git
09:27 vuoto joined #git
09:28 phanimahesh joined #git
09:29 BW^- joined #git
09:29 BW^- "You are in 'detached HEAD' state. You can look around, make experimental"
09:29 BW^- so I clone a repo from the net, and make a checkout to a branch and then make a checkout to a particular commit (I guess the latter reverses all consequences of the further), which happens to be the newest one in that branch even
09:30 vuoto_ joined #git
09:30 mdw joined #git
09:30 BW^- what's the detached HEAD fuss about?
09:30 BW^- (*remove fuss)
09:32 moobee joined #git
09:32 fahadash joined #git
09:33 david007 joined #git
09:35 GavinMagnus left #git
09:38 romerocesar joined #git
09:43 lvns joined #git
09:44 osse BW^-: !detached
09:44 gitinfo BW^-: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
09:44 osse it sounds worse than it is
09:49 vuoto__ joined #git
09:49 BW^- umm
09:49 BW^- osse: and.. what does it mean?
09:49 BW^- umm
09:49 BW^- you mean the "HEAD commit" of a branch??
09:49 moontear joined #git
09:49 osse !HEAD
09:49 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
09:50 osse HEAD is always the current commit.
09:50 osse Yes, the tips of branches are sometimes called heads, but never HEADs
09:50 flavius joined #git
09:51 moontear New to git - I know rewriting public history is bad idea, but it is my personal fork. I want to REMOVE a previous commit that I already pushed
09:51 osse moontear: how far back is it? have there been merges in the mean time?
09:52 moontear I tried: git rebase -p --onto SHA^ SHA but somehow it doesn't do anything than "rebasing ..." and that's pretty much it, when I do a git push afterwards it says everything is up to date
09:52 moontear no. more pushes into another branch
09:52 vuoto joined #git
09:53 moontear https://github.com/moontear/foogallery/commits/feature/justified-gallery-wordpress-thumbnails << I want to remove the commit d5893b2
09:53 vuoto joined #git
09:53 ome joined #git
09:54 moontear I also tried: git push origin HEAD, but somehow none of these commands "do" anything
09:54 osse moontear: you want git rebase -i SHA^
09:54 osse mark the offending commit as 'drop' instead of 'pick', or just delete the line. save and close.
09:56 moontear funny thing is that I cannot see the commit in rebase
09:56 osse are you sure you did SHA^ and not SHA ?
09:56 moontear i did mark it as drop in my first try at rebasing
09:56 moontear as far as I remember
09:57 osse so it is gone then
09:57 osse try !lgg
09:57 osse i mean !lol
09:57 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
09:58 moontear and there it still is ;-)
09:58 moontear * d5893b2 (HEAD -> master, origin/master, origin/HEAD)
09:59 moontear when I do git rebase -i d5893b2^ all i get is "More?" in the cmd
09:59 moontear when I use the full SHA, I get an empty editor with noop
09:59 vuoto joined #git
10:01 osse moontear: ah cmd
10:01 osse moontear: git rebase -i HEAD~
10:01 osse shgit
10:01 osse moontear: git rebase -i d5893b2~
10:01 osse moontear: in cmd  ^  is used to escape newlines
10:02 osse don't use cmd. think of the children.
10:02 moontear fokkin a
10:02 osse since the only commit you want to remove is the newest one you can also  git reset --hard HEAD~
10:02 moontear thought everything is so well integrated. it even starts vim... didn't know about the ^
10:03 moontear yes I can see the commit now and can change to to drop
10:04 moontear after rebasing I need to do a push -f correct?
10:08 romerocesar joined #git
10:11 moontear it's gone! awesome. Really didn't know about ^
10:11 moontear Thanks people
10:15 Ediz joined #git
10:16 artemisart joined #git
10:16 interne7y joined #git
10:19 romerocesar joined #git
10:21 jaguarmagenta joined #git
10:23 anu1 joined #git
10:23 mdw joined #git
10:24 Psychiatrist joined #git
10:28 Gloomy joined #git
10:33 ahmedelgabri joined #git
10:39 wicope joined #git
10:40 wicope Hi missing Change-Id in commit message footer http://pastebin.com/YbAq641P Please Thanks
10:41 nilsi joined #git
10:41 bremner wicope: that's a message specific to that repo setup. You should consult the admin / docs if that error message is not clear
10:43 wicope i am the admin .. i am noob admin. I answer what you ask
10:44 davisonio joined #git
10:47 belak joined #git
10:47 bremner wicope: then I guess it's your fault for setting up that hook on the server.
10:48 bremner wicope: what is your question then?
10:48 vuoto joined #git
10:49 cbreak wicope: ignore it
10:49 wicope bremner: thanks for help me. well, my problem is related with git and gerrit. https://review.typo3.org/Documentation/user-changeid.html
10:50 bremner I have no idea about gerrit.
10:50 wicope cbreak, hi.
10:51 wicope bremner, no problem, thanks
10:51 cbreak if you can't ignore it, read it
10:51 DirtyCajun joined #git
10:53 acetakwas joined #git
10:57 WayToDoor joined #git
10:58 maxorator joined #git
10:58 k3rn31 joined #git
10:59 DARSCODE joined #git
11:00 diogenese joined #git
11:03 Balliad joined #git
11:06 aavrug joined #git
11:08 acetakwas joined #git
11:09 romerocesar joined #git
11:13 netcarver joined #git
11:15 david007 joined #git
11:15 Oebele joined #git
11:15 k3rn31 joined #git
11:16 SonikBoom joined #git
11:17 interne7y joined #git
11:18 david002 joined #git
11:18 digidog joined #git
11:19 pol123456 joined #git
11:23 WaReZ joined #git
11:24 raijin joined #git
11:29 romerocesar joined #git
11:35 watabou joined #git
11:43 ecksit joined #git
11:46 robotroll joined #git
11:47 robotroll joined #git
11:52 marksei joined #git
11:52 Corneliu joined #git
11:55 m0viefreak joined #git
11:56 mdw joined #git
11:58 magneticduck joined #git
12:00 romerocesar joined #git
12:00 linuxmint joined #git
12:05 allcentury joined #git
12:11 Gloomy joined #git
12:17 vuoto joined #git
12:18 interne7y joined #git
12:18 ronny joined #git
12:18 ronny hi
12:18 osse my name is
12:18 sdothum joined #git
12:21 synthmeat joined #git
12:21 abhishekr700 joined #git
12:22 jaguarmagenta joined #git
12:24 raininja joined #git
12:25 espindola joined #git
12:27 JanC joined #git
12:28 circ-user-vFkn9 joined #git
12:29 JanC joined #git
12:31 docnvk joined #git
12:36 watabou joined #git
12:39 linuxmint joined #git
12:42 cqi joined #git
12:45 infra-red joined #git
12:46 Eryn_1983_FL hi guys
12:48 GavinMagnus joined #git
12:48 osse Is your name Eryn? Were you born in Florida in 1983?
12:49 Eryn_1983_FL no Alaska in 1959..
12:49 osse Interesting
12:49 Balliad joined #git
12:50 shinnya joined #git
12:50 osse What can we do for you today?
12:50 romerocesar joined #git
12:50 Eryn_1983_FL well i almost had a question on timeouts for git, but then i realized it was ssh which needed the time out, and i found the solution to that..
12:51 Eryn_1983_FL since i got a shell script calling git pull origin localhost.lan
12:51 Eryn_1983_FL and it needs to timeout it i am not on locallan
12:51 Eryn_1983_FL anyways my second question is how do i make a branch my default ?
12:52 osse what do you mean?
12:52 Eryn_1983_FL for a remote branch?
12:52 Eryn_1983_FL like my master is for origin
12:53 osse do you mean remote tracking branch?
12:53 osse Oh
12:54 osse you have to change where HEAD points in the remote repo
12:56 GavinMagnus left #git
12:56 ravenzz joined #git
12:56 dopesong joined #git
12:58 DistantStar joined #git
13:01 mdw joined #git
13:02 infra-re_ joined #git
13:05 davisonio joined #git
13:09 k3rn31 joined #git
13:10 romerocesar joined #git
13:11 Eryn_1983_FL yeah it is the tracking
13:11 nilsi_ joined #git
13:11 Eryn_1983_FL got it working now woot
13:11 pwnawannab[NE] joined #git
13:12 DolpheenDream joined #git
13:15 fons joined #git
13:15 fons left #git
13:17 McNozes joined #git
13:18 espindola joined #git
13:26 vuoto joined #git
13:27 vuoto joined #git
13:35 madewokherd joined #git
13:37 watabou joined #git
13:37 vuoto joined #git
13:44 Ntemis joined #git
13:44 Ntemis hi
13:44 Ntemis i need some help pulling patches from webpage
13:44 ecksit joined #git
13:44 lvns joined #git
13:44 Ntemis can anyone help me out?
13:45 Ntemis like this e.g http://lists.infradead.org/pipermail/linux-arm-kernel/2016-June/433155.html
13:49 ceaucari joined #git
13:50 fahadash joined #git
13:50 wviana joined #git
13:51 romerocesar joined #git
13:54 subhojit_ joined #git
13:58 Gamecubic joined #git
13:59 mdw joined #git
14:01 cdg joined #git
14:03 magneticduck Ntemis: infradead appears ultradead
14:04 magneticduck or some equilivant joke
14:04 vuoto joined #git
14:05 davisonio joined #git
14:08 kenansulayman joined #git
14:10 isxek joined #git
14:13 Inari- joined #git
14:13 Ntemis magneticduck: lol
14:16 liamonade joined #git
14:16 justanotheruser joined #git
14:18 interne7y joined #git
14:20 Anupkumar joined #git
14:22 Ahmed90 joined #git
14:22 jost_ joined #git
14:23 jaguarmagenta joined #git
14:24 Jackneill joined #git
14:25 barteks2x joined #git
14:28 jaguarma_ joined #git
14:31 mangolisk joined #git
14:37 k3rn31 joined #git
14:37 GavinMagnus joined #git
14:39 GavinMagnus left #git
14:40 netj joined #git
14:41 romerocesar joined #git
14:42 GavinMagnus joined #git
14:42 happy-dude joined #git
14:52 Bizl joined #git
14:53 paul424 joined #git
14:56 The-Compiler joined #git
14:56 The-Compiler left #git
14:58 espindola joined #git
14:59 diegoaguilar joined #git
15:01 GavinMagnus joined #git
15:02 mikecmpbll joined #git
15:04 leeN joined #git
15:04 cdg joined #git
15:08 fscala joined #git
15:09 denimsoft joined #git
15:10 mikecmpbll joined #git
15:13 blackwind_123 joined #git
15:15 fission6 joined #git
15:24 dopesong joined #git
15:25 dreiss joined #git
15:26 thiago joined #git
15:26 netj joined #git
15:27 Goplat joined #git
15:34 yqt joined #git
15:34 kpease joined #git
15:35 Lunatrius joined #git
15:39 vuoto joined #git
15:39 CheckDavid joined #git
15:39 watabou joined #git
15:39 ahmedelgabri joined #git
15:41 zivester joined #git
15:45 ecksit joined #git
15:46 lvns joined #git
15:48 Rysiu22 joined #git
15:48 acetakwas joined #git
15:49 Rysiu22 left #git
15:53 GavinMagnus left #git
15:54 GavinMagnus joined #git
16:00 ncthom91 joined #git
16:02 romerocesar joined #git
16:04 mdw joined #git
16:07 ncthom91 joined #git
16:12 danmackay joined #git
16:14 mda1 joined #git
16:18 diogenese joined #git
16:18 tomog999 joined #git
16:19 interne7y joined #git
16:19 roentgen joined #git
16:20 Stath joined #git
16:20 watabou joined #git
16:21 dreiss joined #git
16:22 romerocesar joined #git
16:28 denimsoft joined #git
16:31 geoid joined #git
16:37 InfoTest joined #git
16:38 diegoviola joined #git
16:38 espindola joined #git
16:42 acetakwas joined #git
16:42 ccha4 joined #git
16:43 romerocesar joined #git
16:44 watabou joined #git
16:44 clemf joined #git
16:45 denimsoft joined #git
16:47 jaguarmagenta joined #git
16:48 ays joined #git
16:52 shinnya joined #git
16:53 Stath joined #git
16:53 Aso joined #git
16:55 fahadash joined #git
16:56 d0nn1e joined #git
16:58 khmarbaise joined #git
17:00 texinwien joined #git
17:09 vuoto joined #git
17:11 diegoaguilar joined #git
17:11 zturner joined #git
17:13 lvns joined #git
17:13 rgrinberg joined #git
17:13 k3rn31 joined #git
17:13 mand0 joined #git
17:16 Gloomy joined #git
17:16 ceaucari joined #git
17:20 romerocesar joined #git
17:20 __name__ joined #git
17:21 astrofog joined #git
17:21 ochorocho__ joined #git
17:22 jaguarmagenta joined #git
17:22 mellernoia joined #git
17:23 _W_ joined #git
17:26 ahmedelgabri joined #git
17:31 sol56 joined #git
17:36 GavinMagnus joined #git
17:36 Inari- left #git
17:36 GavinMagnus left #git
17:37 yqt joined #git
17:38 drodger joined #git
17:38 trewe joined #git
17:41 m_antis joined #git
17:42 clemf joined #git
17:44 lvns joined #git
17:44 axiom_1 joined #git
17:47 drodger joined #git
17:52 diegoaguilar joined #git
17:53 diegoaguilar joined #git
17:53 ctcrnitv joined #git
17:54 ciampix joined #git
17:56 sdothum joined #git
17:56 DolpheenDream joined #git
17:58 kadoban joined #git
18:00 Gloomy joined #git
18:01 polyzen joined #git
18:03 sdothum joined #git
18:03 mdw joined #git
18:04 rahtgaz joined #git
18:06 mand0_ joined #git
18:06 sdothum joined #git
18:08 sdothum joined #git
18:09 romerocesar joined #git
18:09 mikecmpbll joined #git
18:10 dan2k3k4 joined #git
18:13 sdothum joined #git
18:14 spudowiar joined #git
18:15 geoid joined #git
18:16 paul424 Ok. my upstream development branch is ahead about 10 commits
18:16 sdothum joined #git
18:16 paul424 how do I rebase my origin development to be sync with the previous ?
18:19 irco joined #git
18:23 anu0 joined #git
18:25 mand0 joined #git
18:26 ajf- joined #git
18:28 ahmedelgabri joined #git
18:31 lvns joined #git
18:31 NeverDie joined #git
18:32 GGMethos joined #git
18:33 fission6 joined #git
18:35 cdown_ joined #git
18:35 geoid joined #git
18:38 paul424 naah forget I found out  myself
18:38 romerocesar joined #git
18:41 digidog joined #git
18:42 multi_io joined #git
18:46 nilg joined #git
18:47 espindola joined #git
18:49 kpease joined #git
18:55 ahmedelgabri joined #git
19:00 paul424 joined #git
19:07 ochorocho__ joined #git
19:10 ciampix joined #git
19:13 romerocesar joined #git
19:14 jazn joined #git
19:15 gavin joined #git
19:17 cdown_ joined #git
19:19 vuoto joined #git
19:20 mdw joined #git
19:20 d4rklit3 joined #git
19:21 King_Hual joined #git
19:24 qpdb joined #git
19:24 phanimahesh joined #git
19:25 mohabaks joined #git
19:26 davisonio joined #git
19:31 mikecmpbll joined #git
19:32 diegoviola joined #git
19:35 lvns joined #git
19:36 geoid joined #git
19:37 sebhoss joined #git
19:38 vuoto joined #git
19:39 Neon1024x joined #git
19:42 drodger joined #git
19:43 romerocesar joined #git
19:44 Ahmed90 joined #git
19:47 sebhoss_ joined #git
19:48 Froziph joined #git
19:50 espindola joined #git
19:54 vuoto joined #git
19:56 diogenese joined #git
19:57 subhojit777 joined #git
19:58 watabou joined #git
19:59 geoid joined #git
20:03 AlexRussia joined #git
20:04 toogley joined #git
20:06 Zarthus_ joined #git
20:07 irco joined #git
20:07 rahtgaz joined #git
20:07 Elysia joined #git
20:11 rgrinberg joined #git
20:12 jamick joined #git
20:14 romerocesar joined #git
20:16 vuoto joined #git
20:17 Kicer86 joined #git
20:18 xanadu_ joined #git
20:21 interne7y joined #git
20:22 yqt joined #git
20:22 davisonio joined #git
20:26 fnodeuser joined #git
20:27 eletuchy joined #git
20:29 mdw joined #git
20:33 fnodeuser left #git
20:34 romerocesar joined #git
20:36 lvns joined #git
20:40 ojdo joined #git
20:45 droidicus joined #git
20:50 ToBeCloud joined #git
20:51 IWishIKnew joined #git
20:52 italoacasas joined #git
20:53 khmarbaise_ joined #git
20:53 khmarbaise_ joined #git
20:54 romerocesar joined #git
20:54 kus joined #git
20:54 SimonNa joined #git
20:58 elastix joined #git
20:59 cdown_ joined #git
20:59 watabou joined #git
21:01 DolpheenDream joined #git
21:08 espindola joined #git
21:09 hhee joined #git
21:10 eijk joined #git
21:11 cdown__ joined #git
21:11 acetakwas joined #git
21:14 romerocesar joined #git
21:15 lvns joined #git
21:16 cdown_ joined #git
21:18 GavinMagnus joined #git
21:22 Infamous joined #git
21:22 gmh joined #git
21:25 romerocesar joined #git
21:25 m0viefreak joined #git
21:26 cdown joined #git
21:29 tgunr joined #git
21:30 bruce_lee joined #git
21:30 mehola joined #git
21:31 rgrinberg joined #git
21:31 ochorocho__ joined #git
21:36 fii joined #git
21:37 fii Hi, one of the projects I work with I pull from github, remove a folder, and symlink the folder's name to an outside directory. This isn't really much work, but I was curious if there was a way to optimize the flow. I've tried stashing the change, but apparently symlinks and git dont git along
21:40 MattMaker joined #git
21:42 ahmedelgabri joined #git
21:43 mdw joined #git
21:44 stevenbenner joined #git
21:44 osse fii: git stores the symlink itself.
21:44 osse !config
21:44 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
21:44 romerocesar joined #git
21:45 mdw_ joined #git
21:45 joki joined #git
21:46 Winter_ joined #git
21:47 Rodya_ joined #git
21:47 rahtgaz joined #git
21:48 fii Can I store the deletion of the folder, then apply a "patch" somehow?
21:48 grawity yeah, that's what `git commit` does
21:50 acetakwas joined #git
21:56 nichi_ joined #git
21:58 ajf- joined #git
22:01 dreiss joined #git
22:04 sctskw joined #git
22:06 arooni joined #git
22:10 linuxmint joined #git
22:11 acetakwas joined #git
22:12 neunon joined #git
22:15 romerocesar joined #git
22:16 watabou joined #git
22:19 Rodya_ joined #git
22:21 skylite joined #git
22:22 interne7y joined #git
22:25 doktori joined #git
22:25 denimsoft joined #git
22:26 lovers joined #git
22:29 cbreak fii: what patch?
22:29 alanwill joined #git
22:31 fii cbreak: not literally, I think. Whenever I update I do a hard reset, pull from origin, delete the folder, then symlink to my "locally changed" folder
22:31 cbreak sounds stupid
22:31 fii was just curious if i could automate the last part with a commit or patch of some sort
22:31 cbreak why not commit your changes?
22:31 fii because FILES ARE BEHIND A SYMLINK
22:31 fii or something like that
22:31 fii i forget exactly what the error is
22:32 cbreak so?
22:32 cbreak git can track symlinks
22:32 diegoviola joined #git
22:32 fii do you have to enable something for it? it doesn't even let me make the commit
22:32 cbreak nope
22:32 GavinMagnus left #git
22:32 cbreak it'll work just fine
22:33 cbreak make a symlink, git add, git commit, done
22:33 cbreak you can then push your commit
22:33 cbreak and everyone else that clones it gets that symlink too
22:33 cbreak obviously, make the symlink relative, to some other directory in the repository
22:34 fii "error: 'private/README.md' is beyond a symbolic link
22:34 fii fatal: Unable to process path private/README.md"
22:34 fii this is what i get
22:34 fii when i try to add
22:34 cbreak duh, of course
22:34 cbreak you've added the symlink
22:34 cbreak git will track the SYMLINK ITSELF
22:35 cbreak git will NOT track anything outside its repository
22:35 fii right
22:35 fii im not sure how to "add the symlink" to be tracked though
22:35 cbreak git add
22:37 fii oh
22:37 fii OH
22:37 ochorocho__ joined #git
22:37 fii ok i see
22:37 fii im commiting making the symlink, then,
22:39 fii then i should just be able to let the commit sit, and when i do git pull --rebase it will grab all the remote ones, then apply mine on top (that deletes the folder and adds the symlink)
22:41 cbreak fii: if the contents of the directory change, it'll be a conflict though
22:44 tref joined #git
22:45 romerocesar joined #git
23:00 xbob joined #git
23:03 Rodya_ joined #git
23:04 cdown_ joined #git
23:04 Grimm_ joined #git
23:05 romerocesar joined #git
23:09 kpease joined #git
23:09 rkazak joined #git
23:09 tristanp joined #git
23:10 zturner joined #git
23:14 alanwill_ joined #git
23:20 skunkz joined #git
23:26 mdw joined #git
23:28 tristanp joined #git
23:28 drodger joined #git
23:29 interne7y joined #git
23:31 mattfoo joined #git
23:32 KnightsOfNi joined #git
23:33 shgysk8zer0 joined #git
23:34 fscala joined #git
23:35 aviraldg_ joined #git
23:37 aviraldg_ joined #git
23:37 aviraldg_ joined #git
23:44 alanwill joined #git
23:49 mablae__ joined #git
23:49 mikecmpbll joined #git
23:50 ajf- joined #git
23:50 NeverDie joined #git
23:51 sangy joined #git
23:54 alanwill_ joined #git
23:54 romerocesar joined #git

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