Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-07

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

All times shown according to UTC.

Time Nick Message
00:02 cust joined #git
00:03 mg joined #git
00:10 venmx joined #git
00:14 nevodka joined #git
00:19 netj joined #git
00:19 bernd27 joined #git
00:21 mg joined #git
00:22 fstd_ joined #git
00:24 dreiss joined #git
00:26 Lyqyd joined #git
00:32 acetakwas joined #git
00:33 zealsham_ joined #git
00:40 robattila256 joined #git
00:47 kusznir joined #git
00:50 dsdeiz joined #git
00:50 dsdeiz joined #git
00:52 Nilesh_ joined #git
00:53 Stumbler joined #git
00:54 zealsham_ joined #git
00:54 MattMaker joined #git
00:57 marianina8 joined #git
01:07 d^sh joined #git
01:08 Gurkenglas The second commit of https://github.com/ekmett/lens/pull/732 does not work. How do I take it out of the pull request?
01:10 kadoban Gurkenglas: The usual way for a PR would be edit history to remove it locally, push -f to the branch you created for the pull request.
01:15 zealsham_ joined #git
01:15 sim642 joined #git
01:15 Gurkenglas http://lpaste.net/3191621778552127488 wat do?
01:16 Gurkenglas (I created no branch for the pull request)
01:16 howitdo joined #git
01:16 howitdo joined #git
01:16 kadoban Looks like your master branch is it then. Usually you should make a branch specific to each pull request, for future reference. Let me look at that lpaste.
01:16 osse Gurkenglas: wat do depends on wat want
01:17 Gurkenglas osse, <Gurkenglas> The second commit of https://github.com/ekmett/lens/pull/732 does not work. How do I take it out of the pull request?
01:17 osse Gurkenglas: add -f to the push that failed
01:18 kadoban Yeah, looks like that last one was okay except needs -f
01:18 Gurkenglas Oh hey, I forgot to add -f again after the last command said to add "origin HEAD:<name-of-remote-branch>", sorry.
01:18 sunri5e joined #git
01:18 kadoban Gurkenglas: Your first attempt would have been fine as well, for some definitions of "fine", but it seems like you weren't on a branch to start with.  'git checkout master' first, before the first command you did, would have worked very likely.
01:20 Wulf4 joined #git
01:21 finalbeta joined #git
01:26 sbasso joined #git
01:31 misosoup joined #git
01:33 Stumbler joined #git
01:35 ShapeShifter499 joined #git
01:39 masuberu joined #git
01:39 sunri5e joined #git
01:40 misosoup joined #git
01:54 dtrott joined #git
02:00 pbandark joined #git
02:00 ejnahc joined #git
02:01 CEnnis91 joined #git
02:03 onehrxn joined #git
02:04 Cabanossi joined #git
02:06 chachasmooth joined #git
02:08 Bookwormser joined #git
02:10 venmx joined #git
02:10 chipotle joined #git
02:15 lagothrix joined #git
02:18 tristanp joined #git
02:21 Bookwormser joined #git
02:26 eroux joined #git
02:31 maroloccio joined #git
02:31 tnecniv joined #git
02:32 cads joined #git
02:37 nd_ joined #git
02:40 hexagoxel joined #git
02:44 rudi_s joined #git
02:48 Cabanossi joined #git
02:56 Vortex34 joined #git
02:58 jameser joined #git
02:59 mel00010 joined #git
03:07 chachasmooth joined #git
03:08 raijin joined #git
03:08 TikityTik joined #git
03:15 sparr I am having trouble with a repo I added a submodule to. The main repo's .git/ directory has no modules/ subdirectory. Have I missed a step or messed something up? How can I fix it so that I can perform git operations in the submodule's directory?
03:16 Cabanossi joined #git
03:16 sparr the submodule has a .git file that says "gitdir: ../../../.git/modules/scripts/submodules/python-factorio"
03:16 sparr ../../.. is the root of the repo, which has its normal .git/ but no .git/modules/
03:26 bannakaffalatta joined #git
03:27 fmcgeough joined #git
03:36 menip joined #git
03:38 svm_invictvs joined #git
03:39 svm_invictvs joined #git
03:52 jameser joined #git
03:56 moei joined #git
03:59 sparr unrelated question: is there a way I can get `git` to spit out a list of my gitignore patterns, local and global?
04:00 jay-m joined #git
04:00 kadoban I don't think so. There's 'git check-ignore', but I don't think it can just list every pattern easily.
04:01 durham joined #git
04:10 Lyqyd joined #git
04:13 jameser joined #git
04:13 bwn joined #git
04:18 zefferno joined #git
04:23 sparr ok, guess I'll be parsing .gitignore and `git config core.excludesfile`
04:24 jaziz joined #git
04:24 salamanderrake joined #git
04:25 jay-m joined #git
04:48 dsdeiz joined #git
05:02 cev joined #git
05:07 duderonomy joined #git
05:09 regedit joined #git
05:10 nickel_dime_look joined #git
05:11 nickel_dime_look joined #git
05:14 mmlb joined #git
05:14 frobnic joined #git
05:15 pks joined #git
05:16 darkbit joined #git
05:16 Cabanossi joined #git
05:24 bket joined #git
05:26 emPi joined #git
05:34 MrWoohoo joined #git
05:46 Cabanossi joined #git
05:50 TikityTik joined #git
05:51 Introoter joined #git
05:54 _ng joined #git
05:55 dsdeiz joined #git
05:55 dsdeiz joined #git
05:55 goTAN joined #git
06:01 hhee joined #git
06:02 venmx joined #git
06:04 AJ_Michels joined #git
06:05 eroux joined #git
06:05 sevensidedmarble joined #git
06:06 AJ_Michels me
06:07 leah2 joined #git
06:08 AJ_Michels joined #git
06:10 marianina8 joined #git
06:10 tarkus joined #git
06:12 xall_ joined #git
06:16 vuoto joined #git
06:19 ertes joined #git
06:20 themill joined #git
06:20 xall joined #git
06:22 overlord_tm joined #git
06:26 zulutango joined #git
06:27 fluffystub joined #git
06:27 goTAN joined #git
06:27 mda1 joined #git
06:31 mda1 joined #git
06:36 navidr joined #git
06:37 lindenle joined #git
06:41 circ-user-zNiD2 joined #git
06:42 SlashLife joined #git
06:43 SteffanW joined #git
06:53 netj joined #git
07:01 Cabanossi joined #git
07:06 fmeerkoetter joined #git
07:08 jidar joined #git
07:09 a_thakur joined #git
07:11 a_thakur_ joined #git
07:11 venmx joined #git
07:12 askb joined #git
07:13 irqq joined #git
07:14 acetakwas joined #git
07:18 SlashLife joined #git
07:27 MDA2 joined #git
07:29 prg3 joined #git
07:32 FuzzyWuzzyPanda joined #git
07:32 tymczenko joined #git
07:34 schleppel joined #git
07:36 irqq joined #git
07:37 circ-user-zNiD2 joined #git
07:38 prg3 joined #git
07:40 fluffystub joined #git
07:41 sea-gull joined #git
07:42 theoceaniscool joined #git
07:47 King_Hual joined #git
07:47 King_Hual joined #git
07:50 cdown joined #git
07:52 tat joined #git
07:52 tat are changes to  .git/config included when i push new commits ?
07:53 kadoban Included in what? The commits? No
07:54 tat thanks
07:55 tat just could't find anything about that in the docs and i added a access token to my config
07:56 sword joined #git
07:58 prg3 joined #git
07:59 ChiLL_SurF joined #git
07:59 kaldoran joined #git
07:59 cdown joined #git
08:00 sim590 joined #git
08:00 Qilibrun joined #git
08:01 _main_ joined #git
08:01 Cabanossi joined #git
08:01 VladGh_ joined #git
08:02 plos joined #git
08:02 manuelschneid3r joined #git
08:02 __main__ joined #git
08:04 __main__ joined #git
08:04 User458764 joined #git
08:09 tymczenko joined #git
08:09 johnny56_ joined #git
08:10 Whiskey- joined #git
08:11 MattMaker joined #git
08:11 dersand joined #git
08:18 FuzzyWuzzyPanda joined #git
08:21 chipotle joined #git
08:27 lipsumar joined #git
08:27 diogenese joined #git
08:28 prg3 joined #git
08:31 oleksiyp joined #git
08:34 a_thakur joined #git
08:35 roelmonnens joined #git
08:36 prg3 joined #git
08:37 Murii joined #git
08:37 grumble joined #git
08:44 oleksiyp joined #git
08:46 Cabanossi joined #git
08:48 chrisM_1 joined #git
08:48 Chrism13 joined #git
08:48 onehrxn joined #git
08:50 Gurkenglas joined #git
08:53 venmx joined #git
08:54 earnestly joined #git
08:59 zeroed joined #git
08:59 zeroed joined #git
08:59 SlashLife joined #git
09:00 cdown joined #git
09:01 zealsham_ joined #git
09:01 finalbeta joined #git
09:01 zealsham_ what do i use to host my own private git server
09:01 _ikke_ `What are your needs?
09:02 _ikke_ If you are just working on your own, a linux server with ssh is plenty enough
09:02 zealsham_ _ikke_: i just need a server me and my team can push too
09:02 _ikke_ !gitolite perhaps
09:02 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ Quick example: http://gitolite.com/gitolite/overview/#basic-use-case
09:02 _ikke_ I can really recommend gitolite
09:03 zealsham_ _ikke_: gitolite works over ssh? my team mates are all in different locations
09:04 _ikke_ yes
09:04 _ikke_ it works on top of ssh
09:05 zealsham_ __
09:06 spm_draget zealsham_: You can add a wrapper to access gitolite via apache / http. It needs a little bit of setup, but works well. Using it at our company since people do not know how to handle ssh keys properly
09:06 zealsham_ _ikke_: thanks let me read up on it
09:06 QwertyDragon joined #git
09:06 zealsham_ spm_draget: what wrapper is that. because i also have a problem setting up ssh .
09:06 oleksiyp joined #git
09:06 GT4066 joined #git
09:08 alexandre9099 joined #git
09:08 ok91 joined #git
09:09 sz0 joined #git
09:10 _ikke_ What kind of problems?
09:12 zealsham_ _ikke_: i cant ssh into the ubuntu server am running from my ubuntu desktop. they are bothe connected on the same wifi router
09:13 spm_draget There are some easy how-tos online, plus some infos in their documentation http://gitolite.com/gitolite/http/
09:14 spm_draget Please be aware that there are multiple tripping points where you could configure things in insecure ways. Getting familiar with SSH / key-auth / http-auth and apache is recommended :)
09:15 zealsham_ how a bout gerrit , it seems easy to install
09:16 cads joined #git
09:17 Gurkenglas In a pull request, I have two mutually exclusive ideas on possible commits that both depend on the pull request being accepted. If it was one, I'd add it to the pull request. How do I present two alternatives?
09:17 User458764 joined #git
09:20 nevodka joined #git
09:20 pbandark joined #git
09:20 h12o joined #git
09:24 alexandre9099 joined #git
09:26 moei joined #git
09:27 Levex joined #git
09:27 alexandre9099 joined #git
09:29 plos joined #git
09:30 venmx joined #git
09:31 catsup joined #git
09:31 SteffanW joined #git
09:32 jackrandom joined #git
09:32 alexandre9099 joined #git
09:32 catsup joined #git
09:32 telephone joined #git
09:32 telephone joined #git
09:33 kadoban Two separate, complete, pull requests probably.
09:33 robotroll joined #git
09:35 mSSM joined #git
09:35 sarri joined #git
09:35 sarri joined #git
09:37 User458764 joined #git
09:38 cdown joined #git
09:39 spm_draget left #git
09:39 jstein_ joined #git
09:41 Acerific joined #git
09:45 Masber_080 joined #git
09:45 tymczenko joined #git
09:47 alexandre9099 joined #git
09:50 blackwind_123 joined #git
09:52 zeroed joined #git
09:52 alexandre9099 joined #git
09:53 theoceaniscool joined #git
09:53 Sadeukko joined #git
09:54 a_thakur joined #git
09:54 circ-user-zNiD2 joined #git
09:55 onehrxn_ joined #git
09:58 borkr joined #git
10:01 jameser joined #git
10:01 t-mart joined #git
10:01 Cabanossi joined #git
10:06 dsdeiz joined #git
10:06 dsdeiz joined #git
10:08 Bombe joined #git
10:09 Silenced joined #git
10:10 sea-gull joined #git
10:13 h12o joined #git
10:18 govg joined #git
10:18 circ-user-zNiD2_ joined #git
10:18 diogenese joined #git
10:23 cd5133 joined #git
10:23 telephone joined #git
10:23 telephone joined #git
10:28 nu2linux joined #git
10:31 cd5133 left #git
10:31 KnightsOfNi joined #git
10:33 nu2linux left #git
10:35 ziombelas joined #git
10:36 cdown joined #git
10:36 lipsumar joined #git
10:37 Levex joined #git
10:38 finalbeta joined #git
10:38 kristofferR joined #git
10:42 MajorPayne joined #git
10:46 Cabanossi joined #git
10:53 masuberu joined #git
10:57 sgo11 joined #git
10:58 _ng joined #git
11:01 sgo11 hi, can I check a list of git actions/commands (like history) in a git project? All my changes are gone and revert back when I use vscode editor. I am wondering what happened. I didn't run any commands manually. My uncommited changes are just gone. thanks a lot.
11:03 User458764 joined #git
11:03 mda1 joined #git
11:04 mentazoom joined #git
11:06 Gloomy joined #git
11:07 visual henlo gits
11:07 Quetzal joined #git
11:08 finalbeta joined #git
11:12 robattila256 joined #git
11:14 robotroll joined #git
11:15 njbair joined #git
11:16 Cabanossi joined #git
11:16 digidog joined #git
11:17 _ikke_ sgo11: at most, there is the reflo
11:17 re1 joined #git
11:17 _ikke_ reflog
11:17 _ikke_ man git reflog
11:17 gitinfo the git-reflog manpage is available at https://gitirc.eu/git-reflog.html
11:17 circ-user-zNiD2 joined #git
11:19 borkr joined #git
11:21 jbitdrop joined #git
11:23 Raed|Mobile joined #git
11:23 ok91 joined #git
11:26 treaki joined #git
11:26 alexandre9099 joined #git
11:31 xaa__ joined #git
11:32 ChiLL_SurF joined #git
11:32 ych14_ joined #git
11:34 m4sk1n joined #git
11:34 Tobbi joined #git
11:35 zxd joined #git
11:39 sea-gull joined #git
11:40 _ng joined #git
11:41 nowhereman joined #git
11:41 misosoup joined #git
11:46 Cabanossi joined #git
11:48 miklcct joined #git
11:48 zealsham_ joined #git
11:52 Introoter joined #git
11:53 zulutango joined #git
11:55 maxmuster joined #git
11:58 maxmuster morning, i have some troubles signing a git tag. git tells me that my secret gpg key is not found. i set the keyid over 'git config --local user.signkey' with the long and the short id, set the gnupghome variable, used strace to see which keyring is used (the same keyring as if i use gpg manually), and i can list the key over 'gpg --list-secret-keys', so what am i doing wrong?
11:59 finalbeta joined #git
12:00 _ikke_ maxmuster: Not sure if it helps, but can you also try GIT_TRACE=1 git ...
12:02 maxmuster yup
12:03 maxmuster okay i need to check something
12:08 maxmuster okay so git uses the "git -bsau 'name <email>'" command to sign, that command gives me the "key not found" error even when i run it manually, but "gpg --list-secret-keys" shows me the key...
12:08 maxmuster how can that be?
12:09 Altiare joined #git
12:10 maxmuster *"gpg -bsau 'name <email>'"
12:10 a_thakur joined #git
12:10 grawity what does gpg list it as?
12:10 grawity (specifically what prefix does it show?)
12:12 maxmuster what do you mean with prefix? looks similar to this output: https://help.github.com/articles/telling-git-about-your-gpg-key/
12:12 grawity I know what output it looks "similar" to
12:12 grawity I have gpg myself
12:12 grawity I mean, what output *exactly* does it show?
12:14 maxmuster may i ask why you need that information?
12:14 akitada joined #git
12:14 Gloomy joined #git
12:14 maxmuster as it looks exactly like that just with other values for the id and name/email
12:14 Bombe joined #git
12:16 maxmuster uid is like 'name <email>', thats different to the output of the website
12:16 grawity to check whether it *really* looks 'exactly like that' or whether it actually shows different prefixes for the keys
12:16 grawity prefix being the 1st column of the output
12:16 maxmuster first line is sec, second is uid, third is ssb
12:17 grawity good, so at least gpg doesn't think it's on a smartcard somewhere
12:17 grawity are you using 2.1 or older?
12:18 maxmuster gpg or git version?
12:19 maxmuster gpg is 1.4
12:19 grawity gpg; 2.1 stores keys differently
12:19 maxmuster ye i have gpg 1.4.2
12:19 grawity is that also what `gpg --version` reports?
12:19 maxmuster yes
12:19 grawity some systems end up having both
12:20 maxmuster its the output of gpg --version
12:21 grawity is this your only key?
12:21 maxmuster yes
12:21 grawity does it wor with just `gpg -bsa`?
12:22 maxmuster yes it then asks for my passphrase
12:23 zealsham_ joined #git
12:24 astrofog joined #git
12:25 grawity then just use that
12:25 grawity -u probably expects a different format, I think
12:25 grawity or 1.4.2 is just buggy
12:25 grawity (even in the old branch, the latest is 1.4.21)
12:26 felGru joined #git
12:26 grawity unset user.signkey, and happily put your oh-so-secret name and email on all your commits on github
12:26 dave0x6d joined #git
12:27 Tobbi joined #git
12:28 maxmuster its not oh so secret, i just did want to know why you want to have it. nvm tho. how can i do 'git tag -s version' then? cause git uses -bsau itself
12:29 cebula joined #git
12:29 grawity it doesn't unless you tell it to, by setting user.signkey
12:29 finalbeta joined #git
12:29 maxmuster oh well that sounds good
12:30 ziombelas joined #git
12:31 maxmuster hmm i removed the user.* settings from ./.git/config but its still using -bsau
12:31 mSSM joined #git
12:34 telephone joined #git
12:34 telephone joined #git
12:35 JanC_ joined #git
12:37 krabat joined #git
12:37 leeN joined #git
12:38 maxmuster or should i just update gpg?
12:39 grawity make sure they're not in your global config
12:39 grawity I've been using gnupg 2.1.x with no problems
12:40 Bookwormser joined #git
12:41 zeroed joined #git
12:41 sgo11 _ikke_, sorry about the late reply. I was out of my desk. I just ran "git reflog", it just gives me the same result as "git log". it doesn't tell me anything else. I think vscode editor must run something to revert back my changes. thanks.
12:44 plos joined #git
12:45 eroux joined #git
12:45 aispark joined #git
12:45 tarkus joined #git
12:46 sgo11 To be more specific, I didn't do the code change in vscode. I did the change in vim editor through ssh session remotely and then scp the entire diretory to my local PC (NOT git clone). Then I use vscode to open it yesterday. I didn't run any git commands manually at all in my local PC. something really wrong with vscode. I am wondering what it does to my files..
12:47 gnixev joined #git
12:48 cdown joined #git
12:48 User458764 joined #git
12:51 maxmuster grawity: its out of my local git config and i do not have a global one atm, hmm.. im thinking about just upgrading gpg then
12:51 circ-user-zNiD2 joined #git
12:52 njbair joined #git
12:53 zealsham_ how do i fix remote origin already exist
12:53 zealsham_ joined #git
12:54 zealsham_ how do i fix remote origin already exist
12:55 masuberu joined #git
12:56 bremner git remote rename origin other-name
12:59 Noldorin joined #git
12:59 zealsham_ bremner: i have a folder called codebase.git on my server, i want to be able to push and commit code to it from my local machine via ssh . how do i do that
12:59 zealsham_ i can already ssh into the machine
13:00 zeroed joined #git
13:00 zeroed joined #git
13:01 Cabanossi joined #git
13:02 Gustavo6046 joined #git
13:03 Bookwormser joined #git
13:05 bremner zealsham_: then I guess you just need the right url to push to; see man git-push for examples
13:05 gitinfo zealsham_: the git-push manpage is available at https://gitirc.eu/git-push.html
13:08 maxmuster left #git
13:12 Bookwormser joined #git
13:15 bremner zealsham_: if you need more detailed help, see man gittutorial "USING GIT FOR COLLABORATION" (replacing paths with ssh urls as needed). or try !book
13:15 gitinfo zealsham_: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
13:15 gitinfo zealsham_: the gittutorial manpage is available at https://gitirc.eu/gittutorial.html
13:17 AJ_Michels joined #git
13:20 chipotle joined #git
13:21 tymczenko joined #git
13:22 tymczenko joined #git
13:32 Eryn_1983_FL joined #git
13:34 cebor joined #git
13:35 nowhereman joined #git
13:36 roelmonnens joined #git
13:43 zealsham_ after pusshing my commits to my remote server i cant see the codes their
13:46 visual hey
13:46 Cabanossi joined #git
13:46 visual error: Merging is not possible because you have unmerged files.
13:46 visual how do i check merge status, and/or initiate a merge locally?
13:49 acetakwas joined #git
13:50 Nilesh_ joined #git
13:50 Bookwormser joined #git
13:50 User458764 joined #git
13:55 Hello71 git status
13:55 Hello71 zealsham_: don't push to non-bare repos
13:57 IanLiu joined #git
13:58 zealsham_ Hello71:  i pushed to a bare repo
13:58 zealsham_ Hello71: but am not seeing the files their like i would on git hub. i need to see the files
13:59 IanLiu joined #git
14:01 Hello71 !bare
14:01 gitinfo A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
14:01 jagob joined #git
14:01 IanLiu joined #git
14:02 IanLiu joined #git
14:02 zealsham_ Hello71: okay, is their anyway to make the contents visible just like pushing to github
14:03 netj joined #git
14:03 User458764 joined #git
14:03 _ikke_ github has a webinterface
14:04 SteffanW joined #git
14:05 zealsham_ _ikke_:  its on my own server not github
14:05 h12o joined #git
14:06 cbreak zealsham_: if you want a web interface, then get one
14:06 cbreak something like gitlab, or github on premise hosting, or similar
14:08 kyan joined #git
14:08 Zoxc joined #git
14:09 chipotle joined #git
14:12 Bookwormser joined #git
14:12 Gaa joined #git
14:12 venmx joined #git
14:16 User458764 joined #git
14:18 Zoxc joined #git
14:22 manuelschneid3r joined #git
14:25 visual why does 'git fetch' not provide the remote branches that are not on local?
14:25 visual do i need to git fetch --branch-name or something?
14:26 selckin it does?
14:26 visual no it doesnt
14:27 visual http://i.imgur.com/mc0Ula4.png
14:27 selckin yes it does
14:27 visual no, it doesnt
14:27 visual pls refer to the screenshot
14:27 selckin git branch -a
14:27 rominronin joined #git
14:27 visual so it isnt git fetch
14:28 visual right, the branch -a shows the remote onek indeed
14:28 visual how do i /fetch/ them?
14:28 cbreak visual: git fetch works
14:28 visual cbreak: dude i showed you the screenshot
14:28 cbreak visual: just git fetch
14:28 jeffreylevesque joined #git
14:28 Bob8989|3 joined #git
14:28 cbreak visual: you suck at screenshotting
14:28 selckin they are fetched, you want a local branch tracking it
14:28 Bob89893 joined #git
14:28 visual i tried with fetch and fetch -all
14:28 cbreak visual: type git branch -a and you'll see them
14:28 visual cbreak: i do see them, but they didnt fetch, when i do 'git branch' there's only the local ones
14:29 cbreak visual: they are fetched
14:29 cbreak visual: everything git branch shows is fetched
14:29 cbreak it does not access the remote
14:29 visual but git branch shows only the local ones
14:29 visual :I
14:29 cbreak visual: you sound extremely confused
14:29 visual git branch -a shows the remotes too
14:29 cbreak no
14:29 cbreak it shows local remote-tracking branches
14:29 visual dude are you blind or just retarded
14:29 visual its in the fucking screenshot
14:29 visual was kicked by cbreak: Your behavior is not conducive to the desired environment.
14:30 cbreak learn some manners.
14:30 visual joined #git
14:30 visual :/
14:30 cbreak visual: if you don't want help, leave
14:30 User458764 joined #git
14:30 Gloomy joined #git
14:30 visual i do, but "you sound confused" is the opposite of help, and serves only to frustrate people even more
14:30 cbreak don't blabber lies and expect us to accept you being rude
14:30 visual >lies in the screenshot
14:30 visual wew
14:30 selckin visual: your terminilogy is all wrong, hence confused
14:31 cbreak visual: your branches are fetched
14:31 cbreak period
14:31 cbreak git branch -a shows them
14:31 cbreak so they are fetched
14:31 selckin visual: start believing what was said, and adjust what you think the words you use mean
14:31 cbreak period
14:31 cbreak nothing to discuss
14:32 cbreak visual: why don't you just stop blabbering nonsense and check the branches out?
14:32 visual i see what you mean now, my bad
14:32 visual i understood that fetching them means copying them locally, so git branch should've shown them
14:32 cbreak it will, if you ask it to show them
14:32 cbreak with -a or -r
14:32 cbreak plain branch only shows branches in refs/heads
14:32 visual yeah i see, sorry for losing my temper, but it's frustrating
14:32 visual oooh
14:33 cbreak branch -r shows those in refs/remotes
14:33 visual only commited branches?
14:33 dsdeiz joined #git
14:33 cbreak and -a shows both
14:33 visual right..
14:33 cbreak all of those are local
14:33 cdown joined #git
14:33 cbreak honestly, just check the branches you want out
14:34 cbreak with their plain name
14:34 visual well, back to the original question, i had some uncommited changes on my home machine, and pulled from the remote branch the new changes, it attempted to merge them but kind of screwed things up
14:34 cbreak git merge --abort
14:34 cbreak that'll abort the merge
14:34 cbreak but you should really commit before merging
14:34 visual no i get it, but it's a bit of a mess now i think.. i stashed, pulled, and applied, now it's.. there's these things added
14:34 cbreak having uncommitted changes is always risky
14:34 visual +<<<<<<< Updated upstream to the file
14:35 cbreak so the pull worked?
14:35 visual im not sure
14:35 cbreak look at the output that git pull had
14:35 visual is there a way i can backtrace/
14:35 visual sec
14:35 cbreak scroll up...
14:35 raatiniemi joined #git
14:35 Murii joined #git
14:35 roelmonnens joined #git
14:35 visual yeah, cant, the buffer isnt big enough
14:35 visual dont see the pull anymore
14:36 visual >fatal: There is no merge to abort (MERGE_HEAD missing).
14:36 bitmod joined #git
14:36 bitmod join #security
14:36 cbreak visual: so the merge worked
14:36 cbreak and your git stash pop probably failed
14:36 visual what if i remove the conflicting file, and try to pull again?
14:37 cbreak visual: git log --graph --oneline --decorate --all
14:37 cbreak visual: was it merged or not? show.
14:37 visual woah
14:38 visual http://i.imgur.com/DbRcVMS.png
14:38 visual i dont.. see it
14:38 cbreak so you're on calendar
14:38 dreiss joined #git
14:39 visual yeah
14:39 cbreak and you merged origin's calendar branch successfully
14:39 cbreak visual: your stash apply failed
14:39 visual you're the pro, man, i dont even know where the beginning of the graph is
14:39 cbreak just resolve the conflict manually
14:39 cbreak and then commit
14:40 cbreak the stash was made from an old commit, so all the changes since then have conflict potential
14:40 visual manually = in the editor?
14:40 cbreak sure
14:40 cbreak how ever
14:40 cbreak some people like merge tools
14:40 visual i mean, remove the <<<<<< thing
14:40 cbreak man git-mergetool
14:40 gitinfo the git-mergetool manpage is available at https://gitirc.eu/git-mergetool.html
14:40 cbreak visual: those are just the markers
14:40 cbreak the conflicts are between the >>> and <<<
14:40 visual right, i see
14:40 cbreak you'll have to look at them, and think
14:40 cbreak there's no better way :(
14:41 cbreak git can't resolve such conflicts because it can not understand it
14:41 User458764 joined #git
14:41 visual it's alright, i'ver worked with the file recenly, fresh memory
14:41 visual im surprised it understands as much as it does tbh
14:41 cbreak visual: once you've resolved the conflict, and gotten to the state you want, git add and git commit
14:42 visual alright, simple enough
14:42 visual now, can you please laymen terms me in what happened?
14:42 visual afair, i stashed the local changes, pulled the thing, then tried to apply it
14:42 visual so the conflict happened?
14:42 cbreak visual: it seems to have happened when you git stash poped
14:43 cbreak you tried to put changes that were not made for the current state into the current state
14:43 visual poped  = apply?
14:43 cbreak that gave a conflict
14:43 cbreak git stash pop is git stash apply && git stash drop
14:43 visual right.. well alright
14:43 visual you know what's weird? if i do git pull, it says im up-to-date
14:43 cbreak of course it does
14:43 visual but the local file is conflicting, and added to the thing
14:44 visual thing = stage
14:44 cbreak visual: as I said, the merge succeeded
14:44 cbreak you have nothing else to merge
14:44 TikityTik joined #git
14:44 cbreak so it tells you it's up to date already
14:44 visual oh right right
14:44 cbreak git pull is a fetch and a merge
14:45 visual got it, thanks cbreak
14:47 marianina8 joined #git
14:50 i7c git it*
14:51 bouncy joined #git
14:59 dirtyroshi joined #git
15:01 finalbeta joined #git
15:04 theoceaniscool joined #git
15:05 zeroed joined #git
15:05 zeroed joined #git
15:08 overlord_tm joined #git
15:10 ych joined #git
15:11 Goplat joined #git
15:14 bitmod anyone used github pages here?
15:14 blackwind_123 joined #git
15:16 Cabanossi joined #git
15:18 safe joined #git
15:22 Masber_080 joined #git
15:23 cdown joined #git
15:24 prg3 joined #git
15:25 Khisanth joined #git
15:27 Seveas pretty certain some of us have, yes. But #github is --> that way :)
15:30 tarkus joined #git
15:32 s1scha joined #git
15:32 cads joined #git
15:35 bitmod ah great, thanks
15:35 jackrandom joined #git
15:35 mattcen joined #git
15:37 livingstn joined #git
15:38 _ng joined #git
15:39 roelmonnens joined #git
15:40 marianina8 joined #git
15:41 MDA2 joined #git
15:44 miczac joined #git
15:44 chubek_ joined #git
15:46 madewokherd joined #git
15:46 gugah joined #git
15:48 Rhonda joined #git
15:53 borkr joined #git
15:53 publio joined #git
15:56 davidomanfredo joined #git
15:56 livingstn joined #git
16:01 h12o joined #git
16:02 jstein_ joined #git
16:06 nickel_dime_look joined #git
16:07 rkazak joined #git
16:09 Noldorin joined #git
16:10 TheSimonator joined #git
16:12 thiago joined #git
16:19 alexandre9099 joined #git
16:21 Karazhan joined #git
16:22 njbair joined #git
16:22 ojdo joined #git
16:27 M6HZ joined #git
16:28 Arokh joined #git
16:31 masuberu joined #git
16:33 Gloomy joined #git
16:34 menip joined #git
16:35 roelmonnens joined #git
16:38 bernd27 joined #git
16:38 ankit01ojha joined #git
16:38 sonOfRa joined #git
16:40 davidomanfredo joined #git
16:42 ok91 joined #git
16:42 Vampire0_ joined #git
16:46 livingstn joined #git
16:51 Kulrak joined #git
16:51 Kulrak joined #git
16:51 ncd|leeN joined #git
16:51 Tobbi joined #git
16:54 tristanp joined #git
16:54 User458764 joined #git
16:55 dave0x6d joined #git
16:55 User458764 joined #git
16:56 ter0 joined #git
16:57 masuberu joined #git
17:00 fahadash joined #git
17:00 sbasso joined #git
17:02 svm_invictvs joined #git
17:02 ayogi joined #git
17:05 livingstn joined #git
17:06 Tobbi joined #git
17:09 watabou joined #git
17:11 ribasushi joined #git
17:12 jagob joined #git
17:12 tnecniv joined #git
17:15 gnixev joined #git
17:16 Cabanossi joined #git
17:18 chipotle joined #git
17:19 hhee joined #git
17:19 jaziz joined #git
17:20 lagothrix joined #git
17:22 mentazoom joined #git
17:27 romank joined #git
17:30 fission6 joined #git
17:30 fission6 whats the preferred way to install git on a new macbook
17:30 NeverDie joined #git
17:34 Endarked joined #git
17:38 Seveas install ubuntu, then sudo apt-get install git :)
17:40 IanLiu joined #git
17:43 psprint joined #git
17:44 netj joined #git
17:45 thiago fission6: homebrew
17:45 User458764 joined #git
17:48 kexmex joined #git
17:49 Seveas thiago: why that over xcode?
17:51 romank joined #git
17:52 thiago you're going to need homebrew anyway
17:52 Vampire0 joined #git
17:53 circ-user-zNiD2 joined #git
17:54 JimDungo joined #git
17:55 ajayk joined #git
17:56 jab416171 joined #git
17:57 sea-gull joined #git
17:57 davidomanfredo joined #git
18:00 JimDungo joined #git
18:04 h12o joined #git
18:04 cdown joined #git
18:05 bernd9000 joined #git
18:06 jab416171 joined #git
18:06 JimDungo joined #git
18:07 prg3 joined #git
18:08 jackrandom joined #git
18:08 Pursuit joined #git
18:13 Douko joined #git
18:14 Stumbler joined #git
18:15 romank joined #git
18:16 zerow joined #git
18:19 jab416171 joined #git
18:20 tarkus joined #git
18:20 romank joined #git
18:21 selckin joined #git
18:23 govg joined #git
18:23 roelmonnens joined #git
18:25 Tobbi joined #git
18:28 Endarked joined #git
18:34 jpX joined #git
18:35 Bookwormser joined #git
18:36 dfs joined #git
18:39 apotry joined #git
18:40 User458764 joined #git
18:41 hhee joined #git
18:41 Shock_ joined #git
18:42 kyan joined #git
18:46 Cabanossi joined #git
18:47 NeverDie joined #git
18:50 livingstn joined #git
18:52 Bookwormser joined #git
18:55 tristanp joined #git
19:11 Endarked joined #git
19:14 denisMone joined #git
19:14 irqq_ joined #git
19:14 borkr joined #git
19:15 venmx joined #git
19:15 durham joined #git
19:18 misosoup joined #git
19:21 zeroed joined #git
19:21 zeroed joined #git
19:21 jon-mac joined #git
19:25 cdown joined #git
19:27 MattMaker joined #git
19:27 gugah joined #git
19:28 Lyqyd joined #git
19:29 Starky joined #git
19:31 MattMaker joined #git
19:32 bernd27 joined #git
19:32 Puffball joined #git
19:33 livingstn joined #git
19:35 miha_S7_ joined #git
19:35 venmx joined #git
19:36 Shock_ joined #git
19:42 marianina8 joined #git
19:48 northfurr joined #git
19:53 Levex joined #git
19:54 justanotheruser joined #git
19:55 hhee2 joined #git
19:58 bitmod how do i push to my repo?
19:58 thiago git push
19:58 thiago if it's not your current branch's upstream, git push reponame
19:58 bitmod i've created a "test" repo on my github account, but get "'test' does not appar to be a git repository", even though it is
19:59 thiago don't discuss with git
19:59 thiago if it says it isn't, it isn't
19:59 thiago assume git is right and you're wrong, then seek to figure out where your thinking was wrong
19:59 thiago what command did you run that gave you that message?
20:00 bitmod thiago: so i did "git remote add origin https://github.com/username/test.git"
20:00 thiago ok
20:00 thiago and then?
20:01 bitmod git remote -v lists 2 items, origin test (fetch) and origin test (push)
20:01 Cabanossi joined #git
20:01 nidr0x joined #git
20:01 bitmod then git push origin master
20:02 bitmod and i get that error/warning
20:02 Atm0spher1c joined #git
20:02 thiago confirm the URL
20:03 bpna joined #git
20:03 bitmod thiago: just checked my /.git/config file, url wasn't updated for some reason
20:03 bitmod thanks
20:04 Eyrao joined #git
20:04 oleksiyp joined #git
20:05 h12o joined #git
20:08 raynold joined #git
20:11 Ahtqo joined #git
20:11 roelmonnens joined #git
20:11 fhackdroid joined #git
20:13 YuGiOhJCJ joined #git
20:13 zeroed joined #git
20:13 zeroed joined #git
20:14 CheckDavid joined #git
20:21 caper joined #git
20:25 hacman joined #git
20:25 tunjin joined #git
20:27 bmahe joined #git
20:31 aispark joined #git
20:32 mattcen joined #git
20:34 rebrec joined #git
20:35 Starky joined #git
20:35 rebrec joined #git
20:36 toothe joined #git
20:36 toothe I am unable to push my branch to my gitlab repo, but I'm not entirely certain why.
20:37 toothe fatal: The current branch heroku has no upstream branch
20:37 rebrec joined #git
20:37 toothe it suggests using git push --set-upstream origin mybranch
20:37 Tobbi joined #git
20:37 toothe so I did....I get an error saying gitlab rejects the upload because the tip of the current branch is behind its remote counterpart.
20:38 toothe it suggests doing a git pull. so I did.
20:39 anuxivm joined #git
20:40 toothe err, fixed it.
20:43 durham joined #git
20:47 toothe my git history is so ugly...
20:48 jpX joined #git
20:51 durham joined #git
20:54 netj joined #git
20:56 tristanp joined #git
20:59 ertesx joined #git
21:00 northfurr joined #git
21:03 telephone joined #git
21:03 telephone joined #git
21:04 alexandre9099 joined #git
21:05 Vampire0 toothe, !perfect
21:05 gitinfo toothe: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
21:05 toothe thanks!
21:06 Vampire0 toothe, yw
21:06 gitinfo toothe: 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", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
21:06 toothe oh, this is excellent.
21:07 toothe .karma Vampire0
21:07 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 35 (3 in past 30 days) (4 given out)
21:09 toothe not to be too cynical, but what benefit is that?
21:12 zeroed joined #git
21:13 TheSimonator joined #git
21:15 Vampire0 toothe, karma never has benefits (btw. the karma command just requests the status, not increases the karma, just as the bot said)
21:17 bpna joined #git
21:20 jzeus joined #git
21:20 utxo joined #git
21:20 ivo_ joined #git
21:27 toothe what benefits?
21:27 toothe oh, misread you.
21:27 Vampire0 You just have it :-D
21:27 toothe so, it has no function...
21:28 alexandre9099 joined #git
21:30 _pix joined #git
21:32 chipotle joined #git
21:35 acetakwas joined #git
21:39 lindenle joined #git
21:39 ChiLL_SurF joined #git
21:40 Vampire0 toothe, it is karma, google it
21:42 toothe I"m familiar with karma :) but I meant the purpose of attaining karma in the context of an IRC channel :)
21:42 toothe I'm half Indian
21:43 toothe the other half is Pakistani. So I'm at war with myself.
21:43 Vampire0 maybe you feel better with more karma. :-D
21:43 tnecniv joined #git
21:46 alexandre9099 joined #git
21:50 nowhereman joined #git
21:53 blunaxela joined #git
21:53 oskarkv joined #git
21:53 nitesh joined #git
21:56 Yondering joined #git
21:56 aidalgol joined #git
21:58 northfurr joined #git
22:00 durham joined #git
22:00 h12o joined #git
22:01 Cabanossi joined #git
22:04 durham joined #git
22:05 bpna joined #git
22:07 miha_S7_ joined #git
22:10 tg` joined #git
22:10 puff` joined #git
22:11 ohcibi_ joined #git
22:12 tristanp joined #git
22:12 Mogget_ joined #git
22:12 svm_invictvs joined #git
22:12 Nickeeh_ joined #git
22:13 nadley_ joined #git
22:13 MattMaker joined #git
22:13 _builtin joined #git
22:13 lucasem_ joined #git
22:13 gusnan_ joined #git
22:13 planigan_ joined #git
22:14 jfr joined #git
22:15 MattMaker joined #git
22:16 rubenb_ joined #git
22:16 wcpan_ joined #git
22:17 acetakwas joined #git
22:19 sturner joined #git
22:21 markus-k_ joined #git
22:21 Groscheri joined #git
22:21 weylin- joined #git
22:21 krillr_ joined #git
22:21 MerinoBailon joined #git
22:21 jerrcs- joined #git
22:21 TinkerTyper_ joined #git
22:21 BlackPan- joined #git
22:21 Mindii joined #git
22:21 enckse_ joined #git
22:21 ygeLN_ joined #git
22:21 AlexanderS_ joined #git
22:22 Saturn286 joined #git
22:22 sturner_ joined #git
22:22 govg joined #git
22:22 Xarodon_ joined #git
22:22 Alexey_ joined #git
22:23 mniip joined #git
22:25 TheSimonator joined #git
22:25 matthiaskrgr joined #git
22:26 Guest73997 joined #git
22:26 Guest73997 joined #git
22:27 yanope joined #git
22:27 zxd joined #git
22:28 askb joined #git
22:30 jackrandom joined #git
22:35 acetakwas joined #git
22:36 bernd27 joined #git
22:36 robattila256 joined #git
22:37 jason237 joined #git
22:40 murph joined #git
22:42 telephone joined #git
22:42 ivo_ joined #git
22:42 PasiFist joined #git
22:42 earnestly joined #git
22:42 malide joined #git
22:42 f0rks joined #git
22:42 hussam joined #git
22:42 timwis joined #git
22:42 batrick joined #git
22:42 lucido joined #git
22:42 dmj` joined #git
22:42 yena joined #git
22:42 Lowell joined #git
22:42 adymitruk joined #git
22:43 telephone joined #git
22:43 todd_dsm joined #git
22:43 f0rks joined #git
22:43 timwis joined #git
22:44 dmj` joined #git
22:44 netj joined #git
22:45 Brando753-o_O_o joined #git
22:45 alexandre9099 joined #git
22:49 Bookwormser joined #git
22:53 mSSM I have merged a branch into master, but now I realize that I wanted to squash a few commits. My problem: I try to git reset --hard SHA_BEFORE_MERGE, but when I now do git rebase -i branch, it tells me “noop” and “rebase SHA_AFTER_MERGE..SHA_BEFORE_MERGE into SHA_AFTER_MERGE”
22:55 Vampire0 mSSM, did you maybe merge in both directions, so that "branch" is also pointing to SHA_AFTER_MERGE?
22:55 mSSM Vampire0: branch is indeed pointing to SHA_AFTER_MERGE
22:55 Vampire0 mSSM, I guess if you have a look at gitk, you will quickly see what is strange in your history
22:55 mSSM But isn't that a given?
22:56 Vampire0 mSSM, a given?
22:56 Vampire0 mSSM, after the merge you have a merge commit
22:56 Vampire0 if the branch is pointing to it, you already merged the histories
22:56 mSSM Vampire0: I mean, if I have a branch forked off of master, do some commits there, then merge it into master - then master should point to the head of the branch
22:57 mmlb joined #git
22:57 Vampire0 if you want to rebase you should do it before merging
22:57 mSSM Ahh
22:57 mSSM Vampire0: that makes sense
22:57 Vampire0 No, master will point at the merge commit, except it was a fast-forward merge
22:57 cev joined #git
22:57 Vampire0 And if it was, you could simply do the interactive rebase to squash your commits without resetting first
23:01 Cabanossi joined #git
23:01 Bookwormser joined #git
23:04 mSSM Vampire0: Thanks, all worked out as I wanted. :)
23:05 infernix joined #git
23:08 cdown joined #git
23:10 madewokherd joined #git
23:11 Vampire0 mSSM, <w
23:11 Vampire0 s/<w/yw/
23:11 venmx joined #git
23:13 Levex joined #git
23:13 MattMaker joined #git
23:16 howitdo joined #git
23:17 mSSM The story continues: so i successfully rebased branch a and then merged to master. Now, branch b was forked off of branch a and still contains the history of a before the merge.
23:18 mSSM s/before the merge/before the rebase
23:18 sturner joined #git
23:18 mSSM Is there a way to just take the last commit of branch b and apply it ontop of master?
23:19 mSSM Reason: rebasing branch b on master leads to lots of conflicts.
23:19 nidr0x joined #git
23:22 netj joined #git
23:23 mSSM git cherry-pick was what I needed
23:23 iamashishkebab2 joined #git
23:26 dviola joined #git
23:27 sturner joined #git
23:28 salamanderrake joined #git
23:29 cdown joined #git
23:30 _pix joined #git
23:30 salamanderrake_ joined #git
23:33 Vampire0 mSSM, exactly :-)
23:33 alexandre9099 joined #git
23:33 miha_S7_ joined #git
23:35 cdown_ joined #git
23:52 planigan joined #git
23:52 Archrover joined #git
23:52 rkazak joined #git
23:53 Kaisyu joined #git
23:56 dax joined #git
23:57 cqi joined #git
23:59 marianina8 joined #git

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