Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-24

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

All times shown according to UTC.

Time Nick Message
00:01 chardan joined #git
00:02 Levex joined #git
00:02 dreiss joined #git
00:03 Vampire0_ joined #git
00:03 MattMaker joined #git
00:04 Vampire0 Munt, just force-push the branches?
00:06 whaley joined #git
00:09 unreal_ joined #git
00:09 Munt I'm trying to switch back to my main branch and update it to a merge from anohter branch.   when I try to checkout master, it says. Your branch and 'lightscript_controller/master' have diverged, and have 5 and 5 different commits each, respectively.
00:10 Munt I'm a little lost
00:13 jnewt joined #git
00:13 mellernoia joined #git
00:13 NeverTired joined #git
00:14 Munt I have it to a point I can work now.  Thanks!!  Stil confused :p
00:15 xissburg joined #git
00:17 boubou joined #git
00:22 pfrench joined #git
00:23 Vampire0_ joined #git
00:24 inovas joined #git
00:24 griffindy joined #git
00:26 anuxivm left #git
00:31 overlord_tm joined #git
00:35 JanC_ joined #git
00:35 DarkPsydeLord joined #git
00:42 inovas joined #git
00:42 humboldt joined #git
00:47 matoro joined #git
00:49 marenz joined #git
00:49 Sasazuka__ joined #git
00:50 thiago joined #git
00:51 hahuang65 joined #git
00:52 raynold joined #git
00:53 jstimm joined #git
00:55 cqi joined #git
00:56 cqi joined #git
01:02 chipotle_ joined #git
01:03 rkazak joined #git
01:04 ebrasca joined #git
01:04 jstimm joined #git
01:04 MattMaker joined #git
01:04 ebrasca how I can change server of git repo?
01:08 pur3eval joined #git
01:10 roelmonnens joined #git
01:12 ebrasca how I can change server of git repo?
01:13 krainboltgreene Is there a way to pull from the parent branch without being specific?
01:13 krainboltgreene $ git pull --merge --parent --commit
01:13 zzz joined #git
01:15 shinnya joined #git
01:16 ebrasca git remote set-url origin ... don't work
01:17 whaley joined #git
01:18 lowercaseman joined #git
01:18 rj1 joined #git
01:19 Vampire0 ebrasca, !repro
01:19 gitinfo ebrasca: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
01:19 Vampire0 krainboltgreene, what do you mean by "not being specific"?
01:20 krainboltgreene Like, `get pull origin master`, specifies the master branch, and if I'm on `new-profiles` branch it merges master -> new-profiles
01:20 livingstn joined #git
01:20 krainboltgreene But what if I want to do this across multiple repositories programatically?
01:20 krainboltgreene And they don't have the same "core" branch name.
01:21 krainboltgreene IE I have AR, BR, and CR repository, AR has a "master" branch, BR has a "develop" branch, and CR has a "foot" branch as their core branches.
01:21 ebrasca Vampire0: what ?
01:21 krainboltgreene In the case of BR if I `git pull origin develop`, it works fine, but what if BR has a "master" and a "develop". If I'm in the master branch, I accidentally just merged develop into master.
01:22 Levex joined #git
01:22 krainboltgreene Basically, how do make git merge in the current branch's parent branch without knowing the parent branch's name?
01:23 duderonomy joined #git
01:23 ebrasca Vampire0: http://ix.io/nJK
01:26 ebrasca Vampire0: In magit i have http://ix.io/nJL .
01:27 mischat joined #git
01:32 ebrasca joined #git
01:32 basiclaser joined #git
01:33 ebrasca Vampire0: http://ix.io/nJK
01:33 ebrasca Vampire0: In magit i have http://ix.io/nJL
01:33 NeXTSUN joined #git
01:34 ebrasca Vampire0: http://ix.io/nJK
01:34 ebrasca Vampire0: In magit i have http://ix.io/nJL
01:36 ebrasca Vampire0: Sorry I have lost internet.
01:37 ToBeCloud joined #git
01:38 DolpheenDream joined #git
01:38 jon-mac joined #git
01:39 matoro joined #git
01:39 chigang joined #git
01:41 mikecmpbll joined #git
01:42 ebrasca Vampire0: Are you here?
01:42 Vampire0 krabat, `git pull` if you mean the tracked branch when you say parent barnch
01:42 Vampire0 ebrasca, sorry, was distracted, one moment
01:43 canuk joined #git
01:43 Vampire0 ebrasca, but no need to post the same links three times o_O
01:44 ebrasca Vampire0: I have lost internet connection.
01:44 ebrasca Vampire0: I am not sure if it is send.
01:44 Vampire0 ebrasca, It was, three times ;-)
01:45 Vampire0 ebrasca, so what's the problem, looks fine to me
01:45 ebrasca Vampire0: How to update new repo?
01:45 ebrasca It say it is up to date but it is not.
01:45 Vampire0 ebrasca, are you after man git fetch?
01:45 gitinfo ebrasca: the git-fetch manpage is available at http://jk.gs/git-fetch.html
01:46 kbs joined #git
01:46 Vampire0 You just set the remote URL but did not fetch its contents
01:46 Vampire0 So the tracking branches are of course still the one from the old URL
01:47 Vampire0 ebrasca, btw. just if you don't know, you can also add 20 different remotes with different URLs, no need to change the URL of one remote if you wan to use both remotes from time to time
01:49 ebrasca Vampire0: Why I need mote than 1 repo?
01:49 ffilozov joined #git
01:49 acidjnk22 joined #git
01:50 cdesai joined #git
01:51 menip joined #git
01:52 Vampire0 ebrasca, however you like
01:52 ebrasca Vampire0: is this what I need "git fetch origin" ?
01:52 menip joined #git
01:53 Vampire0 ebrasca, just `git fetch` is enough, but yes, `git fetch origin` will also work
01:53 pfrench joined #git
01:54 gugah joined #git
01:54 Munt joined #git
01:55 ebrasca Vampire0: https://git.parabola.nu/pa​ckages/l-system.git/refs/
01:55 skift joined #git
01:55 ebrasca Vampire0: it say  "Repository seems to be empty"
01:56 ebrasca Vampire0: I have done "git fetch".
01:57 JanC_ joined #git
01:58 mikecmpbll joined #git
01:58 Munt joined #git
01:58 nickabbey joined #git
01:59 nickabbey joined #git
02:00 pfrench joined #git
02:01 brent__ joined #git
02:02 Rodya_ joined #git
02:02 svm_invictvs joined #git
02:02 Vampire0 ebrasca, who says this? !repor
02:02 Vampire0 ebrasca, who says this? !repro
02:02 gitinfo ebrasca: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
02:04 jameser joined #git
02:05 ebrasca Vampire0: I have done "git fetch".
02:05 MattMaker joined #git
02:06 ebrasca Vampire0: And push to origin/master with magit(emacs).
02:06 ebrasca Vampire0: It is all.
02:08 ebrasca Vampire0: https://gist.github.com/offby1/2415442 don't work for me.
02:08 clemf_ joined #git
02:10 Gustavo6046 joined #git
02:10 ebrasca Vampire0: Thanks you. It is only lag.
02:11 ebrasca Vampire0: It work. Thank you.
02:11 xissburg_ joined #git
02:11 jstimm joined #git
02:12 Vampire0_ joined #git
02:12 ebrasca Bye my family.
02:13 finalbeta joined #git
02:13 not-an-aardvark left #git
02:13 kritzikratzi joined #git
02:14 kritzikratzi kadoban: hi. was i talking to you earlier about git-hooks? (closed my irc client and lost the history)
02:16 kritzikratzi if yes, i looked into this a bit more. and it seems there is a much simpler solution: git grep --cached --color=always “error“.
02:17 kritzikratzi if i’m not missing anything, this allows you to get rid of all the stashing/applying, also it is a LOT faster on big repos (i needed something faster because i have ~1gb of untracked data in a repo, so blindly grepping everything is not an option for me)
02:19 ShapeShifter499 joined #git
02:20 Sasazuka joined #git
02:22 duderonomy joined #git
02:29 mischat joined #git
02:30 User458764 joined #git
02:31 cqi joined #git
02:34 elisa87 joined #git
02:35 elisa87 basically I am not a git guru so I wonder if you have an idea? What I want to do is grabbing the lines from yours and maintaining the lines the "playing for data" person has written for an older version of a git repo (v 0.27)? I don't even if that is possible to do this for v 0.33. Do you have any insight? like there is a file xyz.cpp that you have added new lines or functionalities that helps with bug fixes. Also that person has added some line
02:36 offtopik- joined #git
02:41 Darren_ joined #git
02:41 atomi joined #git
02:46 Vampire0 elisa87, your message ends with "Also that person has added some line"
02:46 Vampire0 elisa87, but it sounds a bit like you are after man git cherry-pick
02:46 gitinfo elisa87: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
02:46 d^sh joined #git
02:46 Wulf4 joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a3 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:51 Cabanossi joined #git
02:53 dsantiago joined #git
02:53 nettoweb1 joined #git
02:54 go1111111 joined #git
02:55 pks joined #git
02:56 SwiftMatt joined #git
02:57 mizu_no_oto joined #git
02:58 UniFreak joined #git
02:58 cdown joined #git
02:59 aavrug joined #git
03:00 strugee joined #git
03:02 Micah_ joined #git
03:03 ojdo joined #git
03:06 MattMaker joined #git
03:06 clemf joined #git
03:06 fstd_ joined #git
03:08 matoro joined #git
03:09 pfrench joined #git
03:09 watabou joined #git
03:10 Andrew_K joined #git
03:12 Andrew_K joined #git
03:12 chachasmooth joined #git
03:13 hexagoxel joined #git
03:14 salamanderrake joined #git
03:14 pfrench joined #git
03:15 prg3 joined #git
03:17 Vortex34 joined #git
03:19 dreiss joined #git
03:19 pfrench joined #git
03:23 rchavik joined #git
03:24 orbyt_ joined #git
03:25 krainboltgreene No, not the tracked branch.
03:25 krainboltgreene Is there a git term that means "parent branch"?
03:29 mischat joined #git
03:32 MattMaker joined #git
03:33 pfrench joined #git
03:38 rgrinberg joined #git
03:41 Emperor_Earth joined #git
03:44 navidr joined #git
03:44 pfrench joined #git
03:46 xall joined #git
03:47 aw1 joined #git
03:48 rewt krainboltgreene, there is no concept of a "parent branch"
03:51 sunri5e joined #git
03:51 rewt git doesn't even track which branch was "active" when a commit was made... a branch is simply a pointer to a commit node, and when you make a commit, it makes the new commit's parent the commit pointed to by the branch, and updates the branch to point to the new commit
03:55 livingstn joined #git
03:59 xall joined #git
04:00 elsevero joined #git
04:02 Electrometro joined #git
04:02 justanotheruser joined #git
04:02 a_thakur joined #git
04:04 roelmonnens joined #git
04:05 rj1 joined #git
04:05 Cthalupa joined #git
04:06 Rodya_ joined #git
04:08 pks joined #git
04:09 xall joined #git
04:11 gelei007 joined #git
04:11 Electrometro joined #git
04:11 xall joined #git
04:14 Electrometro joined #git
04:16 clickjack joined #git
04:21 offtopik left #git
04:21 marmot1123 joined #git
04:25 zeroed joined #git
04:25 zeroed joined #git
04:26 pfrench joined #git
04:26 Motoko joined #git
04:26 rwb joined #git
04:28 aspiers joined #git
04:28 elisa87 git people, I tried to provide as much details as possible http://stackoverflow.com/questions/4243​0776/adding-the-lines-of-code-added-fro​m-an-older-branch-to-the-newest-version please let me know if you might need more details added
04:30 mischat joined #git
04:31 ebrasca-afk left #git
04:32 Electrometro joined #git
04:33 pfrench joined #git
04:33 Electrometro joined #git
04:38 MrWoohoo joined #git
04:41 pfrench joined #git
04:42 brent__ joined #git
04:42 brent__ joined #git
04:43 Electrometro joined #git
04:44 Gsham joined #git
04:45 muldover joined #git
04:47 ayogi joined #git
04:47 Electrometro joined #git
04:48 Guest2735 joined #git
04:48 Whitelye joined #git
04:51 gtristan joined #git
04:52 jstimm joined #git
04:52 MattMaker joined #git
04:53 Cabanoss- joined #git
04:56 BombAw joined #git
04:56 pks joined #git
04:56 Electrometro joined #git
04:57 BombAw left #git
04:58 ShekharReddy joined #git
04:59 matoro joined #git
05:00 dermoth joined #git
05:01 pfrench joined #git
05:02 dsdeiz joined #git
05:04 pfrench joined #git
05:05 PaulCape_ joined #git
05:05 nickabbey joined #git
05:06 __rgn joined #git
05:06 zeroed joined #git
05:06 zeroed joined #git
05:07 Rodya_ joined #git
05:10 pfrench joined #git
05:10 Electrometro joined #git
05:18 Anja_ joined #git
05:21 imack joined #git
05:25 pfrench joined #git
05:29 pfrench joined #git
05:31 mischat joined #git
05:34 a_thakur joined #git
05:34 howdoi joined #git
05:35 pfrench joined #git
05:35 pks joined #git
05:40 a_thakur joined #git
05:41 ckruczek joined #git
05:41 a_thakur joined #git
05:42 ckruczek any thoughts on the new sha-1 hash collision attack?
05:42 ckruczek https://shattered.it/
05:42 Gsham joined #git
05:43 preaction it would be infeasible to use against git repos, which has always been known
05:43 pfrench joined #git
05:44 ckruczek just to be curious, they stated something different, did you read the part about git? I am just interessted in your thoughts and the technical details behind it and why it would be infeasible against git repos.
05:44 mehola joined #git
05:48 hexagoxel joined #git
05:50 orbyt_ !lol
05:50 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
05:51 Goplat joined #git
05:51 gelei007 joined #git
05:52 Vampire0_ joined #git
05:52 pfrench joined #git
05:52 _ikke_ ckruczek: see topic
05:53 ckruczek ahhh didn't realized this, thx _ikke_
05:53 svm_invictvs joined #git
05:56 cluelessperson joined #git
06:00 Darren_ joined #git
06:02 pfrench joined #git
06:02 rlb left #git
06:03 go1111111 joined #git
06:03 elisa87 joined #git
06:04 jstimm joined #git

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