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
06:06 Electrometro joined #git
06:06 bocaneri joined #git
06:06 overlord_tm joined #git
06:08 pfrench joined #git
06:08 Rodya_ joined #git
06:08 User458764 joined #git
06:10 zeroed joined #git
06:10 zeroed joined #git
06:10 dec0n joined #git
06:10 bufferoverflow joined #git
06:11 Electrom_ joined #git
06:11 theoceaniscool joined #git
06:15 Eugene !sha1
06:15 gitinfo You shouldn't worry about collisions of object hashes as an attack vector against git. There is a higher probability that every member of your programming team will be eaten by wolves in unrelated incidents on the same night than a meaningful malicious collision will be constructed without the aid of the NSA.
06:15 _ikke_ Eugene: \o/
06:15 durre joined #git
06:15 Eugene I'm updating it
06:16 bufferoverflow joined #git
06:16 qt-x joined #git
06:17 lordjancso joined #git
06:17 Eugene .trigger_edit sha1 Git's usage of SHA1 hashes is largely immune to collisions because it includes a file-length header. Other protections and an eventual update to a new hashing algorithm are planned. http://marc.info/?l=git&m=148787047422954
06:17 gitinfo Eugene: Okay.
06:18 Eugene Should I still add a funny?
06:18 llamapixel lol @ wolves
06:18 Peng Planned when?
06:19 Eugene Ask Joey.
06:19 Eugene .trigger_edit sha1 Git's usage of SHA1 hashes is largely immune to collisions because it includes a file-length header. Other protections and an eventual update to a new hashing algorithm are planned. http://marc.info/?l=git&m=148787047422954. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
06:19 gitinfo Eugene: Okay.
06:20 humboldt joined #git
06:21 _ikke_ I think Brian is doing more concrete work then anyone else
06:21 Eugene I'm not even subscribed to the list anymore
06:21 Eugene I have a dayjob and shit
06:21 ckruczek lol
06:21 ckruczek 'and shit'...that was the best part
06:22 lowercaseman joined #git
06:22 svm_invictvs joined #git
06:22 User458764 joined #git
06:22 Electrometro joined #git
06:22 _ikke_ I have separated the patches out from the rest
06:23 venmx joined #git
06:23 Eugene I rest soundly at night knowing that out there somewhere, somebody smarter than me is going to fix the problems.
06:24 Darren_ joined #git
06:27 nidr0x joined #git
06:29 Electrom_ joined #git
06:30 Peng Are they? They should've dropped SHA-1 in 2005.
06:32 mischat joined #git
06:35 bufferoverflow joined #git
06:35 sbulage joined #git
06:35 afuentes joined #git
06:36 Electrometro joined #git
06:37 pfrench joined #git
06:37 KekSi joined #git
06:40 Guest82 joined #git
06:41 Electrom_ joined #git
06:42 pfrench joined #git
06:43 fatalhalt joined #git
06:43 Balliad joined #git
06:45 a_thakur joined #git
06:46 Eugene Patches welcome
06:48 jamie_1 joined #git
06:48 pfrench joined #git
06:49 Electrometro joined #git
06:49 jimsio joined #git
06:49 jamie_1 hey, is there a way to merge two branches manually... like pick and choose which changes i want?
06:50 ckruczek !cherrypick ?
06:50 waveclaw joined #git
06:51 jamie_1 well example, I have master and branchB, branchB has one large commit, with a lot of changes in it but has caused some issues with the software. I wanted to see if its possible when merging to master to only choose specific changes eg changes on lines 152-170 and 190-206
06:52 jamie_1 is that even possible?
06:52 jamie_1 or do i need to do that by hand in the files?
06:52 Electrom_ joined #git
06:53 ckruczek split the huge commit in branchB if not pushed already and apply the changes step by step
06:53 ckruczek git rebase -i is your friend for splitting the commit
06:53 jamie_1 its already committed... should i roll back and do it split?
06:53 jameser joined #git
06:54 ckruczek already commited or pushed?
06:54 jamie_1 pushed
06:54 Raging_Hog joined #git
06:55 ThatBob9001 joined #git
06:57 Electr___ joined #git
06:58 jamie_1 nvm... after looking at the code... all he did was clean it up... :/ so i might as well just leave it and let him do whatever and some commits i like ill cherry pick
06:58 Electrom_ joined #git
06:59 Nickeeh joined #git
06:59 ckruczek ok
07:00 Electrometro joined #git
07:00 Rodya_ joined #git
07:03 pfrench joined #git
07:03 clemf joined #git
07:03 Sample joined #git
07:04 xall joined #git
07:06 Electrometro joined #git
07:08 ronskisika joined #git
07:10 lb1c joined #git
07:10 Electrom_ joined #git
07:11 zeroed joined #git
07:11 basiclaser joined #git
07:11 snowalpaca joined #git
07:12 pfrench joined #git
07:13 alexandre9099 joined #git
07:17 roelmonnens joined #git
07:17 Electro__ joined #git
07:21 dorkmafia joined #git
07:21 Nickeeh How can I list all changes to a single file? I'm looking at 'git log -p -a -- file' but the last changes don't match my current working directory.
07:21 Nickeeh Specifically, some lines are removed (containing 'CAD STL') but I can't find the commit removing those lines.
07:22 dorkmafia I'm trying to add a git convience command I created git-foo it's on my path and I can call it via git-foo but I was hoping I'd be able to call it via git foo (no space)
07:22 a_thakur joined #git
07:22 Nickeeh The lines are not in the document anymore, but the last change shows addition of the line, not removal.
07:22 Anja_ joined #git
07:22 dorkmafia I could add an alias to my .gitconfig but I was wondering if there is a better way
07:25 Maxdamantus joined #git
07:25 venmx joined #git
07:25 BlackFox left #git
07:27 Electrometro joined #git
07:27 pfrench joined #git
07:28 peterbecich joined #git
07:29 jnavila joined #git
07:31 zeroed joined #git
07:31 zeroed joined #git
07:32 pfrench joined #git
07:33 mischat joined #git
07:37 mischat joined #git
07:37 pfrench joined #git
07:38 govg joined #git
07:40 durre joined #git
07:40 AciD- joined #git
07:41 King_Hual joined #git
07:42 djb-irc joined #git
07:43 d0nn1e joined #git
07:43 dreiss joined #git
07:44 acetakwas joined #git
07:44 elect joined #git
07:45 sieve joined #git
07:45 pfrench joined #git
07:46 JeroenT joined #git
07:49 pfrench joined #git
07:50 MattMaker joined #git
07:51 sarri joined #git
07:51 sarri joined #git
07:53 pfrench joined #git
08:00 jagob joined #git
08:01 Rodya_ joined #git
08:01 pfrench joined #git
08:01 jameser joined #git
08:01 metalraiden34 joined #git
08:02 nunchuck joined #git
08:02 kexmex joined #git
08:02 watabou joined #git
08:02 djb-irc joined #git
08:05 Tobbi joined #git
08:06 TomyWork joined #git
08:06 theoceaniscool joined #git
08:07 pfrench joined #git
08:08 jas4711 joined #git
08:12 Electrometro joined #git
08:12 Dumblez0r joined #git
08:12 gareppa joined #git
08:13 a_thakur joined #git
08:13 venmx joined #git
08:15 hhee joined #git
08:17 a_thakur joined #git
08:21 sgfgdf joined #git
08:22 Severin42 joined #git
08:22 sgfgdf hello, guys! is it possible to extract a subdirectory from a git project and import it as a separate repo and keep the history related only  to the files in that directory?
08:23 watabou joined #git
08:26 chachasmooth joined #git
08:27 moei joined #git
08:27 pfrench joined #git
08:29 marcan sgfgdf: you can use filter-branch: https://help.github.com/articles/splittin​g-a-subfolder-out-into-a-new-repository/
08:31 pur3eval joined #git
08:32 GodGinrai joined #git
08:33 govg joined #git
08:34 pfrench joined #git
08:35 overlord_tm joined #git
08:36 lb1c !talk
08:36 gitinfo [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jessica Kerr: Git basics, descriptional)
08:38 pfrench joined #git
08:40 a_thakur joined #git
08:43 elsevero joined #git
08:47 ShapeShifter499 joined #git
08:49 ShapeShifter499 joined #git
08:49 Spinkzeit joined #git
08:49 kurkale6ka joined #git
08:49 flaviodesousa joined #git
08:50 ShapeShifter499 joined #git
08:50 ljc joined #git
08:51 MattMaker joined #git
08:53 mrom joined #git
08:56 User458764 joined #git
08:57 rumble joined #git
08:58 diogenese joined #git
08:59 AJ3X joined #git
08:59 joshszep joined #git
09:00 leeN joined #git
09:02 dersand joined #git
09:03 Rodya_ joined #git
09:04 fmeerkoetter joined #git
09:04 pfrench joined #git
09:04 heroux joined #git
09:05 a_l_e joined #git
09:07 sieve joined #git
09:07 orbyt_ joined #git
09:07 peterbec` joined #git
09:07 bongjovi joined #git
09:07 Snugglebash joined #git
09:08 roelmonn_ joined #git
09:10 Seveas sgfgdf: git-subtree can help with that too.
09:11 Seveas Nickeeh: git log -p -S 'CAD STL' -- file
09:11 Nickeeh Seveas: yeah it's.. not in there.
09:11 Nickeeh Seveas: same changes. I can't find the removal of that line.
09:12 Seveas try adding a --cc in case of evil merges
09:12 Seveas or a --follow in case of renames
09:13 Nickeeh Seveas: with 'git log -p -a --follow --cc -S'CAD STL'' I get a lot of merges, but they don't show a patch.
09:13 pfrench joined #git
09:13 Nickeeh The last patch still only shows the moving of that line (one removal, one addition)
09:14 dvaske joined #git
09:15 fewspider joined #git
09:15 Taikibansei joined #git
09:17 marcogmonteiro joined #git
09:19 cdg joined #git
09:20 zeroed joined #git
09:20 mablae joined #git
09:22 jstimm joined #git
09:24 omegak left #git
09:25 nettoweb joined #git
09:26 snits` joined #git
09:26 Nugget_ joined #git
09:26 redeemed joined #git
09:27 acidjnk22 joined #git
09:28 AJ3X joined #git
09:29 AJ3X joined #git
09:31 selckin joined #git
09:32 seni1 joined #git
09:36 pfrench joined #git
09:40 sz0 joined #git
09:42 troulouliou_div2 joined #git
09:42 sgfgdf marcan: thank you very much!
09:43 sgfgdf Seveas: how it should be used in order to ectract the sub directory only?
09:43 clmsy joined #git
09:45 mischat joined #git
09:47 chll_ joined #git
09:47 s1scha joined #git
09:48 Seveas sgfgdf: man git-subtree, search for the 'split' subcommand
09:48 mischat joined #git
09:49 sgfgdf Seveas: thank you!
09:49 aard_ joined #git
09:51 irqq joined #git
09:52 MattMaker joined #git
09:53 dvsmkv joined #git
09:54 tvw joined #git
09:55 Vaelatern joined #git
09:56 pfrench joined #git
09:59 bruce_lee joined #git
10:02 pie_ joined #git
10:09 xall_ joined #git
10:11 scarcry joined #git
10:11 marenz joined #git
10:12 ferr1 joined #git
10:17 Snugglebash joined #git
10:17 pfrench joined #git
10:19 sieve1 joined #git
10:20 pur3eval joined #git
10:20 a_thakur joined #git
10:22 pfrench joined #git
10:25 iamashishkebab3 joined #git
10:25 iamashishkebab3 hi, how can I reset a branch (not my head) without checking it out? I would have thought this possible but I find no documentation
10:26 canton7 iamashishkebab3, you can do 'git branch -f branch newcommit'
10:27 kexmex joined #git
10:28 pfrench joined #git
10:28 davimore_ joined #git
10:28 whaley joined #git
10:29 iamashishkebab3 thanks canton7 :)
10:30 acidjnk joined #git
10:31 Levex joined #git
10:32 peterppp joined #git
10:32 peterppp left #git
10:33 GodGinrai joined #git
10:39 marcogmonteiro joined #git
10:42 mischat joined #git
10:42 pfrench joined #git
10:45 nd_ joined #git
10:45 User458764 joined #git
10:51 pie_ joined #git
10:53 MattMaker joined #git
10:53 ReenignE joined #git
10:53 ReenignE joined #git
10:54 nothingnew joined #git
11:03 oskarkv joined #git
11:03 Tobbi joined #git
11:04 Rodya_ joined #git
11:05 Nilesh_ joined #git
11:06 explody joined #git
11:06 Darcidride joined #git
11:15 notebox joined #git
11:17 pfrench joined #git
11:21 sbulage joined #git
11:22 mischat joined #git
11:22 metalraiden34 joined #git
11:24 pie_ joined #git
11:26 venmx joined #git
11:31 freimatz joined #git
11:32 heroux joined #git
11:32 zeroed joined #git
11:32 zeroed joined #git
11:36 pfrench joined #git
11:41 sbulage joined #git
11:45 kritzikratzi joined #git
11:48 a_thakur joined #git
11:48 a_thakur joined #git
11:50 pfrench joined #git
11:51 alzagros joined #git
11:51 alzagros i'm utterly confused
11:52 alzagros i type git status, and i see two lists of files: a list that says "modified but will not be committed", and a list that says "untracked".... i would assume that the former is "tracked". why would git not commit a thing if it is tracked?
11:53 alzagros git status
11:53 alzagros On branch master
11:53 alzagros Your branch is up-to-date with 'origin/master'.
11:53 alzagros Changes not staged for commit:
11:53 alzagros (use "git add <file>..." to update what will be committed)
11:53 alzagros (use "git checkout -- <file>..." to discard changes in working directory)
11:53 osse alzagros: use "git add <file>..." to update what will be committed
11:53 osse try it on a file and see what git status says then
11:54 MattMaker joined #git
11:54 alzagros those files that i add them, will be listed under this new list:
11:54 alzagros Changes to be committed:
11:54 alzagros (use "git reset HEAD <file>..." to unstage)
11:55 osse yes
11:55 osse now, what is the confusion exactly
11:55 ntonjeta joined #git
11:55 nellicus_ joined #git
11:56 ntonjeta left #git
11:56 alzagros if i do not 'git add' a file, will it be untracked?
11:56 nettoweb joined #git
11:56 alzagros that is my confusion
11:57 bremner no. there are three lists from git status, because there are three possibilities
11:57 bremner previously committed files are also tracked.
11:57 alzagros yeah that confuses me. i thought there is only two: 1) tracked, 2) not tracked. but now there is a 3rd 3) tracked but not staged!
11:58 bremner well, it's part of every git tutorial.
11:58 alzagros when will get add a file in "tracked but unstaged"? is it when i recreate a file?
11:59 osse alzagros: when you modify it
11:59 osse so that the file no longer corresponds to the committed version
11:59 nettoweb joined #git
11:59 alzagros but if i 'git commit -a' it will add them all tracked ones automatically  --- right?
11:59 notebox joined #git
11:59 osse yes
12:00 alexandre9099 joined #git
12:01 jameser joined #git
12:02 alzagros osse: so i should 'git add' twice? once to track, and once to stage?
12:02 grawity joined #git
12:02 osse no
12:03 osse use git add on *changes*, whether that change means adding a new file or modifying an existing file
12:03 alzagros but it seems twice. i 'git add' to track. then during the life time as i keep editing files, i 'git add' again to stage
12:04 osse well if you look at it like that you have to use git add ten or a thousand times
12:04 osse once a file is tracked you don't have to "re-track" it
12:05 rnsanchez joined #git
12:05 Rodya_ joined #git
12:05 alzagros yes
12:05 alzagros osse: but it's 'git add' again, not 'get stage'
12:06 osse yes
12:06 bremner some things you just have to get used to
12:06 osse because add is used on changes of any kind
12:06 osse you add a change
12:07 alzagros i guess this confused me.
12:07 osse it could have been named 'stage'
12:07 osse in fact!!
12:07 chipotle joined #git
12:07 osse you can write 'git stage file'
12:07 alzagros :D
12:07 bremner osse: as an alias? or some bleeding edge thing?
12:07 alzagros well then the git output should be 'git stage'.. it's confusing how the git output says 'git add'
12:07 alzagros bremner: man git-stage
12:07 gitinfo bremner: the git-stage manpage is available at http://jk.gs/git-stage.html
12:08 alzagros This is a synonym for git-add(1). Please refer to the documentation of that
12:08 alzagros ^ says the man
12:08 bremner ah, I just don't have it in zsh completion
12:08 alzagros now it will be mega confusing if git says "file is not tracked, please use git stage"
12:08 osse bremner: neither.
12:08 alzagros i use gentoo with bash and i have it
12:09 humboldt joined #git
12:09 pur3eval joined #git
12:09 durre joined #git
12:10 osse bremner: it's been a literal synonym for add since as early as 2011. didn't bother blaming further :P
12:10 osse bremner: https://github.com/git/git/blob/master/git.c#L494
12:10 bremner huh. Bad zsh.
12:10 osse i'm not sure you're supposed to use it...
12:11 masuberu joined #git
12:12 osse or maybe you are: https://github.com/git/git/commit/119​20d28da1ac1b65eb4041c1b7355924e5d1366
12:12 pfrench joined #git
12:12 blackwind_123 joined #git
12:14 grift joined #git
12:15 Munt joined #git
12:15 zeroed joined #git
12:16 osse alzagros: anyway, in any stage (lol) of the process git status will tell you what to do
12:16 PioneerAxon joined #git
12:16 osse read it carefully, read it often, and rejoice
12:17 alzagros i think git could have been very easy should it only had more intuitive argument names :D
12:17 alzagros some historical argument against git is that you need to be super genius to use it. it's super easy imo, just weird arg names
12:17 osse add = add changes to the next commit
12:17 osse \o/
12:18 Vampire0 alzagros, which arg names do you think are weird? I think they are pretty obvoius
12:18 alzagros add = add files to be tracked
12:18 Vampire0 s/obvois/obvious/
12:18 Vampire0 alzagros, that is not correct, Git does not track files
12:18 alzagros Vampire0: for staging i think it should be git stage, and git add should not work
12:18 Vampire0 alzagros, git tracks content that happens to be stored in files
12:19 bremner way to make things less confusing ;)
12:19 Vampire0 alzagros, that's also why you cannot version empty directories, they have no content
12:19 Vampire0 alzagros, git add adds changes to content to the next commit, be it additions, deletions or modifications
12:19 Vampire0 alzagros, you just have to embrace that git tracks content, not files
12:19 alzagros why addint content is not different than staging content.
12:20 alzagros adding*
12:21 dviola joined #git
12:21 marcogmonteiro joined #git
12:21 pfrench joined #git
12:21 Vampire0 alzagros, the index or stage is the collection of changes that make the next commit
12:21 Vampire0 alzagros, git add adds changes to the index aka stage
12:22 delboy1978uk joined #git
12:23 delboy1978uk urgh, ive screwed up a merge, can anyone help? i have a local git, a central remote, and a remote dev server. i merged in a branch and pushed it, but i want to revert
12:25 delboy1978uk do i just do a hard reset back a few commits? or are the merge commits all mixed through
12:25 delboy1978uk ?
12:28 thebird joined #git
12:31 qqx delboy1978uk: If it was a single merge command there would be only 1 merge commit. Resetting to before that would work the same as with any other commit.
12:32 tvw joined #git
12:32 delboy1978uk qqx: HEAD^^^ is three commits back, right?
12:32 xall joined #git
12:33 _ikke_ delboy1978uk: HEAD~3 would be easier to write
12:33 delboy1978uk ah you can do that too? thanks _ikke_
12:33 qqx Yes. But I'd advise using `git show` with that before resetting to it.
12:33 _ikke_ delboy1978uk: But for a merge, you only need to go back one commit
12:33 GodGinrai joined #git
12:33 delboy1978uk if i screw up i can delete the branch and check it out again from origin
12:33 _ikke_ delboy1978uk: also man git reflog
12:33 gitinfo delboy1978uk: the git-reflog manpage is available at http://jk.gs/git-reflog.html
12:34 delboy1978uk _ikke_: yeah they stupidly have composer vendor code in the repo too, i had to run composer update after the merge, but its still a bit messy so i'm gonna reset
12:36 delboy1978uk haha, 2 commits
12:36 * delboy1978uk git pulls again
12:37 delboy1978uk git reset --hard HEAD~2
12:37 delboy1978uk :-P
12:37 dorkmafia joined #git
12:37 delboy1978uk ok, i now need to push and force this to origin?
12:37 humboldt joined #git
12:38 gtristan joined #git
12:39 pfrench joined #git
12:40 jameser joined #git
12:42 tlaxkit joined #git
12:47 DolpheenDream joined #git
12:48 Tobbi joined #git
12:48 Impaloo joined #git
12:49 Shakeel__ joined #git
12:49 gunnaro joined #git
12:51 pfrench joined #git
12:52 peacememories joined #git
12:54 MattMaker joined #git
12:54 mischat joined #git
12:55 sieve joined #git
12:55 pfrench joined #git
12:56 mischat joined #git
12:58 sieve1 joined #git
12:59 sieve1 joined #git
13:02 synthroid joined #git
13:03 jameser joined #git
13:03 User458764 joined #git
13:06 GavinMagnus joined #git
13:06 Rodya_ joined #git
13:07 pfrench joined #git
13:07 re1 joined #git
13:11 Tobbi joined #git
13:11 livingstn joined #git
13:12 MrMojit0 joined #git
13:13 pks joined #git
13:14 govg joined #git
13:16 dgonzo joined #git
13:16 nevodka joined #git
13:16 Levex joined #git
13:16 finalbeta joined #git
13:20 oleksiyp joined #git
13:20 wagle joined #git
13:20 MineCoins joined #git
13:21 mkoskar joined #git
13:22 Tobbi joined #git
13:24 sieve joined #git
13:25 pfrench joined #git
13:26 venmx joined #git
13:28 canuk joined #git
13:31 troulouliou_div2 joined #git
13:35 jeffreylevesque joined #git
13:37 Tobbi joined #git
13:38 Snugglebash joined #git
13:39 j7k6 joined #git
13:42 CAPRA-MAU joined #git
13:42 CAPRA-MAU left #git
13:42 jameser joined #git
13:44 mischat joined #git
13:44 pks joined #git
13:45 mizu_no_oto joined #git
13:46 Vampire0 joined #git
13:48 mischat joined #git
13:50 jameser joined #git
13:51 pie_ joined #git
13:55 MattMaker joined #git
13:58 pur3eval joined #git
13:59 bannakaf_ joined #git
14:00 jameser joined #git
14:02 GodGinrai joined #git
14:02 mischat_ joined #git
14:03 Gsham joined #git
14:03 Levex joined #git
14:07 Rodya_ joined #git
14:08 jameser joined #git
14:08 Virox #git bros. Why when I type `git checkout ma` then hit tab do I get this output? `warning: ignoring broken ref refs/remotes/origin/HEAD`
14:09 Tobbi joined #git
14:09 jast Virox: probably you have outdated metadata, try this: git remote set-head origin -a
14:09 nickabbey joined #git
14:10 jast this can happen if the default branch changes in the upstream repository and the original default branch gets deleted
14:10 hasc joined #git
14:10 livingstn joined #git
14:11 UniFreak joined #git
14:12 UniFreak joined #git
14:12 nhennenfent joined #git
14:13 Virox Awesome. Thanks dude. that makes sense
14:13 Virox We did delete the upstream
14:15 livingstn joined #git
14:15 CheckDavid joined #git
14:16 marcogmonteiro joined #git
14:16 CEnnis91 joined #git
14:17 netj joined #git
14:20 mns joined #git
14:21 MattMaker joined #git
14:23 nhennenfent Good morning! I have a git question about what to do with a very out of date development branch that I would like to start using again... Thanks!
14:23 kbs joined #git
14:23 mizu_no_oto joined #git
14:24 ShekharReddy joined #git
14:25 wizeman joined #git
14:26 jimi_ joined #git
14:27 DarkPsydeLord joined #git
14:27 Droolio joined #git
14:27 plasticle joined #git
14:29 skunkz joined #git
14:31 Tobbi joined #git
14:31 Gloomy joined #git
14:31 mischat joined #git
14:33 Olipro joined #git
14:33 metalraiden34 joined #git
14:34 Snugglebash joined #git
14:34 Muzer joined #git
14:35 reynierpm joined #git
14:35 reynierpm hello there
14:36 reynierpm I have the following line in my .gitignore file `oneview_symfony/vendor/` although when I run git status I can see files like this one `oneview_symfony/vendor/twig/twig/lib​/Twig/Node/Expression/Unary/Pos.php` ready to be added, why?
14:36 reynierpm what's wrong in my rule?
14:37 shinnya joined #git
14:37 ToBeCloud joined #git
14:39 MattMaker joined #git
14:39 delboy1978uk left #git
14:40 notebox joined #git
14:40 pfrench joined #git
14:41 kpease joined #git
14:42 chipotle joined #git
14:43 nedbat nhennenfent: you can either just use it as is, or likely you will want to rebase your work so that is based on the latest stable stuff.
14:44 nhennenfent I am trying to figure out if I am going to have severe merge conflicts before I actually do the merge...
14:44 nhennenfent or rebase...
14:45 nhennenfent the master branch has had a lot of changes while my development branch sat idle :(
14:45 bannakaffalatta joined #git
14:46 Dougie187 joined #git
14:46 moritz just do the merge, and see how many conflicts you get
14:46 moritz and then git merge --abort
14:46 nettoweb joined #git
14:47 nhennenfent sounds good :) thanks
14:47 avarab There's a command you can use without even doing that
14:47 nhennenfent ?
14:48 avarab dug this up from an old e-mail I sent:
14:48 avarab git merge-tree $(git merge-base 31d02ae 53bdd92) 31d02ae 53bdd92 | grep -e '^\+======='; echo $?
14:48 avarab that's how you can check if merging those two trees (2x sha1s there) would conflict)
14:49 nhennenfent cool, I am going to experiment with that... :) thanks
14:52 griffindy joined #git
14:53 AvidWolf43 joined #git
14:53 AvidWolf43 hi guys
14:53 gitinfo AvidWolf43: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
14:53 synthroid joined #git
14:54 Levex joined #git
14:54 mischat_ joined #git
14:54 PioneerAxon joined #git
14:55 AvidWolf43 totally new at git, basically i created an account at bitbucket, created and cloned a repo to my local machine, created some files and folders, then did git add * git commit -m "new files" git push and got the message saying "your branch is up to datenothing to commit tree clean
14:55 AvidWolf43 what am i doing wrong?
14:55 mischat_ joined #git
14:55 dminuoso left #git
14:56 nod joined #git
14:57 bannakaf_ joined #git
14:58 mischat joined #git
14:58 pur3eval joined #git
14:59 AvidWolf43 lively bunch here
15:01 notebox joined #git
15:02 Rodya_ joined #git
15:03 al-damiri joined #git
15:04 netj joined #git
15:04 nickabbe_ joined #git
15:04 moritz AvidWolf43: hard to tell from a distance. What does "git status" say?
15:08 metalraiden34 joined #git
15:09 Shakeel_ joined #git
15:12 LeBlaaanc joined #git
15:13 Vampire0_ joined #git
15:13 sharkz joined #git
15:15 peacememories joined #git
15:18 bvcosta joined #git
15:19 clickjack joined #git
15:20 yottabyte joined #git
15:20 yottabyte whenever I do "git fetch," I see a lot of errors in certain branches like "error: cannot lock ref 'refs/remotes/origin/feature/RCI-203': ref refs/remotes/origin/feature/RCI-203 is at 05cf719a64ab721013aa5026d44e849338000f1f but expected f7360a693353b4dad8cb04e09912750ca506787f  ! f7360a6..f0cfed4  feature/RCI-203 -> origin/feature/RCI-203  (unable to update local ref)"
15:20 mahakal joined #git
15:20 yottabyte then I have to do "git gc --prune=now" and then git fetch succeeds. anyone know why?
15:20 Murii_ joined #git
15:21 livingstn joined #git
15:21 eroux joined #git
15:21 yottabyte pull does the same thing
15:22 dsdeiz joined #git
15:22 dsdeiz joined #git
15:25 ash_workz joined #git
15:25 tlaxkit joined #git
15:25 rvgate joined #git
15:25 dreiss joined #git
15:27 venmx joined #git
15:28 a3Dman joined #git
15:28 Levex joined #git
15:29 nettoweb joined #git
15:29 AvidWolf43 moritz: thanks i figured it out, i created directories but not files and that is why it wasnt doing anything
15:30 mahakal joined #git
15:30 zeroed joined #git
15:33 Murii_ joined #git
15:34 dave0x6d joined #git
15:34 robotroll joined #git
15:35 peacememories joined #git
15:37 ash_workz joined #git
15:39 Vampire0 joined #git
15:39 dviola joined #git
15:42 Tobbi joined #git
15:44 Murii_ joined #git
15:45 Murii_ joined #git
15:46 felixjet joined #git
15:47 roelmonnens joined #git
15:47 shgysk8zer0_ joined #git
15:47 a3Dman joined #git
15:48 salamanderrake joined #git
15:48 mahakal joined #git
15:49 nickabbey joined #git
15:50 kadoban joined #git
15:51 rgrinberg joined #git
15:51 todd_dsm joined #git
15:51 scottjl joined #git
15:53 matoro joined #git
15:53 ThomasTang joined #git
15:54 jamie_1 joined #git
15:56 livingstn joined #git
15:58 marenz joined #git
15:59 dorkmafia joined #git
16:00 g_zen joined #git
16:00 marenz joined #git
16:01 jdl joined #git
16:02 jost_ joined #git
16:02 sunrunner20 joined #git
16:02 jameser joined #git
16:02 sunrunner20 Is there a way to add history below/past the start of a fit repository
16:03 sunrunner20 Somebody converted all of our code from vss by pulling the current version and then making that the start of the repo
16:03 crose joined #git
16:03 sunrunner20 Instead of using one of several tools to confer with history intact
16:03 sunrunner20 I'm looking to go back and add that history
16:04 clemf joined #git
16:05 ghoti joined #git
16:07 roelmonnens joined #git
16:08 pur3eval joined #git
16:08 dedicated joined #git
16:08 Darren_ joined #git
16:08 madewokherd joined #git
16:10 i7c sunrunner20, sure. You could just import the history and rebase/cherry pick the other "already imported" commit(s) ontop of it.
16:10 i7c Might have to do some manual fiddling because the initial commit has no parent. Not sure.
16:11 i7c But shouldn’t be hard, if even.
16:11 e14 joined #git
16:12 imack joined #git
16:13 tekniq joined #git
16:14 j7k6 joined #git
16:14 User458764 joined #git
16:15 ThatBob9001 joined #git
16:16 ThatBob9001 joined #git
16:16 dcpc007 left #git
16:16 ThatBob9001 joined #git
16:17 ThatBob9001 joined #git
16:18 ThatBob9001 joined #git
16:18 ThatBob9001 joined #git
16:19 ThatBob9001 joined #git
16:21 synthroid joined #git
16:22 cdg joined #git
16:23 gtrmtx left #git
16:24 fstd joined #git
16:26 sunrunner20 i7c: I don't care if the branches are merged
16:26 sunrunner20 So long as I can somehow push a branch that contains the old checkins.
16:26 sunrunner20 Name it Vss and have it end where the transition took place
16:26 kritzikratzi joined #git
16:27 sunrunner20 That doable relatively simply?
16:27 Tobbi joined #git
16:28 i7c I have no idea what an import from VSS will produce.
16:28 sunrunner20 I think the answer is yes, but I'm the resident git expert and I don't know
16:28 thallada joined #git
16:28 i7c If its just about giving a branch more history, yes that’s possible.
16:28 sunrunner20 The tool would create a repository
16:28 fstd joined #git
16:28 sunrunner20 And a branch
16:28 sunrunner20 Want to move that branch to an existing repo
16:28 qqx sunrunner20: Yes, you can push a branch containing completely unrelated history to a repo.
16:29 i7c sunrunner20, just add the created repo as remote and fetch
16:29 sunrunner20 But the branch is dated older than anything else
16:29 mischat_ joined #git
16:29 i7c Doesn't matter to git.
16:29 Nilesh_ joined #git
16:29 sunrunner20 Just wanted to check
16:29 i7c git remote add local /path/to/created/repo
16:29 sunrunner20 Thanks guys
16:29 i7c git fetch local
16:29 qqx You could also use `git replace` to create a replacement commit for the first commit from the new repo that would have a parent in the converted branch to merge the histories without needing to rewrite everything.
16:29 mischat_ joined #git
16:30 sunrunner20 I think I'll keep them separate for simplicity
16:30 i7c That’s surely not a problem. :)
16:30 ignarps joined #git
16:30 sunrunner20 And it tells me where vss stopped and git started
16:30 i7c You can pull in branches from any repo, they need no relation whatsoever.
16:30 sunrunner20 I've added #git as one of my channels not full of people with their head up their ass
16:31 ss22ever joined #git
16:31 i7c lol
16:31 sunrunner20 Like #linux tends to be
16:31 zeroed joined #git
16:31 matoro joined #git
16:32 sunrunner20 I got cussed at there because Linux graphical boot doesn't work on my pc and none of the grub options were helping :/
16:32 durham joined #git
16:32 i7c I never ask stuff in #linux. :) I’ll just go to my distro's channel.
16:33 systemovich joined #git
16:33 sunrunner20 I asked in distro first
16:33 sunrunner20 #fedora and #ubuntu were unhelpful
16:34 Murii_ joined #git
16:34 sunrunner20 So I just run Linux in a vm from windows now
16:34 sunrunner20 Which is good because Linux tends to spontaneously combust around me
16:34 Murii_ joined #git
16:35 qqx I have that problem with windows.
16:35 ss22ever When I do git send email  it sais STARTLS failed SsL connect failed because of handshake problems
16:35 ss22ever How to fix that
16:35 sunrunner20 Certs and clock good as 22ever ?
16:35 Murii_ joined #git
16:35 Levex joined #git
16:36 sunrunner20 First two things to look at for ssl/tls issues
16:36 Murii_ joined #git
16:36 sunrunner20 qqx: windows gets reinstalled every couple years for me, just to rid myself of crust I've left about
16:37 ss22ever sunrunner20: Clock good, how to check for certs
16:37 fstd joined #git
16:37 m4sk1n joined #git
16:37 ss22ever ?
16:37 i7c I have a linux installation from 2012 that runs and runs and runs and runs :)
16:37 sunrunner20 Not sure
16:38 sunrunner20 I don't know how git does email
16:38 sunrunner20 But google $mydistrobution update root certs
16:38 i7c With perl, I think.
16:39 Es0teric joined #git
16:39 sunrunner20 I just had to install/update the Mozilla root cert list in freebsd for letsencrypt support
16:39 ss22ever sunrunner20: nothin we just use git send-email for that and do some global configs.
16:40 MattMaker joined #git
16:40 ss22ever But I checked the config file
16:40 ss22ever All is good there  smtp server port 587 encryption tls
16:41 sunrunner20 Open up the mail server with a Cli mail client directly
16:41 sunrunner20 Eliminate if it's the machine or a git config issue
16:42 sunrunner20 But gotta go
16:42 sunrunner20 Work to do
16:42 xall joined #git
16:42 ss22ever sunrunner20: but I want to submit patches through git only
16:42 i7c ss22ever: did you set the smtpencryption option?
16:42 ss22ever sunrunner20: but I want to submit patches through git only
16:42 sunrunner20 That's besides the point ss22ever
16:42 dviola joined #git
16:43 sunrunner20 The point is to narrow down where the issue with the email server is
16:43 sunrunner20 If the Cli client fails you can tell it to give you more debug info/maybe download the certs
16:44 sunrunner20 Then you can see if your machine recognizes them
16:44 AvidWolf43 left #git
16:44 sunrunner20 If it works fine
16:44 notebox joined #git
16:44 publio joined #git
16:44 sunrunner20 You've configured something in git wrong
16:44 sunrunner20 Troubleshooting 101: lose all your assumptions
16:45 sunrunner20 Assumption 1: it's git related
16:45 FrozenFire joined #git
16:45 rgrinberg is there a way to revert the previous commit only on a single file?
16:46 FrozenFire I'm just learning how to do git subtree splits, and I'm wondering if there's a way to update a subtree's history with new commits from the same path that have occurred on the branch that the subtree was split from, after it was split.
16:46 metalraiden34 joined #git
16:46 brent__ joined #git
16:47 _ikke_ rgrinberg: git checkout <commit> -- <file>
16:47 ss22ever i7c: yeah i set it to tls
16:47 perlpilot rgrinberg: depending on what you really want, maybe  `git checkout HEAD^ -- filename` will work for you
16:47 brent__ joined #git
16:47 FrozenFire So basically, while I'm breaking my repository out to subtrees, I want to be able to merge new changes from that same path into my new branches
16:47 i7c ss22ever, are you sure your mail provider is using TLS?
16:47 Murii_ joined #git
16:48 rgrinberg perlpilot: _ikke_ thanks
16:48 Phylock joined #git
16:48 i7c ss22ever: http://stackoverflow.com/questi​ons/5540374/starttls-vs-ssl-tls
16:49 ss22ever i7c: gmail uses ssl or tls
16:49 Gsham joined #git
16:49 tholum joined #git
16:49 TomyLobo joined #git
16:50 youtah joined #git
16:51 synthroid joined #git
16:53 achadwick joined #git
16:55 robogoat joined #git
16:56 thebird joined #git
16:56 pythonholum joined #git
16:56 danslo joined #git
16:56 pythonholum Hello, Is there a way in git to have a custom merge tool for a specific type of file?
16:56 _ikke_ pythonholum: with man gitattributes
16:56 gitinfo pythonholum: the gitattributes manpage is available at http://jk.gs/gitattributes.html
16:57 jstimm joined #git
16:57 YuGiOhJCJ joined #git
17:00 mischat joined #git
17:00 Levex joined #git
17:00 e14 joined #git
17:02 pythonholum Question 2 How do I write a custom git merge script? ( What are the input's ext... ), I have tried one with setting a script as my mergetool and piping $@ to a temp file, but there appered to be no params
17:02 pythonholum Is there a tutorial, or an exmple script anywhere?
17:04 ronny joined #git
17:05 texinwien_ joined #git
17:06 hfp joined #git
17:06 hfp_work joined #git
17:07 Tobbi joined #git
17:08 svm_invictvs joined #git
17:08 jeffreylevesque_ joined #git
17:09 marenz_ joined #git
17:09 crayon joined #git
17:11 multi_io joined #git
17:11 a3Dman joined #git
17:13 pur3eval joined #git
17:14 pks joined #git
17:14 cyberz joined #git
17:15 _ikke_ pythonholum: That man page has a section: "Defining a custom merge driver"
17:18 bannakaffalatta joined #git
17:18 jeffreylevesque joined #git
17:20 Gustavo6046 joined #git
17:20 jimi_ joined #git
17:21 thiago joined #git
17:22 JanC_ joined #git
17:23 marcogmonteiro joined #git
17:23 TheMontyChrist joined #git
17:23 TheMontyChrist joined #git
17:23 TheMontyChrist joined #git
17:23 TheMontyChrist how to get a list of changed files between two branches?
17:24 _ikke_ git diff --name-only branch1 branch2
17:26 dreiss joined #git
17:27 venmx joined #git
17:28 Guest78421 joined #git
17:32 zeroed joined #git
17:32 zeroed joined #git
17:34 gugah joined #git
17:34 ygeLN joined #git
17:36 durham joined #git
17:38 moparisthebest joined #git
17:38 nickabbe_ joined #git
17:39 moparisthebest git archive --format tgz seems to be reproducible across different systems (produces same artifact), but --format zip does not, is that how it's supposed to work or is something wrong?
17:40 Gsham joined #git
17:40 MattMaker joined #git
17:41 xall joined #git
17:42 metalraiden34 joined #git
17:42 xissburg joined #git
17:43 durham joined #git
17:44 cmyers joined #git
17:46 felixjet joined #git
17:46 cmyers am I the only one that thinks linus' response to the sha1 thing is pants-shittingly bad?
17:46 cmyers erm, maybe I should say, "myopic"?
17:47 cmyers people use sha1s ALL THE TIME as "the security".  people clone fresh repos on new machines *all the time*
17:47 cmyers now people can upload tress that look identical to linus' but are actually backdoored.
17:47 chipotle joined #git
17:48 cmyers I can make a repo that is indistinguishable from linus' tree but that is backdoored for $110k, that will screw over anyone who clones it fresh (but, to linus' point, has no impact if you are fetching into an existing repo).  Isn't that still TERRIBLE?
17:48 moparisthebest cmyers, the response from a super long time ago before sha1 collisions and github? or is there a new one
17:48 _ikke_ cmyers: If people can push colliding objects, they can also push backdoors directly
17:49 cmyers I'm talking about hte one in the room topic, which appears to be from 2005
17:49 cmyers has he said anything less stupid since then?
17:49 moparisthebest yea and his point was perfectly valid then, that's how people used git
17:49 cmyers that's how HE uses git
17:49 cmyers that is not how most people use git
17:49 moparisthebest and everyone else in 2005
17:50 cmyers what do you think happens when you run "pip install git+ssh://blahblah..."
17:50 User458764 joined #git
17:50 _ikke_ .shorten https://public-inbox.org/git/nycvar.QRO.7.​75.62.1702240943540.6590@qynat-yncgbc/T/#m​e181023a3dfe30d4b76880f0c883c4f90a5a879d
17:50 gitinfo _ikke_: .shorten: out http://jk.gs/t/a4 in https://public-inbox.org/git/nycvar.QRO.7.​75.62.1702240943540.6590@qynat-yncgbc/T/#m​e181023a3dfe30d4b76880f0c883c4f90a5a879d
17:51 j7k6 joined #git
17:51 cmyers does git commit -S actually fix things?  what exactly is signed?
17:51 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/a4 | 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
17:52 qqx commit -S doesn't really fix things. It signs the commit, but that only refers to the contents by the SHA1 of the top-level tree.
17:52 moparisthebest my only point cmyers is his comment was valid on how everyone used git in 2005 and also when sha1 collisions were just a theoretical not practical thing, it's not fair to take it in the context of today
17:53 moparisthebest today I agree with you git isn't used like that
17:53 cmyers ok, then hopefully we all agree that this is bad times on boats and sha1 needs to be replaced ASAP?
17:54 _ikke_ cmyers: Not really. This is not a pre-image attack. It's still not feasible to find collisions for arbitrary objects
17:54 cmyers I've heard talks about, in the meantime, writing an external verifier.  One could easily write a tool that scans allthe objects and calculates sha256 hashes and you can compare that to know your own repos aren't owned or anything
17:55 cmyers sure, there is also the tool they released that looks for vulnerable files via cryptanalysis
17:55 _ikke_ cmyers: https://public-inbox.org/git/nycvar.QRO.7.​75.62.1702240943540.6590@qynat-yncgbc/T/#m​833888aa9225fcce2de103e898d750682db8c225
17:55 Atm0spher1c joined #git
17:56 cmyers if you want to be tinfoil hat - and I think we ought to be - what are the chances that if an attack like this is publically known, some preimage attack doesn't also exist and might be known or discovered soon?
17:56 _ikke_ cmyers: And most people don't verify at all that what they cloned is what they expect
17:56 cmyers I think the idea of changing the hash but still using 40 characters of it is reasonable.
17:57 kbs joined #git
17:57 nettoweb joined #git
17:57 moparisthebest mercurial devs seems to be leaning towards blake2, which can actually give you an arbitrary length hash, you could just get 20 bytes just like sha1
17:57 matoro joined #git
17:57 _ikke_ cmyers: panicking and trying to force to change away from sha1 can introduce more security risks than taking a slow, well thought out approach (which is what's happening currently)
17:58 cmyers I haven't looked at the cryptanalysis tool to see how invasive it is, but git could warn on finding weak objects
17:58 livingstn joined #git
17:58 cmyers much like how they handled the vulnerable ssh keys a few years back, and blacklisted weak ones
17:58 _ikke_ cmyers: They are looking at adding detection for it
17:58 moparisthebest so any ideas about why git archive --format zip isn't producing identical zips on different machines?
17:58 cmyers _ikke_: that is good news!
17:58 matoro joined #git
17:59 felixjet joined #git
17:59 _ikke_ moparisthebest: Sorry, no clue
17:59 _ikke_ moparisthebest: that tgz is reproducable isn't even documented iirc
18:00 moparisthebest _ikke_, yea it's not in the documentation I found
18:00 dviola joined #git
18:00 moparisthebest now I don't know if github put something malicious in the zip file, or if it's just git archive :)
18:00 pfrench joined #git
18:00 _ikke_ Did you try finding the differences?
18:00 moparisthebest the tar.gz seems perfectly reproducible though so I suppose I'll just use that...
18:01 moparisthebest well other than viewing contents/timestamps/etc no, are there tools to 'diff' zip files?
18:01 courrier joined #git
18:02 _ikke_ other than binary diffs, I wouldn't know
18:02 Es0teric joined #git
18:03 _ikke_ cmyers: https://public-inbox.org/git/nycvar.QRO.7.​75.62.1702240943540.6590@qynat-yncgbc/T/#m​f1bf441df8e09fc76a97ba59af500c138af39380
18:03 qqx There have, over time, been changes to how zip archives are created to work around problems. Could just be different versions being used.
18:03 rj1 joined #git
18:04 jeffreylevesque_ joined #git
18:04 metalraiden34 joined #git
18:04 cmyers _ikke_: thanks for the pointer
18:06 Rodya_ joined #git
18:08 ss22ever Hey can anybody have a look why I am having this smtp error while using git send-email  pastebin.com/YJxKQtih
18:09 moparisthebest qqx, like different git versions or zip versions or both?
18:09 qqx different git versions
18:09 acetakwas joined #git
18:10 dreiss joined #git
18:11 tmsmith joined #git
18:13 moparisthebest thanks qqx !
18:13 User458764 joined #git
18:13 pur3eval joined #git
18:13 xissburg joined #git
18:15 debian_ joined #git
18:16 Emperor_Earth joined #git
18:17 LiftLeft joined #git
18:17 jagob joined #git
18:18 gopar joined #git
18:18 fstd joined #git
18:20 debian_ joined #git
18:21 Anja joined #git
18:21 Es0teric joined #git
18:21 crose joined #git
18:23 debian_ joined #git
18:24 chipotle joined #git
18:24 hio joined #git
18:25 hio git pisses me off so much, how is this even possible? I have a single commit to my repo so far. I made some changes, I want to push and now i get the error: "error: failed to push some refs to 'ssh://git@bitbucket.org/user/repo.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again."
18:25 jamie_1 joined #git
18:26 Zarthus it tells you exactly how to fix it
18:26 hio i dont want to pull because who knows what it will mess up again in my local repo, i just tested everything. I want to just push what i have
18:26 Zarthus There is a force push if you're sure you've got what you want.
18:27 debian_ joined #git
18:28 ankit01ojha joined #git
18:30 Jellyg00se joined #git
18:30 mutex hio: you could always fetch and rebase ?
18:30 Zarthus personally speaking it sounds like you've only been using git for 30 minutes and are averse to the idea of change, give it a few weeks and you'll grow to love it.
18:30 mutex seems like you need to learn more about rebase vs merge
18:31 hio i created a commit with node_modules, now i added node_modules to my .gitignore
18:31 hio is it still going to push the node_modules?
18:31 Zarthus that depends on what you've git-added, check git-status.
18:32 Zarthus if you haven't added it, it won't be commited, and if it doesn't show up in git status it's correctly gitignored.
18:32 hio what happens if i force push, can something break?
18:32 Zarthus yes
18:32 Zarthus it's a very bad idea.
18:33 hio i had already added everything via "git add ."
18:33 hio but i dont see it in git status
18:33 hio so im totally confused
18:33 Zarthus does it tell you you are about to commit something
18:33 Zarthus it's possible that commit already contains the changes.
18:33 qqx hio: Once a file is added it isn't affected by the ignore rules.
18:33 User458764 joined #git
18:33 hio i dont understand these info messages at all omg
18:34 qqx If the files were already committed and not changed/removed they wouldn't show up in the status output.
18:34 Zarthus git is very good at spoonfeeding you, there's not much to not understand.
18:34 hio first it says "# Changes not staged for commit:
18:34 hio and shows a bunch of files". Then later it says "no changes added to commit"
18:35 hio which is it then?!?!
18:35 Synthead joined #git
18:35 fahadash joined #git
18:36 Dougie187 joined #git
18:36 hio git is totally unusable for me
18:36 Zarthus how many minutes have you been using it
18:36 Munt joined #git
18:37 hio ive used it plenty before from the gui
18:37 hio without a gui it's hopeless and even with a gui, if theres any problem at all like now, it is pointless
18:37 molloy try magit :)
18:37 bremner ok, so either go back to using the gui, or ask an actual question.
18:38 AJ3X joined #git
18:38 molloy hio: you need to stage your changes, then when you make a commit it will include those
18:39 hio i already did all that but first it is telling me that i need to merge something from the repo first, which doesnt seem possible because i only have one commit in there
18:39 hio secondly i changed the gitignore later but it doesnt reflect in the git status, so im not sure what is in the commit now
18:40 tg joined #git
18:41 MattMaker joined #git
18:42 e14 joined #git
18:42 duderonomy joined #git
18:44 dvaske_ joined #git
18:44 molloy hio: what i would try is stashing all of my changes then doing a git pull to see if there are still any merge conflicts
18:44 robattila256 joined #git
18:45 peterbecich joined #git
18:45 molloy there shouldn't be since it sounds like the repo is one commit ahead of what you're on
18:45 hio oh ffs, i forgot my problem with the video file
18:45 hio it's still in my history
18:45 hio god i hate this so much
18:46 molloy you can use BFG or git filter-branch
18:47 hahuang65 joined #git
18:48 aspiers joined #git
18:51 mkoskar joined #git
18:53 stfn joined #git
18:53 j7k6 joined #git
18:53 boombatower joined #git
18:54 User458764 joined #git
18:55 alansaul joined #git
18:57 joshszep joined #git
18:58 joshszep joined #git
18:59 kaosine joined #git
18:59 MistahKurtz joined #git
19:00 tg joined #git
19:00 BlackMaria_netsp joined #git
19:01 BlackMaria_netsp joined #git
19:02 kpease_ joined #git
19:03 BlackMaria joined #git
19:03 matoro joined #git
19:05 username1 joined #git
19:05 username1 should i prefer git grep on rev-list OR git log -S
19:06 username1 to find code changes within commits?
19:06 Oftr joined #git
19:06 r3c0d3x joined #git
19:06 xall joined #git
19:06 Eryn_1983_FL joined #git
19:07 thiago joined #git
19:07 raynold joined #git
19:09 g105b joined #git
19:10 _ikke_ git log -S
19:10 molloy username1: ^
19:10 dviola joined #git
19:12 hio left #git
19:14 pur3eval joined #git
19:17 Sasazuka joined #git
19:17 Hmcj6 joined #git
19:17 orbyt_ joined #git
19:18 bluepixel joined #git
19:22 finalbeta joined #git
19:25 e14 joined #git
19:26 aswen joined #git
19:28 venmx joined #git
19:29 GavinMagnus joined #git
19:31 BrianBlaze420 joined #git
19:32 nutron joined #git
19:33 livingstn joined #git
19:34 stfn joined #git
19:35 pythonholum I am having trouble's getting git mergetool to detect my custom tool, When I type git mergetool -t json, it tells me "Unknown merge tool json" but git config --list shows merge.json.name and merge.json.driver
19:35 pythonholum http://pastebin.com/ye4Nd8kz
19:35 GavinMagnus left #git
19:36 pythonholum Am I missing something, I have tried changing driver to cmd but that did not work eather
19:36 Murii_ joined #git
19:36 marenz_ joined #git
19:38 pbrewczynski joined #git
19:41 wouter0100 joined #git
19:42 Vampire0 pythonholum, should be `mergetool.json.cmd`
19:42 MattMaker joined #git
19:43 Anja joined #git
19:44 stfn joined #git
19:44 pythonholum Vampire0: That worked thanks, The exmaple I was following did not have tool, Thanks
19:45 Sample joined #git
19:45 zifnab !sha1
19:45 gitinfo Git's usage of SHA1 hashes is largely immune to collisions because it includes a file-length header. Other protections and an eventual update to a new hashing algorithm are planned. http://marc.info/?l=git&amp;m=148787047422954. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
19:45 dvaske joined #git
19:45 roelmonnens joined #git
19:45 wouter0100 joined #git
19:46 Kaisyu joined #git
19:47 GT4066 joined #git
19:47 irqq joined #git
19:48 dvaske joined #git
19:49 sieve joined #git
19:49 sieve left #git
19:49 MarkGlz joined #git
19:50 Vampire0_ joined #git
19:51 tmsmith joined #git
19:51 e14 joined #git
19:52 MistahKurtz joined #git
19:53 wizeman left #git
19:54 le_melomane joined #git
19:57 Sasazuka joined #git
19:59 wouter0100 joined #git
20:00 metalraiden34 joined #git
20:00 bvcosta joined #git
20:02 i-make-robots joined #git
20:02 username1 _ikke_: thanks
20:03 username1 molloy: thanks
20:03 Vampire0 joined #git
20:03 i-make-robots hi!  I feel stupid today.  I cloned a repo, made changes, committed, and tried to pull request.  git desktop says source and dest are the same.  what did i miss, please?
20:05 Es0teric joined #git
20:06 Dougie187 left #git
20:08 Vampire0 pythonholum, did you get my four messages or were they swallowed by my flaky internet connection?
20:08 geoid_ joined #git
20:09 pythonholum Vampire0: I thought I responded back with it worked, Sorry if I did not
20:09 pythonholum Thank you :)
20:09 Vampire0 i-make-robots, you left out forking and pushing. committing is just a local process. if you don't have direct push access to the repo in question you have to fork it, then push your changes to your fork and open a pull request
20:09 pur3eval joined #git
20:09 Vampire0 pythonholum, you did, but I answered after that, seems the messages did not came through
20:10 gitinfo pythonholum: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
20:10 Vampire0 [20:47:23] <Vampire0> pythonholum, there is merge.json.name and merge.json.driver, but those are not for mergetool. They are for low-level automatic merging which you can assign to file extensions via man gitattributes
20:10 gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html
20:10 Vampire0 [20:47:59] <Vampire0> pythonholum, if you e. g. have a tool that is able to merge PDF files, you can configure it with merge.pdf.name and merge.pdf.driver, then use .gitattributes to assign this driver to all pdf files
20:10 Vampire0 [20:48:39] <Vampire0> pythonholum, if then a merge is done, that merge driver is called to merge the PDF files and the driver controls with its exit value whether the result is fine or whether there was a conflict
20:10 pythonholum Vampire0: Thank you
20:10 Vampire0 [20:49:02] <Vampire0> pythonholum, if there was a conflict by the merge driver, you then can use a mergetool to manually resolve the conflict with that tool
20:10 Vampire0 yw
20:11 Vampire0 I lost server connection right after those messages, so I was not sure whether they made it through
20:11 Vampire0 obviously they did not :-)
20:12 toogley joined #git
20:14 toogley i wanted to change the name of both a local branch and a its corresponding tracking branch. i forgot what exactly i did, but basically i have renamed now my local branch to the desired name. but the remote branch is still using the old. i've read somewhere that i should use "git branch --set-upstream-to=origin/devel/​travis-check-manual-manpages", but that doesn't work.
20:14 toogley here's the error message: https://paste.fedoraproject.org/paste/Iz5​gJFqFPTeoOJlyAeUxGF5M1UNdIGYhyRLivL9gydE=
20:15 chardan joined #git
20:15 toogley so obviously the second option is the one i need to do. but no git push command I've used was successful.
20:15 Vampire0 toogley, well, as the error says, that upstream branch does not yet exist
20:16 Vampire0 toogley, what problem do you have with the push? !repro
20:16 gitinfo toogley: [!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
20:17 toogley https://paste.fedoraproject.org/paste/wSd​DhU1SDOZsth8Uv68nuF5M1UNdIGYhyRLivL9gydE=
20:17 toogley Vampire0: yes. but its the one i want to create, or rename to.
20:18 altendky joined #git
20:19 shinnya joined #git
20:20 Gsham joined #git
20:20 i-make-robots Vampire0 - ok, I already committed locally.  how do i fork and then pull request?
20:20 jstimm joined #git
20:20 Vampire0 toogley, I think you are after `git push -u origin devel/travis-check-manual-manpages:​devel/travis-check-manual-manpages`
20:20 Ryanar joined #git
20:21 toogley i-make-robots: you can clone the forked repo to another different directory and merge your changes in from your local commit
20:21 Rodya_ joined #git
20:21 Vampire0 toogley, with foo:bar you say push commit-ish foo to the remote branch bar
20:21 Vampire0 toogley, i-make-robots that is not necessary
20:21 toogley Vampire0: aah, thank you
20:22 Vampire0 i-make-robots, I don't know whether GitHub for windows that you are using has anything inside, but I guess yes, but !gui
20:22 gitinfo i-make-robots: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
20:22 Vampire0 i-make-robots, git-spindle e. g. can also do it from the command-line
20:23 Vampire0 i-make-robots, but speaking in plain Git and GitHub words, you go to the GitHub website and press the "Fork" button
20:23 i-make-robots ok.  does that mean i don't fork and merge like toogley said?
20:23 i-make-robots i did the fork.
20:23 i-make-robots now i'm trying to merge my stuff without erasing anything.
20:23 Vampire0 i-make-robots, after your fork was created you just add your fork as a second remote to your existing clone
20:23 * i-make-robots works alone with git too much
20:23 Vampire0 Then you push your changes to your fork and open the pull-request via Website, GitHub for Windows or any other tool that you like and that supports it
20:24 zulutango joined #git
20:24 Levex joined #git
20:24 Vampire0 i-make-robots, why do you need to merge, your fork is identical to upstream. Except of course there was work done on upstream while you did your changes, but I would rebase then, not merge
20:24 Sasazuka__ joined #git
20:25 satifant joined #git
20:27 venmx joined #git
20:30 wrkrcoop joined #git
20:31 metalraiden34 joined #git
20:31 wrkrcoop so i made a commit, then realized it messed stuff up, i checkout to a previous commit by referncing it using the id from git log, but how do i make this the head?
20:31 wrkrcoop not sure if that’s event he right vocab to be using.. i want to revert and act as if i had never made that commit that messed stuff up
20:32 moparisthebest wrkrcoop, git reset --soft HEAD~1
20:32 moparisthebest assuming it's the last commit
20:32 wrkrcoop moparisthebest: mmm its 2 commits back
20:32 moparisthebest what's the last one?
20:32 clickjack joined #git
20:32 moparisthebest you can change the 1 to revert any number of commits from HEAD
20:32 wrkrcoop ok
20:32 moparisthebest which may or may not be what you want
20:33 wrkrcoop cool so git reset —soft HEAD~2
20:33 wrkrcoop why soft?
20:33 moparisthebest --soft makes your changes stay around like you didn't commit them
20:33 moparisthebest --hard destroys them all
20:33 wrkrcoop moparisthebest: oh hmmm
20:33 wrkrcoop ok
20:33 wrkrcoop thank you very much
20:33 moparisthebest I think the default is --soft but I like to be explicit
20:33 moparisthebest np
20:34 ispn joined #git
20:34 Vampire0 moparisthebest, no the default is not --soft, but --mixed
20:35 moparisthebest ah I've never used that
20:35 Vampire0 moparisthebest, --hard = set worktree, index and branch pointer to the commit   --mixed = set index and branch pointer to the commit, but leave the changes in the worktree   --soft = set branch pointer to the commit, but leav the changes in the index and do not touch the worktree
20:35 inflames joined #git
20:36 Sample joined #git
20:36 syg_ joined #git
20:36 Nugget_ left #git
20:36 Vinnie_win joined #git
20:36 expl015s_ joined #git
20:36 Nugget joined #git
20:39 synthroid joined #git
20:39 jstimm joined #git
20:43 MattMaker joined #git
20:43 i-make-robots ok, i added the origin2 with my fork address.  how do i merge my changes in, please?
20:45 finalbeta joined #git
20:45 mizu_no_oto joined #git
20:46 snowalpaca joined #git
20:48 iveqy joined #git
20:49 MattMaker joined #git
20:51 eb0t joined #git
20:51 gopar joined #git
20:52 jeffreylevesque joined #git
20:52 overrun joined #git
20:53 davimore__ joined #git
20:53 Jackneill_ joined #git
20:53 Vampire0 joined #git
20:54 doppo joined #git
20:54 Sasazuka joined #git
20:54 LeBlaaanc joined #git
20:55 Vampire0 [21:50:52] <Vampire0> i-make-robots, by answering my question
20:55 Vampire0 [21:50:57] <Vampire0> [21:24:49] <Vampire0> i-make-robots, why do you need to merge, your fork is identical to upstream. Except of course there was work done on upstream while you did your changes, but I would rebase then, not merge
20:56 aspiers joined #git
20:58 Levex joined #git
20:58 username1 joined #git
20:59 michael_mbp joined #git
21:00 Milos_ joined #git
21:01 Sasazuka__ joined #git
21:02 courrier_ joined #git
21:02 rivarun_ joined #git
21:04 ronny joined #git
21:06 i-make-robots Vampire0 - eh... i don't know half that terminology and can't answer the question.  sorry :(
21:06 i-make-robots how do i rebase?
21:06 cdg joined #git
21:06 i-make-robots will google
21:09 imachuchu joined #git
21:10 i-make-robots my changes are already on the master branch.  i can't seem to rebase.
21:11 Cabanossi joined #git
21:12 csboy joined #git
21:12 cr34ton joined #git
21:12 go1111111 joined #git
21:13 SwiftMatt joined #git
21:13 Vampire0 i-make-robots, well, if there were no upstream changes, you don't need to merge or rebase
21:13 Es0teric joined #git
21:13 Vampire0 i-make-robots, just push your branch and then open the pull-request
21:16 dsdeiz joined #git
21:17 kexmex joined #git
21:18 salamanderrake joined #git
21:18 jeffreylevesque joined #git
21:19 spangborn joined #git
21:19 pie_ joined #git
21:20 alexbobp left #git
21:21 i-make-robots Vampire0 - ok, I got it done.  Thank you!
21:22 tekniq_ joined #git
21:22 Rodya_ joined #git
21:23 spangborn left #git
21:24 Ryanar joined #git
21:24 fatalhalt_ joined #git
21:24 fatalhalt joined #git
21:24 Es0teric joined #git
21:26 Bob8989|2 joined #git
21:27 IntruderSRB joined #git
21:28 metachr0n joined #git
21:28 venmx joined #git
21:31 MattMaker joined #git
21:33 Dougie187 joined #git
21:35 Levex joined #git
21:36 raynold joined #git
21:38 MistahKurtz joined #git
21:40 jstein_ joined #git
21:40 pur3eval joined #git
21:41 pfrench joined #git
21:45 hhee joined #git
21:47 Rodya_ joined #git
21:47 anuxivm joined #git
21:47 wrkrcoop joined #git
21:49 jackneill__ joined #git
21:50 PioneerAxon joined #git
21:51 anuxivm joined #git
21:53 Levex joined #git
21:56 Levex joined #git
21:57 Klumben joined #git
21:58 Fiouz joined #git
21:58 bufferoverflow joined #git
21:59 Milos joined #git
22:02 Tobbi joined #git
22:02 Rodya_ joined #git
22:02 disi joined #git
22:03 pfrench joined #git
22:07 ozmage joined #git
22:07 Sasazuka__ joined #git
22:09 venmx joined #git
22:11 koala_man joined #git
22:12 raspado joined #git
22:14 KittenApocalypse joined #git
22:15 m0viefreak joined #git
22:15 nevodka joined #git
22:16 e14_ joined #git
22:20 jwmann joined #git
22:21 hahuang65 joined #git
22:21 Sasazuka joined #git
22:22 NullableTruth joined #git
22:23 ThatBob9001 joined #git
22:24 Fiouz joined #git
22:24 MistahKu_ joined #git
22:26 ecuanaso joined #git
22:28 YuGiOhJCJ joined #git
22:28 pwndave joined #git
22:31 ThatBob9002 joined #git
22:31 levex_ joined #git
22:31 tyreld joined #git
22:32 intellix joined #git
22:32 ljc joined #git
22:33 ThatBob9002 joined #git
22:33 ThatBob9001 joined #git
22:34 ThatBob9002 joined #git
22:34 moparisthebest left #git
22:35 nydel07 joined #git
22:36 ThatBob9001 joined #git
22:38 murph joined #git
22:38 y_sekino joined #git
22:38 Rodya_ joined #git
22:39 Dougie187 left #git
22:39 d0nn1e joined #git
22:41 pur3eval joined #git
22:41 lnug joined #git
22:45 ThatBob9001 joined #git
22:45 ThatBob9002 joined #git
22:46 mizu_no_oto joined #git
22:46 Sasazuka joined #git
22:48 Ownix joined #git
22:48 phtes joined #git
22:48 ionelmc joined #git
22:48 dpower joined #git
22:49 Tee_Pee joined #git
22:49 johnlage joined #git
22:49 tang^ joined #git
22:50 addshore joined #git
22:50 m4sk1n joined #git
22:50 exitcode1 joined #git
22:50 Masber joined #git
22:50 ratdeptrai joined #git
22:56 swords joined #git
22:57 Rhonda joined #git
22:57 bufferoverflow joined #git
23:01 fmeerkoetter joined #git
23:01 Fiouz joined #git
23:02 dedicated joined #git
23:02 ionelmc joined #git
23:02 phtes joined #git
23:02 daxroc joined #git
23:02 Tee_Pee joined #git
23:03 beckyconning___ joined #git
23:03 GameGamer43 joined #git
23:03 dpower joined #git
23:04 shennyg joined #git
23:04 zifnab joined #git
23:04 ggherdov joined #git
23:04 wongon joined #git
23:05 matoro joined #git
23:05 ToBeCloud joined #git
23:06 moop joined #git
23:07 Guest63712 joined #git
23:09 addshore joined #git
23:09 DolpheenDream joined #git
23:12 Sasazuka__ joined #git
23:12 DieguezZ joined #git
23:12 m4sk1n joined #git
23:13 Ownix joined #git
23:14 chardan joined #git
23:14 MistahKurtz joined #git
23:14 CountryNerd joined #git
23:19 Levex joined #git
23:19 bekks joined #git
23:19 bekks hi all
23:21 bekks I'm unsure wether I should use branches instead of single repos for using etckeeper on a bunch of hosts. Does someone of you already tried to do that or has a clue about the sanity of that idea?
23:21 tanuki joined #git
23:22 llamapixel bekks:  It probably boils down to the amount of users working on the project. http://endoflineblog.com/g​itflow-considered-harmful
23:23 bekks llamapixel: the amount of users is quite low - one gitlab user owning the etckeeper repo, and a gitlab user for about all the rest of my repos.
23:24 bekks the branches are not going to me merged, or something, I just want to reduce the number of repos needed.
23:24 matoro joined #git
23:25 llamapixel If you understand the classic git flow pattern, follow up with that article mate.
23:25 Maxdamantus joined #git
23:26 cmyers think of branches as a fluid that grows, and repos as a bucket.  lots of small buckets or one big one, doesn't make much difference.  If branches were never merged, then they are non-overlapping, but whether you put them in the same repo or different repos doesn't matter much.  It only changes your clone URLs, fetchspecs, workflows, permissions management, etc.
23:26 bekks I havent got the idea of the master/develop workflow yet, since it looks quite complex for my use cases.
23:27 llamapixel So you want to read this first. http://nvie.com/posts/a-succ​essful-git-branching-model/
23:27 bekks The purpose of my etckeeper usage is just being able to roll back a specific config on a specific host. I'm not going to merge them or somehow mix them.
23:28 cmyers bekks: so when you start a new host, will you take some other host's config to start, or start clean?
23:28 llamapixel For extra credit . https://gist.github.com/djs​piewak/9f2f91085607a4859a66
23:29 bekks cmyers: I will start clean.
23:29 tanuki joined #git
23:29 cmyers then yeah, no shared history, cherry-picks probably wouldn't even work...
23:29 jwmann joined #git
23:29 cmyers so there's no reason to have them all in one repo.  but there isn't a strong reason to separate them either.
23:29 cmyers unless you want different permissions
23:29 bekks Nope, I dont want that.
23:30 Rodya_ joined #git
23:30 bekks For the sake of complexity (on the repo side and on the host side), I'll better use different repos?
23:30 ygeLN joined #git
23:31 Rodya_ joined #git
23:31 iamthad joined #git
23:32 LaptopBrain joined #git
23:32 bambams joined #git
23:32 bambams joined #git
23:32 njbair joined #git
23:33 netj joined #git
23:34 CountryNerd joined #git
23:34 dave0x6d joined #git
23:35 gugah joined #git
23:36 ahr3n joined #git
23:36 alansaul joined #git
23:39 Sasazuka joined #git
23:40 duderono_ joined #git
23:41 pur3eval joined #git
23:43 austin987 joined #git
23:44 chardan joined #git
23:46 rgrinberg joined #git
23:46 Levex joined #git
23:53 [R] joined #git
23:55 Levex joined #git
23:56 llamapixel I think of repos like little modules and larger projects ( game dev related ) In that thought process you might have a social media linking module that you use over many different projects with its own updated timeline.
23:56 llamapixel The 3 articles above bekks have good insights to workflows.
23:56 rmbeer joined #git
23:57 rmbeer hello
23:58 joshszep joined #git
23:59 rmbeer joined #git

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