Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-12

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

All times shown according to UTC.

Time Nick Message
00:01 anuxivm joined #git
00:01 geek2ne2 joined #git
00:06 TikityTik so why does it give a merge conflict when I want to push my changes when the last commit is from the same machine?
00:07 TikityTik I mean it gives a merge conflict when I do a git pull
00:07 TikityTik it should know that changes are what's overwriting
00:07 TikityTik s/that changes/that my changes
00:08 elsevero joined #git
00:08 geek2nerd joined #git
00:10 raynold joined #git
00:13 pfrench joined #git
00:13 geek2ne18 joined #git
00:13 Cabanossi joined #git
00:21 geek2nerd joined #git
00:22 dreiss joined #git
00:27 cbreak TikityTik: the only reason to give a merge conflict is because you made changes that conflict with the existing changes in your current branch
00:28 TikityTik cbreak: I assume that when you make changes after a git push, then there shouldn't be a merge conflict
00:28 TikityTik that is doing a git commit and a git pull
00:28 TikityTik it should overwrite the old changes imo
00:28 cbreak TikityTik: no
00:28 TikityTik what do you mean?
00:28 cbreak git will never overwrite changes
00:29 svm_invictvs joined #git
00:29 cbreak because it'd be braindead to do so
00:29 cbreak TikityTik: you made conflicting history
00:29 cbreak look at !lol
00:29 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
00:29 TikityTik !lol
00:29 cbreak you have a conflict because you made changes that are incompatible
00:31 Rodya_ joined #git
00:32 TikityTik when i do var/span = x["spans"], does that make a copy of the value? Or is it a pointer?
00:32 TikityTik woops wrong channel
00:38 Lunatrius joined #git
00:38 geek2nerd joined #git
00:38 minn joined #git
00:40 lowercaseman joined #git
00:40 ngc0202 cbreak: thank you
00:43 geek2nerd joined #git
00:44 pfrench joined #git
00:45 geek2ne53 joined #git
00:48 pfrench joined #git
00:49 SwiftMatt joined #git
00:51 Bob8989 joined #git
00:51 matoro joined #git
00:51 ahrs_ joined #git
00:54 mmattice joined #git
00:55 mrslaughter1775 joined #git
00:56 pfrench joined #git
00:57 BackEndCoder joined #git
00:57 askb joined #git
00:58 Rodya_ joined #git
00:58 EV3RYDAYPR0GRESS joined #git
01:01 EV3RYDAYPR0GRESS joined #git
01:02 durham joined #git
01:06 sunrunner20 joined #git
01:06 minn Is there any way to force hunk headers to always display ranges with commas (i.e., no single-digit ranges when only one line is modified)?
01:07 chardan joined #git
01:08 Lunatrius joined #git
01:10 svm_invictvs joined #git
01:11 Rodya_ joined #git
01:12 pfrench joined #git
01:13 Rodya__ joined #git
01:13 Lunatrius` joined #git
01:15 mmattice joined #git
01:21 geek2nerd joined #git
01:26 pfrench joined #git
01:28 Cabanossi joined #git
01:30 pfrench joined #git
01:31 durham joined #git
01:31 Impaloo joined #git
01:35 pfrench joined #git
01:35 wgrant joined #git
01:38 matoro joined #git
01:38 qpdb joined #git
01:41 pfrench joined #git
01:45 pfrench joined #git
01:46 Gsham joined #git
01:47 durham joined #git
01:50 TikityTik I need help making my local master branch track a different upstream. How do I create this different upstream and change the upstream of the master branch?
01:50 impliednude joined #git
01:51 TikityTik err i think i got it
01:51 ali1234 TikityTik: git remote add and git branch -u i think
01:51 salamanderrake joined #git
01:51 TikityTik but i made my remote as git add remote asdf <url> instead of git add remote origin/asdf <url>
01:51 TikityTik ali1234: bit branch -u creates a new branch I think
01:52 ali1234 origin isn't special afaik it's the just default name of the first remote
01:57 arescorpio joined #git
01:58 pfrench joined #git
02:00 Lyqyd joined #git
02:03 pfrench joined #git
02:04 mehola joined #git
02:04 kpease joined #git
02:06 chachasmooth joined #git
02:07 pfrench joined #git
02:09 wxg joined #git
02:11 pfrench joined #git
02:11 raijin joined #git
02:12 Gsham joined #git
02:13 Cabanossi joined #git
02:15 duderonomy joined #git
02:17 Lor_ joined #git
02:18 pfrench joined #git
02:23 chachasmooth joined #git
02:23 pfrench joined #git
02:23 Gsham joined #git
02:24 pks joined #git
02:24 Shakeel_ joined #git
02:27 d^sh joined #git
02:32 finalbeta joined #git
02:33 impliednude joined #git
02:34 kris_w joined #git
02:34 chachasmooth joined #git
02:38 fatalhalt joined #git
02:40 steven joined #git
02:46 pfrench joined #git
02:46 Cabanossi joined #git
02:46 Emperor_Earth joined #git
02:46 ResidentBiscuit 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/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:50 SwiftMatt joined #git
02:51 chachasmooth joined #git
02:52 anuxivm left #git
02:54 pfrench joined #git
02:55 wilbert joined #git
02:55 sunri5e joined #git
02:56 livingst_ joined #git
02:58 pfrench joined #git
03:02 fstd_ joined #git
03:02 Celmor joined #git
03:03 Celmor how do I output the contents of a text file from the repo if the one in the one in the trunk/filesystem is different?
03:03 Celmor I can diff them but I want to see the whole file
03:04 stoopkid joined #git
03:04 ojdo joined #git
03:15 pfrench joined #git
03:20 nowhere_man joined #git
03:21 chachasmooth joined #git
03:22 pfrench joined #git
03:24 Vortex34 joined #git
03:24 lagothri1 joined #git
03:25 ankit01ojha joined #git
03:26 Noob64753 joined #git
03:26 pfrench joined #git
03:28 imack joined #git
03:28 tanuki joined #git
03:29 raijin joined #git
03:29 Dazzyo joined #git
03:30 pdgwien- joined #git
03:30 bjarki joined #git
03:30 hwoarang_ joined #git
03:31 Kuukunen joined #git
03:31 sysanthrope joined #git
03:31 hegge joined #git
03:31 Ariadeno joined #git
03:31 Mogget joined #git
03:31 drodger_ joined #git
03:31 ezzieygu1wuf joined #git
03:32 hvxgr__ joined #git
03:32 Rh0nda joined #git
03:32 xkr47_ joined #git
03:32 netwoodle joined #git
03:32 z01d_ joined #git
03:34 Jupelius_ joined #git
03:34 dwmw2_go` joined #git
03:34 Gsham joined #git
03:35 FrozenFire[alt] joined #git
03:35 ariver|ERR joined #git
03:35 bremner` joined #git
03:35 totemizer joined #git
03:35 Hello71_ joined #git
03:35 matth1askrgr joined #git
03:35 tnsi joined #git
03:35 rideh- joined #git
03:35 ueberall joined #git
03:35 ueberall joined #git
03:35 kyledeal joined #git
03:35 LHL_Jordan joined #git
03:35 sarbs_ joined #git
03:35 systmkor_ joined #git
03:35 Sc0rpius_ joined #git
03:35 ploop_ joined #git
03:35 Dewin|znc joined #git
03:35 bremner` joined #git
03:35 GodEater` joined #git
03:35 SegFaultAX_ joined #git
03:35 inovas_ joined #git
03:35 steven_ joined #git
03:36 iron_houzi_ joined #git
03:36 pR0Ps_ joined #git
03:36 WebDawgII joined #git
03:36 ngc0202` joined #git
03:36 ashnur joined #git
03:36 ribasushi joined #git
03:36 safe joined #git
03:36 Cthalupa joined #git
03:37 martinklepsch joined #git
03:37 ngc0202` left #git
03:37 relgar joined #git
03:37 Cork joined #git
03:38 mehola joined #git
03:38 bttf joined #git
03:38 BlueMatt joined #git
03:38 arunpyasi joined #git
03:38 michael_mbp joined #git
03:39 codebam joined #git
03:39 johnnyfive joined #git
03:40 spriz joined #git
03:40 unholycrab joined #git
03:40 nsh- joined #git
03:41 raynold joined #git
03:41 petersaints joined #git
03:41 livingstn joined #git
03:43 WakiMiko joined #git
03:43 umbSublime joined #git
03:43 umbSublime joined #git
03:43 Vortex34 joined #git
03:43 ThunderChicken joined #git
03:43 ThunderChicken joined #git
03:43 quadz joined #git
03:44 salparadise joined #git
03:44 MLM__ joined #git
03:44 metachr0n joined #git
03:44 unclechu joined #git
03:45 cust joined #git
03:45 MissionCritical joined #git
03:47 livingst_ joined #git
03:49 eclecticjohny joined #git
03:49 rt joined #git
03:49 cmosguy joined #git
03:49 graingert joined #git
03:49 PasiFist joined #git
03:49 Shakeel_ joined #git
03:49 wxg joined #git
03:49 menip joined #git
03:49 marenz_ joined #git
03:49 thecomedian joined #git
03:49 om_henners joined #git
03:49 de-vri-es joined #git
03:49 ash_workz joined #git
03:49 ToxicFrog joined #git
03:49 skelterjohn joined #git
03:49 jokester joined #git
03:49 crater2150 joined #git
03:49 jesk joined #git
03:49 asd5a joined #git
03:49 aspiers joined #git
03:49 creppe joined #git
03:49 flo[m] joined #git
03:49 Retropikzel[m] joined #git
03:49 Sheogorath[m] joined #git
03:49 pkiller joined #git
03:49 roflin joined #git
03:49 llamapixel joined #git
03:49 chrysa joined #git
03:49 krainboltgreene joined #git
03:49 osse joined #git
03:49 Remram joined #git
03:49 Derega_ joined #git
03:49 graingert joined #git
03:49 cmosguy joined #git
03:50 jesk joined #git
03:50 llamapixel joined #git
03:50 pkiller joined #git
03:51 rt joined #git
03:52 graingert joined #git
03:52 cmosguy joined #git
03:53 Brando753-o_O_o joined #git
03:54 Cthalupa joined #git
03:55 Derperperd joined #git
03:55 Derperperd joined #git
03:57 hexagoxel joined #git
03:58 marenz__ joined #git
04:00 BackEndCoder joined #git
04:00 pfrench joined #git
04:01 pks joined #git
04:06 Eryn_1983_FL joined #git
04:09 Cabanossi joined #git
04:10 Shakeel_ joined #git
04:11 BackEndCoder joined #git
04:14 BackEndCoder joined #git
04:14 phy1729 git show hashish:path  iirc
04:15 patternexon joined #git
04:16 TbobbyZ joined #git
04:17 Rodya_ joined #git
04:17 dsdeiz joined #git
04:17 dsdeiz joined #git
04:19 pfrench joined #git
04:20 clemf joined #git
04:21 chipotle joined #git
04:22 chachasmooth joined #git
04:23 TbobbyZ joined #git
04:24 pfrench joined #git
04:27 imack joined #git
04:29 pfrench joined #git
04:33 shinnya joined #git
04:35 pfrench joined #git
04:41 salamanderrake joined #git
04:42 hexagoxel joined #git
04:47 pfrench joined #git
04:48 text1 joined #git
04:52 BrianBlaze420 joined #git
04:56 pfrench joined #git
04:56 mizu_no_oto joined #git
05:00 pfrench joined #git
05:02 pks joined #git
05:04 pfrench joined #git
05:07 dsdeiz joined #git
05:08 reznord joined #git
05:08 cagedwisdom joined #git
05:10 Cabanossi joined #git
05:11 pfrench joined #git
05:12 Serus joined #git
05:13 MrcRjs joined #git
05:14 Serus when merging a local branch, I have the local, the base, and the remote, is the remote the branch being merged on the current branch?
05:14 lucido-cl joined #git
05:16 pfrench joined #git
05:19 menip joined #git
05:21 pfrench joined #git
05:23 SuprDewd joined #git
05:24 hexagoxel joined #git
05:26 pfrench joined #git
05:26 xissburg joined #git
05:27 netj joined #git
05:36 pfrench joined #git
05:41 pfrench joined #git
05:43 aidalgol joined #git
05:45 variable joined #git
05:45 pfrench joined #git
05:46 TbobbyZ joined #git
05:46 MrWoohoo joined #git
05:47 robattila256 joined #git
05:48 clemf joined #git
05:49 pfrench joined #git
05:51 MineCoins joined #git
05:53 eclecticjohny joined #git
05:54 pfrench joined #git
05:54 eclecticjohny joined #git
05:57 leachim6 joined #git
05:57 leachim6 hey git folks
05:57 gitinfo leachim6: 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.
05:58 leachim6 so I wrote a post-merge hook in my ~/.git/hooks directory, but when I git-pull the hook is not copied, I also tried putting a post-merge script in the bare repo /repo/hooks/post-merge and that doesn't work either
05:58 leachim6 I feel like I am fundamentally misunderstanding how hooks work, OR there's a config variable I need to enable
05:58 * variable glares at leachim6
05:58 variable leachim6 git hooks are never copied during a pull
05:59 variable hooks are local to the repo
05:59 leachim6 ...sorry for the hilight variable, but to be fair...I'm not sure what you expected
06:00 leachim6 define "local to the repo" as in the source bare repo, or each individual copy pulled
06:00 variable as in, it does not get reproduced when you clone/pull/fetch
06:00 pfrench joined #git
06:00 leachim6 so there's no way to setup a universal git hook to run a script anytime anyone pulls a repo?
06:01 variable you can run it on the server-side
06:01 variable but you can't have it copied to the user's git config
06:01 variable consider the security implications: its esentially arbitrary code execution
06:01 leachim6 Yeah, I understand
06:01 leachim6 I'm using this particular repo for ~/.files configs so I control all of the pull points
06:02 leachim6 so I'll need to put my post-merge hook in ~/.git/hooks on all of my cloned repos then?
06:02 variable correct
06:03 leachim6 thank you for your succinct answer, I've been reading up on hooks trying to wrap my head around it
06:03 leachim6 as it stands I'm only using about 5% of the features git actually offers
06:05 pfrench joined #git
06:10 pfrench joined #git
06:14 svm_invictvs joined #git
06:16 ayogi joined #git
06:19 ankit01ojha joined #git
06:21 pfrench joined #git
06:26 pfrench joined #git
06:29 sathed joined #git
06:31 pfrench joined #git
06:31 BackEndCoder joined #git
06:32 hexagoxel joined #git
06:35 pfrench joined #git
06:37 CEnnis91 joined #git
06:39 pfrench joined #git
06:39 dsdeiz joined #git
06:39 Cabanossi joined #git
06:43 pfrench joined #git
06:46 ResidentBiscuit joined #git
06:46 luke_nukem joined #git
06:47 pfrench joined #git
06:49 CaptainKnots joined #git
06:51 User458764 joined #git
06:51 pfrench joined #git
06:54 TbobbyZ joined #git
06:56 pfrench joined #git
06:56 Oatmeal joined #git
06:58 sathed joined #git
06:59 pfrench joined #git
07:04 pfrench joined #git
07:05 karthik left #git
07:09 hexagoxel joined #git
07:09 Cabanossi joined #git
07:11 tmg joined #git
07:14 pfrench joined #git
07:17 perlpilot joined #git
07:18 pfrench joined #git
07:19 zefferno joined #git
07:20 Rodya_ joined #git
07:21 _ikke_ ures git actually offers                                                     │ alzagros      ++
07:23 pfrench joined #git
07:27 dreiss joined #git
07:28 pfrench joined #git
07:29 gtristan joined #git
07:35 pfrench joined #git
07:39 pfrench joined #git
07:43 _ng joined #git
07:44 thebird joined #git
07:50 pfrench joined #git
07:57 User458764 joined #git
07:57 jagob joined #git
07:58 radoslavcap joined #git
07:59 pfrench joined #git
08:00 smurfendrek123 joined #git
08:01 VladGh_ joined #git
08:02 sagittarian joined #git
08:03 pfrench joined #git
08:04 navidr joined #git
08:07 TbobbyZ joined #git
08:09 absinthe joined #git
08:09 finalbeta joined #git
08:10 __name__ joined #git
08:11 Ring0` joined #git
08:11 eroux joined #git
08:11 loglaunch joined #git
08:13 glebihan_ joined #git
08:15 pfrench joined #git
08:15 dimi1947 joined #git
08:16 energizer joined #git
08:17 energizer I have a branch that I like, and i want master to be changed so that its identical to it
08:17 energizer is merge enough for that?
08:18 hexagoxel joined #git
08:21 Rodya_ joined #git
08:21 pfrench joined #git
08:21 chachasmooth joined #git
08:23 pks joined #git
08:25 pfrench joined #git
08:25 jungsubk joined #git
08:26 radoslavcap joined #git
08:29 pfrench joined #git
08:30 scoobertron joined #git
08:31 smurfendrek123 joined #git
08:31 chachasmooth joined #git
08:33 zxd joined #git
08:33 zxd hi
08:33 chipotle_ joined #git
08:34 zxd in 'git merge' if there are any conflicts does git revert the entire process and remove files it added to index file doing the merge ?
08:36 pfrench joined #git
08:37 ThomasLocke joined #git
08:38 darkbit joined #git
08:38 hexagoxel joined #git
08:38 overlord_tm joined #git
08:41 YuGiOhJCJ joined #git
08:41 dersand joined #git
08:42 User458764 joined #git
08:43 pfrench joined #git
08:46 TbobbyZ joined #git
08:48 Ardethian\work joined #git
08:49 smurfendrek123 joined #git
08:49 apotry joined #git
08:50 pfrench joined #git
08:50 b3gott3n joined #git
08:51 b3gott3n i have a very basic git question
08:51 b3gott3n i init git in the root directory of my dev folder
08:51 b3gott3n i have three projects in three folders and i'd like to be able to move all of the files in the dev folder with git add .
08:51 b3gott3n how do i add all the files recursively in the foldeR?
08:52 marianina8 joined #git
08:52 ignarps joined #git
08:55 netj joined #git
08:56 zxd refs/tags/v0.1^{}  means parent of v0.1 ?
08:58 a_thakur joined #git
08:58 pfrench joined #git
09:00 mehola joined #git
09:00 zxd --dereference Dereference tags into object IDs as well. They will be shown with "^{}" appended.
09:03 pfrench joined #git
09:05 Lunatrius joined #git
09:07 pfrench joined #git
09:11 hexagoxel joined #git
09:12 sathed joined #git
09:12 wxg joined #git
09:15 pfrench joined #git
09:18 wxg joined #git
09:20 SilverBe joined #git
09:21 pfrench joined #git
09:22 Rodya_ joined #git
09:22 theoceaniscool joined #git
09:23 smurfendrek123 joined #git
09:24 masuberu joined #git
09:25 Whiskey is it possible to change last commit? keep the massage but update the files that are commited?
09:25 Balliad joined #git
09:25 MarioBranco joined #git
09:26 radoslavcap joined #git
09:27 b3gott3n joined #git
09:27 Peng It's possible to change anything. If you've already pushed it somewhere it's a bad idea to, though.
09:27 Peng git commit --amend makes it easy to change the most recent commit
09:27 b3gott3n hey just logged back in
09:28 Whiskey ok
09:28 b3gott3n i had a queston about how to commit my whole dev folder with multiple projects
09:28 Whiskey yeh its allredy pushed
09:29 pl joined #git
09:30 kexmex joined #git
09:31 pfrench joined #git
09:33 catsup joined #git
09:34 Balliad joined #git
09:34 catsup joined #git
09:35 Glooomy joined #git
09:38 pfrench joined #git
09:38 zefferno joined #git
09:40 Cabanossi joined #git
09:44 j08nY joined #git
09:44 pfrench joined #git
09:45 ResidentBiscuit joined #git
09:46 osse /
09:46 hexagoxel joined #git
09:49 adac joined #git
09:52 pfrench joined #git
09:53 Guest11411 joined #git
09:53 Guest11411 joined #git
09:54 Sound joined #git
09:54 User458764 joined #git
09:55 courrier joined #git
09:57 jnavila joined #git
09:59 pfrench joined #git
10:01 CaptainKnots joined #git
10:01 Jupelius joined #git
10:04 ThomasLocke joined #git
10:06 psprint joined #git
10:06 psprint Hello. How to explicitly block "push origin master" when being on branch <branch>?
10:07 pfrench joined #git
10:09 Murii_ joined #git
10:10 a_thakur joined #git
10:13 pfrench joined #git
10:18 NwS joined #git
10:19 Vampire0 joined #git
10:19 venmx joined #git
10:22 NotThizTime joined #git
10:22 Rodya_ joined #git
10:22 pfrench joined #git
10:26 bitmod joined #git
10:26 osse psprint: Maybe a pre-push hook. man githooks
10:26 gitinfo psprint: the githooks manpage is available at http://jk.gs/githooks.html
10:28 thebird joined #git
10:29 zxd "Rebasing replays changes from one line of work onto another in the order they were introduced, whereas merging takes the endpoints and merges them together."   merging dosen't replay changes from on line of work onto another?
10:29 xall joined #git
10:30 scoobertron joined #git
10:32 kini joined #git
10:33 osse zxd: No, it merges them directly
10:33 Timvde joined #git
10:35 _ikke_ [08:21] [33] [irc/freenode] 4:#git{1199}* [H: 10(32), 8(50), 13(108), 11(3), 7(3)]
10:35 _ikke_
10:35 osse ood for you!
10:35 osse G
10:35 _ikke_ ha :P
10:36 zxd osse: what is that mean it just updates tree objects ?
10:36 zxd without any patches
10:37 tribly joined #git
10:38 pfrench joined #git
10:39 a_thakur joined #git
10:42 pfrench joined #git
10:46 venmx joined #git
10:47 govg joined #git
10:50 pfrench joined #git
10:52 nettoweb joined #git
10:54 marianina8 joined #git
10:54 albel727 joined #git
10:54 _ikke_ zxd: merge does not look at the individual commits, it just look at the end results of each branch and merges that
10:57 math-alpha joined #git
10:59 albel727 joined #git
10:59 Puffball joined #git
11:02 Tobbi joined #git
11:02 hhee joined #git
11:06 hexagoxel joined #git
11:06 Jackneill joined #git
11:07 eroux joined #git
11:09 jost joined #git
11:12 d0nn1e joined #git
11:13 minn joined #git
11:13 minn Should --ignore-all-space still be producing 'No Newline at end of file' in diffs?
11:14 minn ah, no, nevermind
11:14 pfrench joined #git
11:18 Zialus joined #git
11:19 WeiJunLi joined #git
11:19 adac joined #git
11:19 diogenese joined #git
11:20 manuelschneid3r joined #git
11:20 pfrench joined #git
11:23 Rodya_ joined #git
11:27 publio joined #git
11:28 thebird joined #git
11:31 a_thakur joined #git
11:33 math-alpha joined #git
11:34 metalraiden34 joined #git
11:36 jnavila joined #git
11:38 pfrench joined #git
11:39 darkbit joined #git
11:41 jimi_ joined #git
11:41 jameser joined #git
11:45 radoslavcap joined #git
11:47 Gustavo6046 joined #git
11:47 Sound joined #git
11:52 lowercaseman joined #git
11:56 pfrench joined #git
11:57 excalith joined #git
12:02 zxd joined #git
12:02 marenz__ joined #git
12:03 ayogi joined #git
12:03 venmx joined #git
12:04 metalraiden34 joined #git
12:04 smurfendrek123 joined #git
12:05 ToBeCloud joined #git
12:07 nettoweb joined #git
12:10 Cabanossi joined #git
12:17 plos joined #git
12:18 marenz__ joined #git
12:20 zxd HEAD..<upstream>
12:20 zxd what's the faq about the dots
12:20 zxd !dots
12:20 gitinfo A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.
12:20 _ikke_ zxd: man gitrevisions
12:20 gitinfo zxd: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
12:23 dsdeiz_ joined #git
12:23 venmx joined #git
12:24 cr34ton joined #git
12:24 Rodya_ joined #git
12:25 shinnya joined #git
12:28 Glooomy joined #git
12:28 _ng joined #git
12:29 muhannad_______ joined #git
12:29 metalraiden34 joined #git
12:29 hungrybeast joined #git
12:30 jozwior joined #git
12:31 hungrybeast Hey everyone, i need help with git
12:31 _ikke_ !just_ask
12:31 gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
12:31 grayjoc joined #git
12:31 vdv joined #git
12:31 NullableTruth joined #git
12:32 hungrybeast Whenever i try using git on my Debian 8 VPS, i get this message: fatal: unable to access 'https://github.com/Just-Some-Bots/MusicBot.git/': gnutls_handshake() failed: Public key signature verification has failed.
12:32 hungrybeast Wget and Curl both work on HTTPS connections
12:33 JanC joined #git
12:34 robotroll joined #git
12:37 cdown joined #git
12:37 jnavila joined #git
12:37 pfrench joined #git
12:41 livingstn joined #git
12:43 math-alpha joined #git
12:43 plos joined #git
12:44 nowhere_man joined #git
12:45 pfrench joined #git
12:46 Nilesh_ joined #git
12:46 metalraiden34 joined #git
12:48 Vampire0_ joined #git
12:48 King_Hual joined #git
12:49 _ikke_ hungrybeast: Did you set a custom CA cert / bundle for git?
12:51 f3r70rr35f joined #git
12:54 pfrench joined #git
12:54 goTAN joined #git
12:55 marianina8 joined #git
12:56 pflanze joined #git
12:56 pflanze Hey. I've finally gotten around pushing https://github.com/pflanze/git-sign
12:57 pflanze "Simple scripts to generate and verify securely signed Git checkouts"
12:57 pflanze (Example of such a signed tag: https://github.com/pflanze​/git-sign/releases/tag/v1 )
12:57 pflanze Comments welcome.
12:59 pfrench joined #git
12:59 Murii_ joined #git
13:00 hungrybeast No, i didnt
13:02 canton7 "rather insecure given that SHA-1 collisions aren't very expensive" -- might want to put a source on that. sha1 collisions are still very expensive: we've only got a collision attack (and a pretty expensive one at that), not a pre-image attack
13:02 pflanze Collisions cost about $75k IIRC.
13:03 pflanze Yes, no pre-image, but usual discussion applies (you can subvert with just a collision in the right circumstances)
13:03 mehola joined #git
13:03 pfrench joined #git
13:03 _ikke_ hungrybeast: what does curl --version return?
13:04 mehola joined #git
13:04 hungrybeast curl 7.52.1 (x86_64-pc-linux-gnu) libcurl/7.52.1 OpenSSL/1.0.2k zlib/1.2.8 libidn2/0.16 libpsl/0.17.0 (+libidn2/0.16) libssh2/1.7.0 nghttp2/1.19.0 librtmp/2.3 Protocols: dict file ftp ftps gopher http https imap imaps ldap ldaps pop3 pop3s rtmp rtsp scp sftp smb smbs smtp smtps telnet tftp Features: AsynchDNS IDN IPv6 Largefile GSS-API Kerberos SPNEGO NTLM NTLM_WB SSL libz TLS-SRP HTTP2 UnixSockets HTTPS-proxy PSL
13:04 pflanze Can add sources of course. Suggestions welcome. Don't really want to make the tool the point of discussions though.
13:05 mehola joined #git
13:05 _ikke_ hungrybeast: can it be this? https://bugs.debian.org/cgi-​bin/bugreport.cgi?bug=835342
13:05 _ikke_ Do you use debian?
13:05 hungrybeast I did install curl-openssh afterwards, it didnt work either beffore i installed the openssh lib
13:05 mehola joined #git
13:06 canton7 pflanze, I meant, more, that from the first sentance like you don't understand the sha1 attack, which makes me quite cautious of everything else in it
13:06 canton7 *sentence. I need more tea.
13:06 hungrybeast Ive seen that, i cant downgrade without apache2 deinstalling and that is like not possible to reinstall for me
13:06 mehola joined #git
13:06 pflanze canton7, yeah, fair point, I'll add some more explanation/reference.
13:06 hungrybeast I run a few web servers, getting them down for a few minutes may cause extreme panic
13:07 hungrybeast And yes, i use debian
13:07 pfrench joined #git
13:08 _ikke_ hungrybeast: what does ldd $(which git) return for you?
13:09 hungrybeast root@darkgamerscommunity:/tmp/source-git/git-2.1.4# ldd $(which git)  linux-vdso.so.1 (0x00007ffed4fdc000)  libpcre.so.3 => /lib/x86_64-linux-gnu/libpcre.so.3 (0x00007f6b56ba6000)  libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 (0x00007f6b5698c000)  libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f6b5676f000)  librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f6b56567000)  libc.so.6 => /lib/x86_64-linux-gnu/lib
13:09 _ikke_ ok, so no direct connection to gnutls
13:10 marenz__ left #git
13:10 Cabanossi joined #git
13:11 _ikke_ hungrybeast: some part got cut off
13:11 _ikke_ hungrybeast: libc.so.6 => /lib/x86_64-linux-gnu/libc
13:11 _ikke_ can you perhaps use a pastebin?
13:11 hungrybeast Yes
13:11 hungrybeast http://pastebin.com/hdi59x3n
13:13 Celmor left #git
13:13 _ikke_ hungrybeast: It's odd, because git uses libcurl, so it uses whatever library curl uses
13:14 _ikke_ (openssl vs gnutls)
13:14 hungrybeast should i try installing curl with gnutls
13:15 pfrench joined #git
13:16 leeN joined #git
13:16 tvw joined #git
13:16 _ikke_ Do you have multiple versions of libcurl installed somehow?
13:16 hungrybeast Not that i know of
13:16 _ikke_ http://stackoverflow.com/a/34645007/20261
13:17 _ikke_ https://askubuntu.com/questions/18​6847/error-gnutls-handshake-failed​-when-connecting-to-https-servers
13:19 pflanze canton7, I've reworded the README now. Thanks for the feedback!
13:21 hungrybeast On the second link, ive done what they say, but this comes up
13:21 hungrybeast gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error gpgv: Signature made Sat 19 Mar 2016 02:23:37 PM CET gpgv:                using RSA key 054CB8F31343CF44 gpgv: Can't check signature: No public key dpkg-source: warning: failed to verify signature on ./git_2.1.4-2.1+deb8u2.dsc
13:21 _ng joined #git
13:21 CussBot joined #git
13:22 canton7 pflanze, I still don't understand from reading the readme how the tool improves on git's signing
13:22 pfrench joined #git
13:23 pflanze You mean what it does, technically?
13:23 pflanze Or why that's more secure?
13:23 canton7 pflanze, I mean, what stops an attacker from meddling with the tag object?
13:23 adac joined #git
13:23 pflanze canton7, the GPG signature
13:24 john-soda joined #git
13:24 canton7 there's no GPG signature on your release?
13:24 pflanze There is, I don't know why Github isn't showing it.
13:24 alexandre9099 joined #git
13:25 Rodya_ joined #git
13:25 hungrybeast Nvm i fixed that small problem
13:25 canton7 anyway, I'm expecting to see a techincal description of how your scheme works, and how exactly that mitigates any weakness in sha1 (which I also want to see documented)
13:26 pflanze canton7, ( git clone https://github.com/pflanze/git-sign; cd git-sign; git cat-file -p v1 )
13:28 chachasmooth joined #git
13:32 pflanze canton7, I've uploaded my public key, the tag is shown as "verified" now: https://github.com/pflanze​/git-sign/releases/tag/v1
13:32 pfrench joined #git
13:34 metalraiden34 joined #git
13:35 govg joined #git
13:35 alexandre9099 joined #git
13:36 pfrench joined #git
13:39 Bhootrk_ joined #git
13:40 Cabanossi joined #git
13:40 GodEater joined #git
13:40 GodEater joined #git
13:41 alexandre9099 joined #git
13:47 satifant joined #git
13:49 CptHaddock joined #git
13:49 CptHaddock_ joined #git
13:50 CptHaddock joined #git
13:56 hhee joined #git
13:57 chachasmooth joined #git
14:01 GT4066 joined #git
14:05 pfrench joined #git
14:06 OnceMe joined #git
14:06 OnceMe is it possible to git clone ssh:// and to provide password in some param (same line)?
14:07 mehola joined #git
14:09 chachasmooth joined #git
14:09 f3r70rr35f joined #git
14:10 pfrench joined #git
14:13 PCatinean joined #git
14:13 PCatinean hey guys
14:13 PCatinean I do git push origin branch -f and it says it's up to date when the content is obviously different
14:13 PCatinean i did a history rewrite btw with commit --amend
14:13 PCatinean but why does this happen?
14:14 PCatinean sorry my bad
14:15 theoceaniscool joined #git
14:17 xall joined #git
14:18 nanga joined #git
14:18 nanga joined #git
14:20 pfrench joined #git
14:21 PCatinean How does one clone a module with submodules as well?
14:21 osse PCatinean: clone -recursive
14:23 PCatinean osse, thanks
14:23 PCatinean is there a way I can somehow force the submodules to be updated on each pull
14:23 metalraiden34 joined #git
14:28 ChadTaljaardt joined #git
14:32 robattila256 joined #git
14:32 zxd if I merge multiple branches 'git log' will print the commit history from all the branches I merged ?
14:33 oscar joined #git
14:40 Cabanossi joined #git
14:41 metalraiden34 joined #git
14:43 pfrench joined #git
14:43 jophish joined #git
14:43 jophish hi all
14:46 jophish I use a monorepo at work (it works really well and it's *unlikely* that this will change) and I'd like to open source some parts of it. The best procedure I can think of at the moment would be to git filter-branch --subdirectory-filter on the subdirectory I want to make public and commit the results of that to a public repo
14:46 LBV_User joined #git
14:46 oscar joined #git
14:47 jophish I thought I'd ask here to see if anyone has dealt with a similar situation or has any bright ideas
14:48 n1ce joined #git
14:50 Ranhir joined #git
14:50 overlord_tm joined #git
14:51 livingstn joined #git
14:52 f3r70rr35f joined #git
14:52 ispn joined #git
14:53 marianina8 joined #git
14:53 tax joined #git
14:55 john-soda joined #git
14:55 re1 joined #git
14:56 pfrench joined #git
14:57 ndowens08 joined #git
14:57 Gsham joined #git
14:58 tax left #git
14:59 ndowens08 I did git fetch upstream, and then merged it, if I go into a branch that I created and I havent changed since yesterday, it now says i have 1 and 17 diff commits each; branch origin/master have diverged. How do I fix this? I believe this is what tends to cause me to mess up my forked copy of a repo
14:59 pflanze canton7, I've explained the workings in more detail now, hope that's good now. Thanks again!
15:00 Kulrak joined #git
15:00 Kulrak joined #git
15:01 pfrench joined #git
15:02 astrofog joined #git
15:02 zxd didn't quite get the difference between file:// and plain path /   for cloning a repository on local disk
15:05 miklcct joined #git
15:06 pfrench joined #git
15:09 f3r70rr35f joined #git
15:09 osse PCatinean: Write a hook that does it
15:10 PCatinean I mean for other cloning the repository
15:10 PCatinean So when they do git clone project they also get the latest version of the submodule
15:10 PCatinean or at least the commited version
15:11 osse They get the committed version if they use --recursive. There's no way force the use of that flag
15:11 kexmex joined #git
15:11 tsdev joined #git
15:12 PCatinean I guess that makes sense osse
15:13 Zialus joined #git
15:16 oscar joined #git
15:17 pfrench joined #git
15:20 chuchunaku joined #git
15:21 pfrench joined #git
15:22 Impaloo joined #git
15:23 metalraiden34 joined #git
15:23 gtristan joined #git
15:24 Chinggis6 joined #git
15:26 Rodya_ joined #git
15:27 sz0 joined #git
15:27 trion joined #git
15:36 pfrench joined #git
15:36 ndowens08 left #git
15:37 darkbit joined #git
15:38 XenophonF joined #git
15:41 Kaisyu joined #git
15:44 theoceaniscool joined #git
15:46 ocelotsloth joined #git
15:46 john-soda joined #git
15:47 khfeng_ joined #git
15:48 andrybak joined #git
15:49 rominronin joined #git
15:49 EV3RYDAYPR0GRESS joined #git
15:49 oscar joined #git
15:50 kbs joined #git
15:53 f3r70rr35f joined #git
15:53 darkbit joined #git
15:55 Cabanossi joined #git
15:56 mizu_no_oto joined #git
15:58 zivester joined #git
15:59 pfrench joined #git
16:02 YuGiOhJCJ joined #git
16:02 VladGh joined #git
16:02 f3r70rr35f joined #git
16:05 sawk joined #git
16:07 cdown joined #git
16:08 mehola joined #git
16:15 ahrs joined #git
16:16 darkbit joined #git
16:16 dsdeiz joined #git
16:16 dsdeiz joined #git
16:17 ResidentBiscuit joined #git
16:18 SilverBe joined #git
16:19 Learath2 if im basing a feature on someone elses yet unmerged feature branch what would be the workflow?
16:19 impliednude joined #git
16:19 pfrench joined #git
16:23 Derperperd joined #git
16:23 pfrench joined #git
16:25 ResidentBiscuit joined #git
16:26 Chatscript-5765 joined #git
16:26 cdown_ joined #git
16:27 dreiss joined #git
16:27 Rodya_ joined #git
16:28 TheHackax joined #git
16:28 svm_invictvs joined #git
16:28 f3r70rr35f joined #git
16:30 Vampire0 joined #git
16:31 rkazak_ joined #git
16:31 Noldorin joined #git
16:31 ResidentBiscuit joined #git
16:33 Joedoe joined #git
16:34 pfrench joined #git
16:34 gugah joined #git
16:34 nowhere_man joined #git
16:35 dinkleberg joined #git
16:36 fahadash joined #git
16:39 jungsubk joined #git
16:39 math-alpha joined #git
16:42 rivarun joined #git
16:42 Sc0rpius_ left #git
16:42 math-alpha left #git
16:42 Sc0rpius joined #git
16:43 fbwnd joined #git
16:44 dinkleberg joined #git
16:44 rkazak_ joined #git
16:45 pfrench joined #git
16:46 andrybak Learath2, are you using pull requests?
16:47 Learath2 andrybak: yeah
16:47 andrybak in pull requests based workflow, an easy way would be to make a PR into the unmerged branch, and after it is merged, redirect your PR
16:47 eroux joined #git
16:48 Learath2 but the unmerged branch is on another persons fork, so my pr wouldn't be in the right place
16:49 xall joined #git
16:49 andrybak you could mention in the PR description that your branch is based on top of so-and-so.
16:49 aielima joined #git
16:51 ResidentBiscuit joined #git
16:51 Murii_ joined #git
16:52 Derperperd joined #git
16:53 jimi_sanchez joined #git
16:57 error joined #git
17:00 jnavila joined #git
17:02 anuxivm joined #git
17:03 Khisanth joined #git
17:05 CEnnis91 joined #git
17:05 smurfendrek123_ joined #git
17:08 TikityTik joined #git
17:09 absinthe joined #git
17:13 xissburg joined #git
17:13 multi_io joined #git
17:13 f3r70rr35f joined #git
17:15 orbyt_ joined #git
17:15 Jellyg00se joined #git
17:18 ResidentBiscuit joined #git
17:19 naquad joined #git
17:20 durham joined #git
17:21 dreiss joined #git
17:22 madewokherd joined #git
17:24 darkbit joined #git
17:27 Vampire0_ joined #git
17:27 Rodya_ joined #git
17:31 durham joined #git
17:31 metalraiden34 joined #git
17:31 nd joined #git
17:33 energizer joined #git
17:33 jagob joined #git
17:34 energizer joined #git
17:35 energizer joined #git
17:36 Vampire0 joined #git
17:36 energizer joined #git
17:36 ocelotsloth joined #git
17:37 Rodya_ joined #git
17:37 energizer joined #git
17:37 anuxivm left #git
17:38 a_thakur joined #git
17:40 darkbit joined #git
17:40 kini joined #git
17:41 smurfendrek123_ joined #git
17:42 math-alpha joined #git
17:43 xall joined #git
17:43 ok91 joined #git
17:44 math-alpha left #git
17:45 Chinggis6 joined #git
17:45 merl1989 joined #git
17:47 robattila256 joined #git
17:48 pfrench joined #git
17:48 mmlb joined #git
17:52 menip joined #git
17:53 Hozy joined #git
17:54 ertesx joined #git
17:58 cdown joined #git
17:58 WeiJunLi joined #git
18:01 math-alpha joined #git
18:02 darkbit joined #git
18:05 svm_invictvs joined #git
18:05 dreiss joined #git
18:05 clemf joined #git
18:07 ResidentBiscuit joined #git
18:07 pfrench joined #git
18:08 pks joined #git
18:09 mehola joined #git
18:10 Chinggis6 joined #git
18:10 Cabanossi joined #git
18:11 jeffreylevesque joined #git
18:12 ertes joined #git
18:15 TbobbyZ joined #git
18:16 TbobbyZ joined #git
18:17 smurfendrek123_ joined #git
18:20 Pseudocrat joined #git
18:20 Pseudocrat joined #git
18:20 TikityTik joined #git
18:21 livingstn joined #git
18:22 darkbit joined #git
18:23 MarioBranco joined #git
18:23 finalbeta joined #git
18:24 xall joined #git
18:26 pfrench joined #git
18:26 mda1 joined #git
18:28 phillco left #git
18:30 leachim6 left #git
18:33 lmatteis joined #git
18:33 ChadTaljaardt joined #git
18:33 Chinggis6 joined #git
18:33 rkazak_ joined #git
18:34 mda1 joined #git
18:36 nidr0x joined #git
18:36 Chinggis6 joined #git
18:38 Derperperd joined #git
18:39 Chinggis6 joined #git
18:40 Chinggis6 joined #git
18:40 mikecmpbll joined #git
18:40 adac joined #git
18:40 safe joined #git
18:43 darkbit joined #git
18:43 rewt joined #git
18:43 OnceMe when I do git pull
18:43 wilbert joined #git
18:43 OnceMe I see changes in a console, however actual file is not updated
18:43 OnceMe I don't see the new file in my list of files
18:43 pfrench joined #git
18:43 OnceMe how come?
18:43 grumble joined #git
18:44 Vampire0_ joined #git
18:48 Chinggis6 joined #git
18:51 pfrench joined #git
18:52 b3gott3n joined #git
18:52 JoshL joined #git
18:53 venmx joined #git
18:53 b3gott3n i had a basic question about how to commit an entire dev folder with multiple projects
18:54 osse OnceMe: what does git status say ?
18:54 b3gott3n i did git init the root of the dev folder
18:54 jnavila joined #git
18:54 b3gott3n and when i commit it only commits the folders on that level and not the files inside
18:54 b3gott3n i do git add .
18:55 b3gott3n but want to be able to add all the files and folder structures in the 3 project folders that are in my dev folder
18:55 xissburg joined #git
18:55 rewt why do you think the files are not added?
18:55 b3gott3n i'm commiting to heroku
18:55 b3gott3n and i go into the heroku bash
18:55 b3gott3n and see the file structure but when i cd into the folders they are empty
18:55 cdown joined #git
18:56 rewt i don't know what you mean by "go into the heroku bash"
18:56 b3gott3n sorry i ssh into the server i'm pushing too and i see the folder structure of the dev folder but when i cd into the project folder they are empty
18:56 rewt did you checkout the repo there?
18:57 b3gott3n what do you mean?
18:57 rewt you'll only see files if you checkout the commit
18:57 Chinggis6 joined #git
18:57 b3gott3n all i've done i git init at the dev folder level, git add . , git commit -m "whatever' and git push heroku master
18:58 b3gott3n can you explain that step to me or link to literature?
18:58 rewt that just pushes the commits to that repo.. you still have to checkout the commit there to see any of those files
18:58 rewt maybe try  git pull master
18:58 mellernoia joined #git
18:58 rewt on the server
18:59 lucido-cl joined #git
18:59 b3gott3n ~ $ git pull master fatal: Not a git repository (or any parent up to mount point /app) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
18:59 b3gott3n on the server
18:59 rewt do you even have a git repo there?
19:00 rewt where did you do `git init`?  on your local machine or on the server?
19:00 wilbert joined #git
19:00 b3gott3n i did git init locally in my dev folder
19:01 rewt how did you set up the server as a remote for thelocal repo?
19:02 b3gott3n heroku has a cli that does "heroku create" which creates the repo
19:02 b3gott3n https://devcenter.heroku.com/articles/git
19:02 b3gott3n i followed those instructions
19:02 Gustavo6046 joined #git
19:03 rewt so you did `heroku create` after `git commit` but before `git push` ?
19:03 b3gott3n do i need to do this?
19:03 b3gott3n ou can also take an existing Git repository and add a remote using the git URL provided when you created your app. You may need to do this to associate a Git repository with an existing application. The heroku git:remote command will add this remote for you based on your applications git url. $ heroku git:remote -a falling-wind-1624 Git remote heroku added.
19:05 rewt depending on what you did before, you may need to do that, depending on what you did before
19:05 pfrench joined #git
19:05 b3gott3n i just did the heroku create command
19:05 rewt when?
19:05 rewt before git push?
19:05 b3gott3n yes
19:05 rewt and after git commit?
19:06 b3gott3n The heroku create command creates a new application on Heroku – along with a git remote that must be used to receive your application source.
19:06 sbasso joined #git
19:06 rewt should have been:  git init, git commit, heroku create, git push
19:06 b3gott3n so i only have one application so i only do heroku create once
19:06 b3gott3n ahhh
19:06 b3gott3n why is that?
19:06 rewt because that's what that page says
19:06 rewt have to read from top to bottom, not jump all over
19:06 b3gott3n sorry i did do that
19:06 b3gott3n i did the steps in order
19:07 b3gott3n all the files on the root level are there, just the folders that are commited are empty
19:07 rewt you committed to the master branch?
19:07 OnceMe osse: got it fixed
19:07 b3gott3n can you explain why the folders are empty?  just want to understand the git add or commit better
19:07 b3gott3n yes to the master branch
19:07 OnceMe it was not commited from some reason from my host
19:09 rewt b3gott3n, what do you get when you do:  git ls-tree -r master
19:09 Vampire0 joined #git
19:11 b3gott3n ok so not all the subfolders are empty
19:11 b3gott3n but the 3 project folders with apps in them just show a single line for a commit of the folder, not the contents
19:12 enckse joined #git
19:12 b3gott3n i had erroneously done git init in those folders, but deleted the .git associated so i could commit them
19:12 rewt oh
19:13 b3gott3n that might be part of this
19:13 rewt you may have confused git... maybe now it thinks those are submodules or something
19:13 rewt delete all .git directoryes, and do the git init at the top level
19:13 irqq joined #git
19:13 b3gott3n well when i was doing the git add . git commit previously those folders threw errors in red saying they had modified contents and untracks changes
19:14 b3gott3n so i went in and rm -rf .git then i was able to commit from the root without the error
19:14 rewt right, you got git confused
19:14 storrgie joined #git
19:14 b3gott3n how do i unconfuse git?
19:14 rewt <rewt> delete all .git directories, and do the git init at the top level
19:14 b3gott3n so do the git init again
19:14 b3gott3n how do i delete all the .git directories?
19:14 b3gott3n or make sure i do
19:16 rewt one way would be from the top level:  find -type d -name '.git' -exec rm -rf {} +
19:16 b3gott3n rm -rf .git at the root?
19:16 b3gott3n ok
19:17 b3gott3n find -type d -name '.git' -exec rm -rf {} + find: illegal option -- t
19:17 mknod joined #git
19:19 rewt that's for linux
19:20 b3gott3n oh right
19:22 b3gott3n ok cool i did that
19:22 b3gott3n now i added and commited and its all good
19:22 b3gott3n but now it says:
19:22 b3gott3n git push heroku master fatal: 'heroku' does not appear to be a git repository fatal: Could not read from remote repository.  Please make sure you have the correct access rights and the repository exists.
19:22 nowhere_man joined #git
19:23 b3gott3n i need to do that create step
19:23 b3gott3n without spawning a new server but just init the git on the remote server
19:23 b3gott3n this is now a heroku problem
19:24 b3gott3n ah yes i found the git remote command for heroku lets see if it works
19:25 durham joined #git
19:26 b3gott3n ok now i did a git pull because i couldn't do a push because they weren't in sync
19:27 dvaske joined #git
19:27 b3gott3n git push heroku master To https://git.heroku.com/andrewstrasser.git  ! [rejected]        master -> master (non-fast-forward) error: failed to push some refs to 'https://git.heroku.com/andrewstrasser.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git p
19:28 jstimm joined #git
19:28 TbobbyZ joined #git
19:29 TbobbyZ_ joined #git
19:30 darkbit joined #git
19:31 b3gott3n i just want to overwrite what's on the server is there a way to do that?
19:31 fatalhalt joined #git
19:32 xissburg joined #git
19:33 LBV_User joined #git
19:34 j08nY joined #git
19:34 jnewt_ joined #git
19:36 jnavila joined #git
19:37 pfrench joined #git
19:38 darkbit joined #git
19:39 nowhereman joined #git
19:40 rewt b3gott3n, you could force push:  git push -f ...
19:40 dvaske_ joined #git
19:41 rewt !deploy
19:41 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
19:41 cdg joined #git
19:41 cdown_ joined #git
19:42 metalraiden34 joined #git
19:42 b3gott3n @rewt yay thank you!
19:43 diogenese joined #git
19:44 dvaske joined #git
19:45 aidalgol joined #git
19:46 mmlb joined #git
19:48 PHPanos joined #git
19:49 xissburg joined #git
19:49 pfrench joined #git
19:55 Vampire0_ joined #git
19:55 cdg joined #git
19:56 theoceaniscool joined #git
19:57 paws_ joined #git
19:59 pfrench joined #git
20:01 dbarna joined #git
20:05 pfrench joined #git
20:07 aielima joined #git
20:08 dbarna left #git
20:09 armyriad joined #git
20:09 impliednude joined #git
20:10 mmlb joined #git
20:10 mehola joined #git
20:11 acetakwas joined #git
20:12 acetakwas joined #git
20:12 a_thakur joined #git
20:15 xissburg joined #git
20:20 am55_ joined #git
20:20 apotry joined #git
20:22 TbobbyZ joined #git
20:22 xissburg joined #git
20:23 pfrench joined #git
20:23 manuelschneid3r joined #git
20:29 xissburg joined #git
20:30 clemf joined #git
20:31 clickjack joined #git
20:32 grayjoc joined #git
20:34 jnewt joined #git
20:35 gtristan joined #git
20:35 apotry joined #git
20:35 metalraiden34 joined #git
20:39 Taikibansei joined #git
20:42 metalraiden34 joined #git
20:43 SpeakerToMeat joined #git
20:44 pfrench joined #git
20:45 xissburg joined #git
20:45 Atm0spher1c joined #git
20:46 ignarps joined #git
20:48 salamanderrake joined #git
20:49 irqq_ joined #git
20:55 fatalhalt joined #git
21:01 Jan2 joined #git
21:02 metalraiden34 joined #git
21:02 Jan2 I get empty directories when I clone a specific branch ???
21:02 Rodya_ joined #git
21:03 DolpheenDream joined #git
21:03 rewt Jan2, my guess is that's what it looks like to you
21:04 minn joined #git
21:04 Jan2 rewt trying to clone this branch gives empty directories https://github.com/qt/qt5/tree/5.5.1
21:04 raijin joined #git
21:05 TomyLobo joined #git
21:06 pfrench joined #git
21:06 rewt you mean the submodules?
21:07 Lyqyd joined #git
21:08 glowdemon1 joined #git
21:08 glowdemon1 Hi. Just noticed all of my commits are somehow gone, git log says I don't have any commmits, the files are still here though. Is this a common thing?
21:09 glowdemon1 It isn't pushed to a remote repo
21:09 rewt Jan2, to get the submodules, do:  git submodule update --init --recursive
21:09 Jan2 rewt i.e. the qtbase directory
21:09 rewt eg*
21:09 rewt qtbase is a submodule
21:11 MrcRjs joined #git
21:11 pfrench joined #git
21:11 mehola joined #git
21:12 jost_ joined #git
21:12 Jan2 rewt ah! thanks
21:12 metachr0n joined #git
21:12 gugah joined #git
21:14 MrcRjs joined #git
21:14 Jan2 rewt how can I know it's working ?
21:15 rewt it should be showing it getting things
21:15 Rodya_ joined #git
21:15 smurfendrek123 joined #git
21:16 Jan2 rewt it just says "Cloning into" https://framapic.org/3l3OmQIdbPQm/WiCexIdcpp8i
21:16 darkbit joined #git
21:17 Jan2 rewt still no files ??? why ?
21:17 rewt Jan2, this is what I saw:  http://pastebin.ca/3779281
21:18 Jan2 rewt I don'T see that
21:18 rewt that was using git version 2.8.1.windows.1
21:18 rewt git --version
21:18 cdg_ joined #git
21:19 Jan2 2.11.0.3
21:20 Rh0nda left #git
21:20 Rhonda joined #git
21:21 Lunatrius joined #git
21:21 shgysk8zer0_ joined #git
21:21 Jan2 rewt git version 2.11.0.windows.3
21:21 rewt updating it to try a newer one
21:21 cdown joined #git
21:22 Jan2 maybe I forgot to config something ?, rewt
21:22 tmg joined #git
21:22 _ADN_ joined #git
21:23 a_thakur joined #git
21:24 pfrench joined #git
21:24 rewt trying with latest git version 2.12.0.windows.1
21:25 Jan2 rewt I think I have to setup keys ???
21:25 rewt `git config --global --list` shows just basic config like user.name, user.email, diff.tool
21:25 rewt hmm... ok, now it shows the "Cloning into..." lines, but that's it
21:26 dreiss joined #git
21:27 rewt and the dirs have just a .git file containing a path to ../.git/modules/<modulenam>
21:28 Jan2 rewt yes, same
21:28 raijin joined #git
21:28 Jan2 i'll just use 2.8.1
21:28 rewt but it is cloning them... bigger ones taking a while, and things are getting downloaded
21:29 Jan2 oh, I see checkouts now
21:29 Jan2 ok
21:30 pfrench joined #git
21:30 boombatower joined #git
21:31 mozzarella joined #git
21:32 TbobbyZ joined #git
21:33 re1 joined #git
21:34 pfrench joined #git
21:35 TbobbyZ_ joined #git
21:36 fatalhalt joined #git
21:38 dreiss joined #git
21:39 am55_ joined #git
21:40 TbobbyZ joined #git
21:43 Noldorin joined #git
21:46 am55_ joined #git
21:46 a_thakur joined #git
21:46 pfrench joined #git
21:47 pks joined #git
21:47 metalraiden34 joined #git
21:48 Jan2 rewt all good, ty
21:49 TbobbyZ joined #git
21:54 cdg joined #git
21:56 claui joined #git
21:58 Goplat joined #git
21:59 alexandre9099 joined #git
22:00 pfrench joined #git
22:05 shgysk8zer0_ joined #git
22:05 apotry joined #git
22:07 pfrench joined #git
22:08 alzagros left #git
22:09 neunon joined #git
22:09 mehola joined #git
22:10 peterbecich joined #git
22:12 pfrench joined #git
22:13 eroux joined #git
22:14 TbobbyZ joined #git
22:19 pfrench joined #git
22:20 matoro joined #git
22:20 am55_ joined #git
22:23 cdown_ joined #git
22:28 impliednude joined #git
22:40 pfrench joined #git
22:40 chachasmooth joined #git
22:42 wilbert joined #git
22:44 Guest45611 joined #git
22:44 pfrench joined #git
22:48 pfrench joined #git
22:49 metalraiden34 joined #git
22:51 Rodya_ joined #git
22:52 pijiu joined #git
22:53 NeXTSUN joined #git
22:54 cdg joined #git
22:54 chachasmooth joined #git
22:54 pfrench joined #git
22:55 luke_nukem joined #git
22:56 livingstn joined #git
22:57 NeXTSUN joined #git
22:58 Taikibansei joined #git
22:58 metalraiden34 joined #git
22:58 DolpheenDream joined #git
23:00 pfrench joined #git
23:00 j7k6 joined #git
23:02 sathed_ joined #git
23:02 bufferoverflow joined #git
23:03 n1ce joined #git
23:03 Cabanossi joined #git
23:05 kbs joined #git
23:06 pfrench joined #git
23:08 ResidentBiscuit joined #git
23:10 clemf joined #git
23:11 pfrench joined #git
23:11 chachasmooth joined #git
23:11 bitmod joined #git
23:15 Taikibansei joined #git
23:15 pfrench joined #git
23:17 j7k6 joined #git
23:17 justan0theruser joined #git
23:19 ReptilianBrain joined #git
23:19 j7k6 joined #git
23:20 dreiss joined #git
23:20 gugah_ joined #git
23:23 durham joined #git
23:24 pfrench joined #git
23:24 chachasmooth joined #git
23:25 re1 joined #git
23:26 re1 joined #git
23:26 bufferoverflow joined #git
23:26 boz_v1 joined #git
23:28 pfrench joined #git
23:30 impliednude joined #git
23:31 j7k6 joined #git
23:32 anuxivm joined #git
23:32 chipotle joined #git
23:37 f3r70rr35f joined #git
23:38 adamm joined #git
23:38 pks joined #git
23:39 mizu_no_oto joined #git
23:39 bufferoverflow joined #git
23:41 pfrench joined #git
23:43 Kaisyu joined #git
23:47 a_thakur joined #git
23:48 z01d joined #git
23:50 overlord_tm joined #git
23:50 pfrench joined #git
23:54 LaptopBrain joined #git
23:54 boboc joined #git
23:56 Rodya_ joined #git

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