Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-03

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

All times shown according to UTC.

Time Nick Message
00:00 shgysk8zer0_ joined #git
00:00 NeverDie joined #git
00:05 rkazak joined #git
00:06 rolha joined #git
00:07 tesuji_ joined #git
00:16 rubyonrailed joined #git
00:17 mkoskar joined #git
00:22 ToBeCloud joined #git
00:25 segment-fault joined #git
00:29 arescorpio joined #git
00:32 wrouesnel1 joined #git
00:34 fstd_ joined #git
00:35 lindenle joined #git
00:38 fuchstronaut joined #git
00:41 spudowiar joined #git
00:42 mehola joined #git
00:44 Gitzilla joined #git
00:46 cd-rum joined #git
00:47 lindenle joined #git
00:50 slash77 joined #git
00:50 Cata|Work joined #git
00:51 Cata|Work joined #git
00:52 zumba_addict joined #git
00:58 mischat joined #git
00:58 watabou joined #git
00:59 Literphor joined #git
01:05 Suchiman left #git
01:19 ahmedelgabri joined #git
01:21 BSAlb joined #git
01:27 kus joined #git
01:30 tgunr joined #git
01:31 ulkesh joined #git
01:35 pks joined #git
01:37 ScottG joined #git
01:38 ScottG left #git
01:43 ekinmur joined #git
01:46 wrouesnel2 joined #git
01:50 wrouesnel joined #git
01:53 sauvin joined #git
01:59 jimi_ joined #git
01:59 boombatower joined #git
01:59 jaguarmagenta joined #git
01:59 mischat joined #git
02:01 tarkus joined #git
02:04 netj joined #git
02:05 shgysk8zer0_ joined #git
02:13 sauvin joined #git
02:14 chachasmooth joined #git
02:15 zumba_addict joined #git
02:22 Bennux joined #git
02:25 sauvin joined #git
02:26 thinsoldier joined #git
02:28 sauvin joined #git
02:32 Lyqyd joined #git
02:33 hexagoxel joined #git
02:37 sauvin joined #git
02:39 jason237 joined #git
02:39 fuchstronaut joined #git
02:42 justanotheruser joined #git
02:48 realz joined #git
02:48 romerocesar joined #git
02:51 rgrinberg joined #git
03:01 mischat joined #git
03:13 jaguarmagenta joined #git
03:16 rbern joined #git
03:18 xcesariox joined #git
03:19 tjone270 joined #git
03:20 ahmedelgabri joined #git
03:25 aliasd joined #git
03:25 aliasd anyone have a few minutes of chat time for a complete noob?
03:27 xall joined #git
03:28 treaki__ joined #git
03:29 dreiss joined #git
03:29 peepsalot joined #git
03:31 Geo joined #git
03:32 Geo Hi, I just ran several commits in the wrong branch- how can I move stuff from HEAD~3 to a new branch?
03:33 rewt rebase it
03:34 Geo can you provide any more detail?
03:35 rbern joined #git
03:37 d4rklit3 joined #git
03:37 rewt hmm, you only want some of the commits moved?
03:38 rewt Geo, try this:  git rebase --onto newbranch HEAD~3 HEAD
03:40 Geo git branch newBranch; git reset --hard <sha>; git checkout newBranch
03:40 Geo success.
03:41 rewt that created newBranch at <sha>, but didn't change the other branch
03:42 rewt oh wait, yeah, nvm
03:43 rewt that should do it ... i thought you already had the new branch
03:48 Geo thx
03:48 Geo left #git
03:50 rbern joined #git
03:55 chrisshattuck joined #git
03:59 dreiss joined #git
03:59 romerocesar joined #git
04:03 mischat joined #git
04:06 kadoban joined #git
04:09 Literphor joined #git
04:12 hk238 joined #git
04:18 jaguarmagenta joined #git
04:19 realz joined #git
04:25 liuzhen joined #git
04:36 chrisshattuck joined #git
04:39 fuchstronaut joined #git
04:45 tesuji joined #git
04:47 languitar joined #git
04:50 f3r70rr35f joined #git
04:53 JanC_ joined #git
04:54 cyan__ joined #git
04:55 Cabanossi joined #git
04:55 a_thakur joined #git
04:58 phanimahesh joined #git
05:00 PerlJam joined #git
05:03 ome joined #git
05:04 mischat joined #git
05:08 freimatz joined #git
05:16 freimatz joined #git
05:21 ahmedelgabri joined #git
05:24 anushil05 joined #git
05:33 PaulCapestany joined #git
05:39 tlolczyk joined #git
05:41 anushil05 joined #git
05:48 davidbz joined #git
05:54 tehcha joined #git
05:54 tehcha how do i reverse changes since the last commit?
05:55 moritz tehcha: if you haven't staged them yet, 'git checkout thefile'
05:55 moritz or 'git checkout .' to throw away changes to all files
05:56 OnBrokenWings joined #git
05:58 rkazak joined #git
05:58 PaulCape_ joined #git
05:58 tehcha i think i may have already staged them
05:59 tehcha since it tells me on the previous branch that no changes to commit
05:59 tehcha :/
05:59 moritz tehcha: what does 'git status' say?
06:01 tehcha no changes to commit
06:01 tehcha i think i commited these
06:01 tehcha how do i get to a certain commit?
06:01 tehcha i have checked giwth git log
06:01 tehcha and before i ventured in this experimental additon of code i have one that is a blank slate
06:02 tehcha and after an unnamed and unknown
06:02 phaleth joined #git
06:02 tehcha can i get back by typing in the code of the commit?
06:04 moritz if you committed, it, "git log" will show you the commit
06:04 moritz at least, if you committed it on the current branch
06:04 tehcha i used git log to see the last ones , imeant how witll i get to the commit i want?
06:05 moritz git log also shows you the commit hash; "git show <the hash>" shows you the actual commit
06:05 tehcha i mean like how can i set everything back to a certian comit
06:05 tehcha i see
06:05 mischat joined #git
06:08 shgysk8zer0 joined #git
06:11 israelzuniga joined #git
06:11 tehcha moritz what do you use to revert back to a certain previous commit?
06:14 FunkyAss joined #git
06:14 OnBrokenWings joined #git
06:21 romerocesar joined #git
06:24 nivag joined #git
06:26 phanimahesh joined #git
06:26 PaulCapestany joined #git
06:28 stevenbenner joined #git
06:29 jaguarmagenta joined #git
06:29 FuzzySockets joined #git
06:30 oich joined #git
06:31 romerocesar joined #git
06:36 f3r70rr35f joined #git
06:40 fuchstronaut joined #git
06:41 romerocesar joined #git
06:42 MTecknology joined #git
06:43 MTecknology Is it possible to use regex to specify a path with git-diff? I see -G for the actual text, but nothing about matching the file patch.
06:45 dreiss joined #git
06:49 subhojit777 joined #git
06:56 ahmedelgabri joined #git
06:56 dreiss joined #git
06:57 OnBrokenWings joined #git
07:01 tanuki joined #git
07:01 toogley joined #git
07:04 shgysk8zer0_ joined #git
07:07 mischat joined #git
07:15 _ikke_ MTecknology: Look for pathspec at man gitglossary
07:15 gitinfo MTecknology: the gitglossary manpage is available at http://jk.gs/gitglossary.html
07:16 a_thakur joined #git
07:16 MTecknology will do, thanks!
07:17 _ikke_ Only globs apparently, no regexp
07:19 MTecknology bummer :(
07:21 PaulCape_ joined #git
07:24 MTecknology We're trying to do a match on top.sls. I wrote a git hook a few years ago for these guys, I forgot which... pre-commit maybe.. while read old new something; do git diff --quiet $old $new -- top.sls || exit 1; done .. It's something similar to that anyway.
07:25 thinsoldier joined #git
07:26 User458764 joined #git
07:27 User458764 joined #git
07:28 MTecknology The whole point was to prevent any modifications from that file from ever taking place, but now someone created an htop.sls but it's somehow causing rejections when they push
07:28 MTecknology top.sls should not match htop.sls. The docs say that, my testing says that... makes no sense to me
07:29 kadoban MTecknology: Well … figuring out what hook you wrote and what it actually says seems like a good first step?
07:30 MTecknology kadoban: I don't have access to the environment, just started talking about it over beers and a fire with the guy that replaced me a bit over a year ago.
07:30 kadoban Seems like fixing it is a bit unlikely then.
07:31 MTecknology I'm only discussing and testing at the moment..
07:31 rkazak joined #git
07:32 anushil051 joined #git
07:33 MTecknology I bet I wrote it in post-receive
07:36 quetz joined #git
07:38 thecha joined #git
07:38 thecha joined #git
07:39 thiago two possibilities:
07:40 thiago 1) the code is quite different from what you're expecting it. It's not doing that git diff
07:40 thinsoldier joined #git
07:40 dreiss joined #git
07:40 thiago 2) the rename detection triggered, thinking htop.sls is a copy of top.sls and it shows in the diff. Unlikely.
07:40 User458764 joined #git
07:45 a_thakur_ joined #git
07:47 PaulCapestany joined #git
07:49 multi_io joined #git
07:50 stuh84 joined #git
08:03 NeverDie joined #git
08:06 radsy joined #git
08:06 dsantiago joined #git
08:07 irqq joined #git
08:08 mischat joined #git
08:13 zarel joined #git
08:15 PaulCape_ joined #git
08:16 basiclaser joined #git
08:18 tinajohnson___ joined #git
08:24 stuh84 joined #git
08:26 sanketdg joined #git
08:27 xall joined #git
08:31 zumba_addict joined #git
08:33 PCatinean joined #git
08:34 Doginal joined #git
08:39 PaulCapestany joined #git
08:40 jaguarmagenta joined #git
08:41 fuchstronaut joined #git
08:47 fahadash joined #git
08:49 GandalfTheWizard joined #git
08:50 GandalfTheWizard joined #git
08:52 GandalfTheWizard joined #git
08:52 romerocesar joined #git
08:53 mehola joined #git
09:00 GrayShade joined #git
09:01 LeMike joined #git
09:02 romerocesar joined #git
09:06 Doginal joined #git
09:07 PaulCape_ joined #git
09:10 mischat joined #git
09:14 cyan__ joined #git
09:17 catsup joined #git
09:18 BombStrike joined #git
09:18 MatthewAllan93 joined #git
09:18 shgysk8zer0_ joined #git
09:19 MatthewAllan93 joined #git
09:20 GandalfTheWizard joined #git
09:21 Sasazuka joined #git
09:24 satifant joined #git
09:25 t0by joined #git
09:29 robotroll joined #git
09:32 PaulCapestany joined #git
09:33 EvilDMP what is the most concise way in which to check out locally a branch from a repository that is *not* already represented amongst your remotes - i.e. a kind of ad-hoc checkout-some-arbitrary-branch?
09:34 lindenle joined #git
09:35 Dreamer3 joined #git
09:35 satifant joined #git
09:36 NwS joined #git
09:37 aspellip_ joined #git
09:38 wgrant joined #git
09:39 axisys joined #git
09:43 romerocesar joined #git
09:43 t0by joined #git
09:45 King_Hual joined #git
09:49 elastix joined #git
09:49 GrayShade left #git
09:49 circ-user-jjOUE joined #git
09:52 freimatz joined #git
09:53 mehola joined #git
09:57 ntonjeta joined #git
09:57 zarel joined #git
09:59 mingrammer joined #git
09:59 Neobenedict_ joined #git
09:59 Neobenedict_ joined #git
10:00 freimatz joined #git
10:00 BlaXpirit wut
10:01 ntonjeta joined #git
10:02 t0by joined #git
10:03 romerocesar joined #git
10:05 zarel joined #git
10:08 a_thakur joined #git
10:11 mischat joined #git
10:15 ntonjeta joined #git
10:17 ntonjeta joined #git
10:23 romerocesar joined #git
10:25 PaulCape_ joined #git
10:25 arand_ joined #git
10:28 rolha joined #git
10:28 ToBeCloud joined #git
10:33 de-vri-es joined #git
10:34 filcab joined #git
10:34 endiruna joined #git
10:35 wloncom joined #git
10:35 davidosomething joined #git
10:35 mepholic1 joined #git
10:35 cbreak EvilDMP: you can only check out branches you have
10:36 cbreak EvilDMP: if you don't have them, create them yourself, or fetch them from the remote first
10:36 bluepixel joined #git
10:37 sdothum joined #git
10:38 efc_ joined #git
10:39 jbitdrop joined #git
10:39 irco joined #git
10:39 digidog joined #git
10:39 cloudcell__ joined #git
10:41 EvilDMP cbreak: Thanks. It seem like it would be a nice thing to have, but perhaps it doesn't make sense in the context of Git
10:41 jaguarmagenta joined #git
10:42 fuchstronaut joined #git
10:42 cbreak EvilDMP: it doesn't make sense in any context
10:42 cbreak you can't create something from nothing, you have to know where a branch points to
10:43 cbreak and transfering that information into git is either done via fetching from a remote, or telling git directly, by creating the branch yourself
10:44 liquidjamm joined #git
10:44 User458764 joined #git
10:46 phanimahesh joined #git
10:59 zarel joined #git
11:00 BlaXpirit EvilDMP, in the context of github there is a way to simplify this using the 'hub' tool
11:00 a_thakur joined #git
11:01 EvilDMP BlaXpirit: thanks, a colleague just mentioned it to me
11:01 BlaXpirit but i think it adds the remote anyway
11:01 cbreak you don't need to add a remote to fetch
11:02 cbreak git fetch ssh://foo.bar/baz.git branchname
11:02 cbreak git checkout -b xxx FETCH_HEAD
11:02 cbreak done
11:07 a_thakur joined #git
11:08 Darcidride joined #git
11:10 Walex joined #git
11:11 paakku joined #git
11:13 mischat joined #git
11:14 slayerjain joined #git
11:14 ojdo joined #git
11:17 PaulCapestany joined #git
11:19 dsfreak93 joined #git
11:25 diegoviola joined #git
11:30 endiruna joined #git
11:32 cyan__ joined #git
11:34 Arokh joined #git
11:34 SporkWitch joined #git
11:34 Walex joined #git
11:34 SporkWitch joined #git
11:35 denimsoft joined #git
11:36 lindenle joined #git
11:37 Arokh joined #git
11:38 circ-user-jjOUE joined #git
11:39 denimsoft joined #git
11:46 elastix joined #git
11:54 mehola joined #git
11:55 Gamecubic joined #git
11:55 ochorocho__ joined #git
11:57 Lvjasha joined #git
11:58 Balliad joined #git
12:00 m0viefreak joined #git
12:03 rbern joined #git
12:03 cagedwisdom joined #git
12:03 boshhead joined #git
12:06 keltvek joined #git
12:07 tomog999 joined #git
12:09 ntonjeta joined #git
12:13 texinwien joined #git
12:15 mischat joined #git
12:15 ochorocho__ joined #git
12:19 zeroed joined #git
12:20 m0rph84 joined #git
12:22 ferr joined #git
12:22 Impaloo joined #git
12:24 Impaloo joined #git
12:24 romerocesar joined #git
12:25 Impaloo joined #git
12:27 ahmedelgabri joined #git
12:29 endiruna joined #git
12:31 HyP3r joined #git
12:33 wxg joined #git
12:34 HyP3r Hey all, I'm currently working on project with a git sub project. Its a foreign repository I have von github. Now I have this directory inside my repository. And I changed a bit inside the code of the foreign repository
12:34 HyP3r Whats the best way to deal with it?
12:35 romerocesar joined #git
12:35 HyP3r I read this article a bit, but I don't get it: https://git-scm.com/book/de/v1/Git-Tools-Submodule
12:37 yqt joined #git
12:38 User458764 joined #git
12:42 jaguarmagenta joined #git
12:43 fuchstronaut joined #git
12:45 ochorocho__ joined #git
12:47 phanimahesh joined #git
12:51 Cassiopaya joined #git
12:52 Impaloo joined #git
12:54 IlNominePatre joined #git
12:55 romerocesar joined #git
12:55 mehola joined #git
13:04 PaulCape_ joined #git
13:06 ntonjeta joined #git
13:11 ochorocho__ joined #git
13:13 demiro joined #git
13:13 pinkloyd joined #git
13:13 pinkloyd left #git
13:16 mischat joined #git
13:23 joko joined #git
13:28 hk238 joined #git
13:30 todd_dsm joined #git
13:33 nnyk_ joined #git
13:35 diegoviola how do I say that HEAD is bad in git bisect?
13:35 diegoviola git bisect bad HEAD?
13:35 cbreak sure
13:35 diegoviola ok
13:37 lindenle joined #git
13:38 israelzuniga joined #git
13:39 Impaloo diegoviola: git commands that works against refs will default to HEAD if none is given
13:40 Impaloo Simply `git bisect bad` would do it
13:45 skasturi joined #git
13:47 cyan__ joined #git
13:48 axiom_1 joined #git
13:51 xaviergmail joined #git
13:53 sanketdg joined #git
13:54 phanimahesh joined #git
13:55 LarArT joined #git
13:56 mehola joined #git
13:56 FuzzySockets joined #git
13:59 mariuscc joined #git
14:01 zarel joined #git
14:07 fspy joined #git
14:10 vjacob joined #git
14:12 ekinmur joined #git
14:15 D-Boy joined #git
14:16 nnyk_ joined #git
14:18 mischat joined #git
14:18 fgasperi joined #git
14:19 fspy I added a personal file with an important change (in a different file) to a single commit. is it possible to delete that single file while keeping the changes on the other? trying to interactive rebase but i can't just squash w/ previous and untrack that file simultaneously
14:19 yqt joined #git
14:20 WayToDoor joined #git
14:21 fspy this is already pushed, albeit in a private repo.
14:25 jhass an easy way is to delete everything you want to be gone, then git commit --fixup=<sha of commit that introduced it>; and then git rebase -i --autosquash <sha of commit that introduced it>^;
14:25 jhass everybody who already pulled it will have to backup any unpushed/uncommitted changes and git fetch; git reset --hard origin/master
14:26 fspy thanks, i'll give it a shot.
14:27 endiruna joined #git
14:27 snowkidind joined #git
14:27 Corosus joined #git
14:29 franl joined #git
14:30 cbreak git rebase -i can do it too
14:30 cbreak just chose edit
14:31 a_thakur joined #git
14:31 fspy it says i have unstaged changes on the rebase -i autosquash
14:31 WaReZ joined #git
14:32 jhass then you have unstaged changes
14:32 fspy i do, since i removed the file i want to be gone, idk how to proceed
14:32 jhass maybe you forgot to git add prior to git commit?
14:32 fspy so i have to add the removed file
14:32 jhass or use git rm
14:33 jhass long story short, you have to stage the change
14:33 fspy yeah, my mistake. i forgot about git rm. it works now!
14:33 fspy now lets hope i can do this right haha
14:34 jhass I hope you understand what you're doing and what the implications for your collaborators are
14:35 fspy yeah they'll have to reset everything. i'm just trying to keep my history clean. i wasnt the one who made the mistake but i'm the one whos able to fix it. i have to tell them to create branches for their changes to avoid this kind of stuff i think?
14:35 zeroed joined #git
14:35 Limes joined #git
14:36 fspy then rebase the branch onto master, i'm not sure i'm very new to this
14:36 fspy i can work with git by myself but getting changes from other people sometimes confuse me
14:36 jhass I'm not sure how that relates to secrets being committed
14:37 fspy not really secrets just something that doesnt relate to the project
14:37 jhass is the file big? rewriting history might be complete overkill if not
14:38 jhass just add a commit that removes it again
14:38 fspy not really
14:38 fspy yeah thats what i have, but with a mess of branches for some reason. some commits got duplicated even
14:38 jhass not surprising if you apply "let's rewrite history" to simple issues like removing a non-secret file from a repo ;)
14:38 grawity rule #2 of history rewriting: do not "git pull".
14:39 fspy rule number 1 is "do not rewrite history" i assume
14:39 cbreak ... unless you know what you're doing
14:40 fspy jhass, hey, i didn't make the mess! i just pulled into the thing
14:40 grawity that's exactly how you made the mess, though
14:41 grawity and no, rule 1 is "do not rewrite published history"
14:41 fspy maybe i should just not use git
14:41 cbreak have you lost many babies with your bath water throwing?
14:41 jhass maybe you should make an effort to understand its concepts, for example by watching https://www.youtube.com/watch?v=1ffBJ4sVUb4 ;)
14:41 grawity there are many tools for rewriting history before publication, but
14:42 fspy ive used bfg before, the issue i have is dealing with other peoples shit
14:43 jaguarmagenta joined #git
14:43 fuchstronaut joined #git
14:44 jhass my approach is to understand git to the point that I can infer their mistakes, explain it to them and give them instructions on how to clean it up themselves (and force them to follow that in case they want their contribution reviewed and merged)
14:45 spudowiar joined #git
14:46 leeN joined #git
14:46 timwis Hey folks, is there a way to do a git commit --amend on a commit that's 3 commits back? (as opposed to the most recent commit)
14:46 fspy cbreak, hadnt seen that one before... makes sense
14:49 dharrigan joined #git
14:49 fspy jhass, thanks for the video!
14:50 jhass timwis: the two common approaches are to git rebase -i to a point before that, chose edit for the commit you want to change and proceed with the instructions, or to git commit --fixup=HEAD~3 and git rebase -i --autosquash (again to a point before)
14:51 jhass timwis: note that you shouldn't have pushed that commit to a branch other people use/base their work on already
14:52 fspy rebase essentially fucks everyone up, am i correct?
14:53 spudowiar you are correct.
14:55 a_thakur joined #git
14:55 circ-user-jjOUE joined #git
14:57 mehola joined #git
15:00 madewokherd joined #git
15:00 thiago joined #git
15:09 endiruna joined #git
15:10 Grum joined #git
15:11 tvw joined #git
15:14 fspy all fixed
15:14 fspy :)
15:14 freimatz joined #git
15:14 fspy and the other person has it fixed as well
15:14 fspy now using a different branch for devel
15:16 rgrinberg joined #git
15:17 Gitzilla joined #git
15:17 johnmilton joined #git
15:17 64MAAJSW0 joined #git
15:17 7YUABHMO2 joined #git
15:19 paul424 joined #git
15:19 mischat joined #git
15:22 dreiss joined #git
15:27 kukks joined #git
15:27 kukks joined #git
15:30 rkazak joined #git
15:39 smitb joined #git
15:40 smitb hi everyone, I'm new to open source and I want to contribute to git, can anybody help me get started
15:41 GavinMagnus joined #git
15:41 GavinMagnus left #git
15:42 jstein_ joined #git
15:42 canton7 smitb, !contributing
15:42 gitinfo smitb: Want to improve git? Everything you need to know is in http://git.io/SubmittingPatches. See !list for more on the mailing list
15:44 rgrinberg joined #git
15:46 smitb gitinfo the link is giving "No url found for SubmittingPatches"
15:47 romerocesar joined #git
15:47 nedbat smitb: it redirects me to https://github.com/git/git/blob/mas​ter/Documentation/SubmittingPatches
15:47 dan2k3k4 joined #git
15:47 smitb thanks nedbat that's working
15:49 canton7 smitb, maybe your IRC client put that '.' on the end?
15:49 smitb yup...that was the problem I guess
15:51 zumba_addict joined #git
15:58 mehola joined #git
15:59 rubyonrailed joined #git
16:00 chrisshattuck joined #git
16:02 Kev- joined #git
16:02 cinderhaze joined #git
16:03 fgasperi joined #git
16:04 ag4ve joined #git
16:04 cookie3 joined #git
16:06 User458764 joined #git
16:08 spudowiar it works for me
16:08 spudowiar FWIW
16:09 spudowiar It would say "No url found for SubmittingPatches."
16:09 spudowiar Which would look like a full stop at the end of a sentence
16:09 spudowiar But is in fact part of the URL
16:12 smitb yeah...it worked for me too...like canton7 earlier said, the fullstop at the end created the problem
16:12 chrisshattuck joined #git
16:14 lordjancso joined #git
16:15 _ikke_ joined #git
16:15 Kev- joined #git
16:17 HoierM joined #git
16:18 RobsBoat joined #git
16:19 netcarver joined #git
16:20 chrisshattuck joined #git
16:20 NeverDie joined #git
16:21 mischat joined #git
16:21 RobsBoat Hi.   I'm getting setup to use a git server as a central staging repository for my webdev.  It'll be the usual dev->stage->prod workflow.  When I pull from the central repo to 'prod' what's the right way to only pull the current/latest state?  I.e., I don't want all the git repo history ending up on the production machine.
16:22 Guest60322 joined #git
16:22 BlaXpirit RobsBoat,   --depth 1 ?
16:23 BlaXpirit but it's not easy to deal with afterwards
16:23 thiago RobsBoat: git pull
16:23 thiago no need to do anything after that
16:23 yqt joined #git
16:23 thiago note I'm specifically answering different from what you asked
16:23 RobsBoat 'git pull' pulls everything, no?
16:23 thiago yes
16:23 thiago just leave the full history there
16:24 RobsBoat That 'full hitory' can be large.   Not interested.  So, looking for only the latest.
16:24 thiago RobsBoat: !deploy
16:24 gitinfo RobsBoat: 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
16:24 RobsBoat BlaXpirit: what's not 'easy' after?
16:24 thiago RobsBoat: use git archive and ssh
16:24 Guest60322 left #git
16:24 thiago RobsBoat: how large is your history, compared to the size of the checkout?
16:25 RobsBoat thiago: currently, ~ 100:1
16:25 rewt do you have a lot of binaries stored in git?
16:26 thiago that's really unexpected
16:26 thiago I've never seen a repository like that
16:26 thiago have you done a gc after importing everything?
16:26 rewt RobsBoat, did you actually check, or just assuming?
16:26 RobsBoat rewt: A fair amount .  checked ...
16:26 Guest60322 joined #git
16:27 thiago I thought you were just starting. How many commits do you have?
16:27 romerocesar joined #git
16:28 rewt RobsBoat, i'd recommend using a deployment script from a dev/deploy machine and send the required files to the staging/production server
16:28 Guest60322 left #git
16:29 RobsBoat thiago: I'm starting with git server as a central staging repo.  I'm not starting with git.
16:29 RobsBoat rewt: So push from the dev box?
16:29 mangolisk joined #git
16:30 thiago RobsBoat: ok. Still, 100:1 is really unexpected.
16:30 rewt yes, or have a dedicated server to do the push that has the git repo locally
16:31 thiago RobsBoat: anyway, the solution to your problem is "not git"
16:31 timwis Thanks jhass ^. On second thought, I think I'd like to take the last 3 commits, and combine them as one, along with my current uncommitted changes. Is there an easier way to do that?
16:31 thiago RobsBoat: if you don't want to transfer the history, then look for a solution outside of git
16:31 rewt RobsBoat, also consider if you really need those binaries in git, or if it would be enough to store only the source files and maybe the build scripts
16:31 jhass timwis: than git rebase -i and picking fix/squash for the last two commits? not really
16:35 garethdaine joined #git
16:36 garethdaine Anyone ever had issues when pushing a large amount of data/files to a github repo
16:36 garethdaine ?
16:36 albertodf joined #git
16:37 garethdaine I’ve 14,306 files and after writing objects I get ‘fatal: The remote end hung up unexpectedly’
16:38 romerocesar joined #git
16:38 garethdaine Total of all files is about 12GB
16:38 timwis thanks jhass, I found a guide to your first suggestion: http://fle.github.io/git-tip-keep-your-br​anch-clean-with-fixup-and-autosquash.html worked
16:38 albertodf left #git
16:39 Guest60322 joined #git
16:39 lindenle joined #git
16:43 jaguarmagenta joined #git
16:43 xaviergmail joined #git
16:43 thiago garethdaine: it's possible they block you because your repo is too big
16:44 garethdaine thiago: Really? Ar ethere limites on paid private repos?
16:44 fuchstronaut joined #git
16:45 jimmyeatworld joined #git
16:46 zincrokx joined #git
16:47 fscala joined #git
16:47 zincrokx joined #git
16:47 chrisshattuck joined #git
16:47 zincrokx joined #git
16:48 reim joined #git
16:48 zincrokx joined #git
16:48 zincrokx joined #git
16:50 Spacew00t joined #git
16:53 thiago garethdaine: ask them, not me
16:54 thiago if you're paying them, there may be an SLA
16:55 tgunr joined #git
16:55 BlessJah more likely one side was calculating or writing/reading something long enough without sending for connection to timeout
16:56 fuchstronaut joined #git
16:57 romerocesar joined #git
16:58 _tpavel joined #git
16:59 mehola joined #git
16:59 NeXTSUN joined #git
16:59 diegoviola joined #git
17:04 flashpoint9 joined #git
17:05 cyan__ joined #git
17:08 tremblerz joined #git
17:09 tremblerz how do I git diff two branches which are in separate directories ?
17:09 cdown joined #git
17:12 macivy joined #git
17:14 diegoviola joined #git
17:19 Ordentlig joined #git
17:20 _ikke_ So you have two repositories?
17:20 APic Who?
17:20 APic Oh, hir.
17:22 chrisshattuck joined #git
17:22 mischat joined #git
17:22 tremblerz Yeah
17:22 APic Good.
17:22 tremblerz Actually got clue from stackoverflow
17:23 phanimahesh joined #git
17:23 tremblerz by adding the other one as remote
17:23 APic Okay.
17:23 tremblerz :)
17:24 APic
17:27 elastix joined #git
17:27 rbr joined #git
17:29 dan2k3k4 joined #git
17:30 JeremyM_ joined #git
17:30 thecha joined #git
17:31 grubles joined #git
17:32 chrisshattuck joined #git
17:33 watabou joined #git
17:42 _ikke_ rite
17:43 dreiss joined #git
17:44 kukks joined #git
17:44 kukks joined #git
17:44 Ordentlig joined #git
17:44 SteffanW joined #git
17:44 tremblerz I am not sure but it appears to be a bug in git, how to reproduce - write git diff /some-path/ then press tab to autocomplete
17:46 _ikke_ So more an autocomplete fail then git bug?
17:47 tremblerz yeah actually
17:48 _ikke_ What's the behaviour you're seeing?
17:48 tremblerz It prints the error on pressing tab
17:48 thecha joined #git
17:48 thecha joined #git
17:48 bremner It = your shell. Not git.
17:48 _ikke_ What do you use for completion?
17:49 grubles joined #git
17:49 tremblerz shell ?
17:49 tremblerz bash
17:50 texinwien joined #git
17:50 _ikke_ bash has no completion for git builtin
17:50 Literphor joined #git
17:50 _ikke_ I cannot reproduce it with bash-autocomplete
17:52 tremblerz http://pastebin.com/8PeFAxrc
17:52 tremblerz Here I pressed tab after pressing "C"
17:52 APic B-)
17:53 _ikke_ yeah, so the autocomplete script does not check if you are actually in a project
17:54 _ikke_ Does not reproduce
17:54 phanimahesh joined #git
17:54 mdw joined #git
17:54 User458764 joined #git
17:54 tremblerz Can you reproduce it now ?
17:55 _ikke_ nope
17:55 tremblerz :D
17:55 _ikke_ When I tab, nothing happens
17:55 _ikke_ if I type git diff <tab>, HEAD appears
17:56 _ikke_ tremblerz: What distro?
17:56 tremblerz is your cwd a repo ?
17:56 _ikke_ nope
17:56 _ikke_ just ~
17:56 tremblerz ubuntu
17:57 _ikke_ can you check if you have bash-autocomplete installed?
17:57 robotroll joined #git
17:58 tremblerz using apt-get ?
17:58 _ikke_ dpkg -l | grep bash-autocomplete
17:58 romerocesar joined #git
17:58 _ikke_ or apt-cache policy bash-autocomplete
17:59 tremblerz No such package !
18:00 mehola joined #git
18:00 tremblerz but then how rest of the auto-completion working ?
18:00 grubles joined #git
18:00 svartberg joined #git
18:00 Peng The package is "bash-completion"
18:00 _ikke_ right
18:00 tremblerz Ya
18:01 tremblerz this package is present
18:01 _ikke_ What version?
18:01 dan2k3k4 joined #git
18:02 tremblerz 1:2.1-4ubuntu0.2
18:03 svartberg Hi guys, I'm currently building up a workflow for me to deploy websites for clients and so on... on the live server I have a folder /var/www/domain.tld/. Now I made a repository for that in /var/repos/domain.tld.git/. So I can use the post-receive file in the /hooks/ to push to the live server whenever I push to that repo. Now I have a website already in that /var/www/domain.tld/. So I wanted to pull everything to my local machine usi
18:03 robotrolll joined #git
18:03 _ikke_ 2.3 on my system
18:03 svartberg (before, I did git add remote live ssh:// ....... of course)
18:04 svartberg Its telling me now: fatal: Couldn't find remote ref master
18:04 jaguarmagenta joined #git
18:05 ascarter joined #git
18:06 mischat joined #git
18:07 tremblerz On doing sudo apt-get install --only-upgrade bash-completion
18:07 tremblerz bash-completion is already the newest version.
18:08 _ikke_ tremblerz: yeah, ubuntu does not do x.y updates within one ubuntu version
18:08 tremblerz Oh ! I see
18:08 b100s joined #git
18:09 nnyk_ joined #git
18:11 _ikke_ I don't see 2.3 for ubuntu anywhere
18:11 ahmedelgabri joined #git
18:11 romerocesar joined #git
18:11 eijk_ joined #git
18:11 mons_ joined #git
18:12 tremblerz have you built from source ?
18:12 Dyonisos joined #git
18:13 _ikke_ I use Archlinux, it always has the latest version
18:13 chrisshattuck joined #git
18:14 bremner there are probably PPAs for ubuntu
18:15 _ikke_ bremner: couldn't find one either
18:15 _ikke_ but I'm not sure if bash-completion has support for git
18:15 thecha joined #git
18:16 _ikke_ Cannot find it anywhere in the source
18:17 SimonNa joined #git
18:17 tremblerz -_-
18:18 _ikke_ Perhaps you are using the one provided by git: https://github.com/git/git/blob/master/​contrib/completion/git-completion.bash
18:18 _ikke_ can you check your .bashrc if you have a refference to this?
18:19 tremblerz how to do that ?
18:19 _ikke_ It's a file in your home dir
18:20 tremblerz I meant how to check whether git-completion.bash is being used ?
18:20 tremblerz simply searching "git-completion.bash" ?
18:21 _ikke_ es
18:21 _ikke_ yes
18:21 tremblerz then it's not there
18:21 jost_ joined #git
18:22 FuzzySockets joined #git
18:22 _ikke_ Then I don't know
18:24 ahmedelgabri joined #git
18:24 tremblerz :D
18:25 romerocesar joined #git
18:27 CEnnis91 joined #git
18:27 rubyonrailed joined #git
18:27 eijk joined #git
18:29 shgysk8zer0_ joined #git
18:29 shgysk8zer0_ joined #git
18:30 anushil051 joined #git
18:31 raindev joined #git
18:34 Gitzilla joined #git
18:35 Ahmed90 joined #git
18:36 clemf joined #git
18:38 ToBeCloud joined #git
18:39 ToBeCloud joined #git
18:41 lindenle joined #git
18:42 ochorocho__1 joined #git
18:43 Sasazuka joined #git
18:45 Balliad joined #git
18:46 malleable joined #git
18:49 CheckDavid joined #git
18:51 mmmveggies joined #git
18:52 yqt joined #git
18:53 ochorocho__ joined #git
18:55 romerocesar joined #git
18:56 Pulp joined #git
18:56 macivy joined #git
18:57 fuchstronaut joined #git
18:57 sentriz joined #git
18:58 stantonk joined #git
18:58 ochorocho__ joined #git
19:00 ascarter joined #git
19:00 Ordentlig joined #git
19:00 mehola joined #git
19:00 romerocesar_ joined #git
19:07 mons_ joined #git
19:09 mkopriva joined #git
19:11 doppo joined #git
19:11 tilpner joined #git
19:11 lindenle joined #git
19:11 stuh84 joined #git
19:12 Chill_Surf joined #git
19:13 paul424 joined #git
19:15 spudowiar joined #git
19:17 rubyonrailed joined #git
19:18 acetakwas joined #git
19:18 ntonjeta joined #git
19:20 ag4ve joined #git
19:22 garethdaine joined #git
19:26 chrisshattuck joined #git
19:27 Balliad joined #git
19:29 kus joined #git
19:32 chrisshattuck joined #git
19:32 doppo joined #git
19:33 jaguarmagenta joined #git
19:37 smerdyakow joined #git
19:42 nnyk_ joined #git
19:43 chrisshattuck joined #git
19:45 rgrinberg joined #git
19:45 SwiftMatt joined #git
19:47 SimonNa joined #git
19:48 shgysk8zer0 joined #git
19:48 thinsoldier joined #git
19:49 shgysk8zer0 joined #git
19:51 raindev joined #git
19:52 rubyonrailed joined #git
19:54 chrisshattuck joined #git
19:55 smerdyakow left #git
19:55 nwkj86 joined #git
19:56 efdetonator joined #git
19:57 rolha joined #git
19:58 beastd joined #git
19:59 ahmedelgabri joined #git
20:01 mehola joined #git
20:04 nilg joined #git
20:06 f3r70rr35f joined #git
20:06 rolha joined #git
20:07 d4rklit3 joined #git
20:08 cdown joined #git
20:09 faheem joined #git
20:11 malleabl1 joined #git
20:14 circ-user-jjOUE joined #git
20:19 Ivion joined #git
20:21 FuzzySockets joined #git
20:25 bb010g joined #git
20:26 chrisshattuck joined #git
20:32 rubyonrailed joined #git
20:32 watabou joined #git
20:33 denimsoft joined #git
20:35 NeXTSUN joined #git
20:37 moei joined #git
20:37 b100s joined #git
20:41 denimsoft joined #git
20:44 spudowiar joined #git
20:44 rkazak joined #git
20:49 Literphor joined #git
20:51 ascarter joined #git
20:55 Douhan joined #git
20:58 fuchstronaut joined #git
21:01 vivekp joined #git
21:01 vivekp joined #git
21:02 ochorocho__ joined #git
21:02 mehola joined #git
21:04 jokajak joined #git
21:07 snowkidind joined #git
21:10 ahmedelgabri joined #git
21:10 stantonk joined #git
21:13 ochorocho__ joined #git
21:14 FuzzySockets joined #git
21:14 inflames joined #git
21:20 denimsoft joined #git
21:20 ahr3n joined #git
21:22 srpx joined #git
21:22 srpx Should I include bundle/compiled js files on the repository?
21:22 jhass probably not
21:22 srpx For one, it looks a good idea because then someone can run the app by just cloning the repo, no need to build. But then, anytime the build changes, the whole file is different... so I guess that bloats the repo?
21:23 svartberg joined #git
21:25 f3r70rr35f joined #git
21:26 jhass yes, quite
21:26 mehola joined #git
21:26 zumba_addict joined #git
21:26 watabou joined #git
21:31 mwhooker joined #git
21:33 rubyonrailed joined #git
21:33 mwhooker joined #git
21:34 jaguarmagenta joined #git
21:37 kukks joined #git
21:37 kukks joined #git
21:38 jaguarmagenta joined #git
21:38 fraid joined #git
21:39 fraid hi, i have made some ssh keys with password, how do i use those with github
21:40 kadoban fraid: Add the SSH key in your github settings, use the SSH URLs to access repos, and use ssh-agent so you don't have to type the passphrase for the key all the time.
21:40 blr_ left #git
21:43 aard_ joined #git
21:44 fraid kadoban: sorry i can't find out how to add ssh keys in github
21:46 endiruna joined #git
21:47 spudowiar joined #git
21:50 Goplat joined #git
21:56 lindenle joined #git
21:58 MattMaker joined #git
21:58 fraid what should the title be when adding ssh key?
21:59 mellernoia joined #git
21:59 jhass something meaningful to you
21:59 joki joined #git
22:03 GavinMagnus joined #git
22:03 GavinMagnus left #git
22:03 NeverDie joined #git
22:06 Hitch joined #git
22:07 NeverDie joined #git
22:07 cd-rum joined #git
22:07 ochorocho__ joined #git
22:07 mmlb joined #git
22:08 Hitch basic question i can't figure out, i have a remote repository on a server and clone it locally in sourcetree, when i make a simple change and go to push the change, it fails
22:08 Hitch i think it's related to how it's cloned or not checked out, but i don't know how to properly do so
22:10 circ-user-jjOUE joined #git
22:11 jhass I doubt all you get is "it failed"
22:11 jaguarmagenta joined #git
22:12 jhass despite being entirely unfamiliar with sourcetree
22:12 cd-rum_ joined #git
22:18 Hitch correct, it gives a can't update in non-bare repository, will make index and work tree inconsistent
22:19 jhass well there you go
22:19 Hitch just don't know proper process to branch/checkout code so it can be pushed to remote repository
22:20 jhass I think newer git versions can allow pushing to a checked out branch, but it's not a good idea nonetheless
22:20 jhass clone from a bare repo or push to a not on the remote checked out branch
22:21 Hitch what's the most effective way to remotely update a repository though?
22:23 jstein__ joined #git
22:25 jhass one common approach is to have a bare repo on the server that has a post receive hook at updates a local clone
22:25 jhass other approaches include having listeners to so called webhooks as provided by github, gitlab etc
22:26 jhass and as already said iirc newer git versions actually do allow pushing to a checkout out branch, if the remote repository is configured to allow it
22:26 jhass eh, *to a checked out branch
22:28 zumba_addict joined #git
22:28 _nwkj86 joined #git
22:35 jyjon joined #git
22:42 shinnya joined #git
22:42 ahr3n_ joined #git
22:49 stantonk joined #git
22:50 MattMaker joined #git
22:56 mwhooker joined #git
22:58 VagabondAzulien joined #git
22:58 fuchstronaut joined #git
22:59 gosti joined #git
23:04 jaguarmagenta joined #git
23:07 inflames joined #git
23:10 cyphase joined #git
23:10 CEnnis91 joined #git
23:13 diegoviola joined #git
23:13 Rodya_ joined #git
23:21 rubyonrailed joined #git
23:23 Oog joined #git
23:25 ffabi joined #git
23:27 User458764 joined #git
23:28 Ordentlig joined #git
23:31 aguenokk joined #git
23:32 ffabi joined #git
23:34 wxg joined #git
23:37 EduardoMartins joined #git
23:38 ffabi joined #git
23:40 watabou joined #git
23:41 netj joined #git
23:43 shgysk8zer0_ joined #git
23:45 ffabi joined #git
23:48 xlegoman joined #git
23:50 Literphor joined #git
23:51 ffabi joined #git
23:54 watabou joined #git
23:54 rgrinberg joined #git
23:55 dreiss joined #git
23:55 tarkus joined #git
23:57 Gamecubic joined #git
23:57 mkopriva joined #git
23:58 ffabi joined #git
23:58 lindenle joined #git
23:59 Gitzilla joined #git

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