Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-25

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

All times shown according to UTC.

Time Nick Message
00:03 aidalgol In the sample pre-commit hook, where does the hash on line 15 come from?  Below the comment "Initial commit: diff against an empty tree object"
00:04 fuchstronaut joined #git
00:09 boombatower joined #git
00:11 jab416171 joined #git
00:14 Noldorin joined #git
00:16 garyserj joined #git
00:16 mycyber joined #git
00:17 jaguarmagenta joined #git
00:17 WizJin joined #git
00:18 tristanp joined #git
00:19 jimi_ joined #git
00:19 Pyrogerg joined #git
00:20 e14 joined #git
00:24 Gsham joined #git
00:29 Vampire0 aidalgol, just as the comment suggests. This is the SHA value of an empty tree object
00:30 aidalgol Vampire0: So it that hash guaranteed to always be an empty tree object?
00:31 Vampire0 I'd say so, yes.
00:31 AlphaBlend Vampire0: it's all the same in "git log" but in my bitbucket repo, the dates aren't all the same and look like the proper date, so something with git is probably acting up, not sure what though
00:32 Vampire0 Is it a public repo AlphaBlend?
00:32 AlphaBlend it's private
00:33 Vampire0 Do you maybe look at commit dates instead of author dates in bitbucket?
00:33 bremner AlphaBlend: probably bitbucket shows author-date. You can do the same in git log if you give the correct options
00:33 AlphaBlend hmm
00:33 Vampire0 bremner, the other way around, isn't it? I think git log and git gui show author dates by default
00:33 Vampire0 because commited is not of interest often, but author date is
00:34 AlphaBlend how do i copy author date to commit date? like it doesn't do this for every single commit, and sometimesm the dates do change
00:35 rideh joined #git
00:35 iob- joined #git
00:36 jgornick joined #git
00:37 AustinMatherne joined #git
00:38 jason237 joined #git
00:39 bob14 joined #git
00:41 imMute joined #git
00:41 lucz joined #git
00:43 Kamilion joined #git
00:44 Vampire0 AlphaBlend, those dates can well differ which is absolutely ok. The author date shows when the commit was first created by the author, the commiter date is when it was last committed. e. g. if you cherry-pick a commit from one branch to the other, the author date will be the same for the new commit, the commiter date will be the time of committing. If you rebase a branch, the author dates do not change, bu
00:44 Vampire0 t the commiter dates will get the current date. if you apply a patch with am that was created with format-patch, the author date will be the original authors date, the committer date will be the date you commit it
00:44 anonymuse joined #git
00:44 forrestv joined #git
00:44 |prawnzy joined #git
00:47 irqq_ joined #git
00:52 bob14 left #git
00:53 mycyber joined #git
00:54 boombatower_ joined #git
00:54 Anupkumar joined #git
00:56 noahsussman joined #git
00:57 janx joined #git
00:57 nebg joined #git
00:57 grawity joined #git
00:57 navidr_ joined #git
00:57 jimi_ joined #git
00:57 bremner Vampire0: yeah that sounds right. And for me, git-gui also shows author dates (well, it starts gitk, which shows author dates)
00:58 GGMethos_ joined #git
00:59 MattMaker joined #git
00:59 tristanp joined #git
00:59 jason237 joined #git
00:59 rzeka joined #git
00:59 rzeka joined #git
01:00 Takumo joined #git
01:00 Takumo joined #git
01:00 chris2 joined #git
01:00 EvilJStoker joined #git
01:00 evilmquin joined #git
01:01 netwoodle joined #git
01:02 ahf joined #git
01:03 qlkzy joined #git
01:03 sunny256 joined #git
01:03 batrick joined #git
01:04 jon-mac joined #git
01:04 AlphaBlend Vampire0: i'm assuming there must be a bug which is why the author date was the same throughout several commits
01:04 fuchstronaut joined #git
01:04 AlphaBlend but i only noticed it with the last few git updates i installed
01:05 AlphaBlend i can get back with more information at another time
01:05 dhollinger joined #git
01:06 SwiftMatt joined #git
01:07 Urbany joined #git
01:09 snowkidind joined #git
01:10 lolmac joined #git
01:10 cspack joined #git
01:13 Gsham joined #git
01:16 Rodya_ joined #git
01:17 raijin joined #git
01:18 tristanp joined #git
01:20 Vampire0 AlphaBlend, I don't know of such a bug, but I'm not very involved
01:21 Vampire0 AlphaBlend, maybe you have set the environment variable during commit that forces the author date to some specific value and did the multiple commits
01:21 dreiss joined #git
01:21 fstd joined #git
01:24 tristanp joined #git
01:25 Vampire0_ joined #git
01:26 rbern joined #git
01:26 Milijus joined #git
01:28 d^sh joined #git
01:28 nanga joined #git
01:28 nanga joined #git
01:32 realz joined #git
01:32 tristanp joined #git
01:34 Goplat joined #git
01:36 jimi_sanchez joined #git
01:38 joki joined #git
01:39 snthsnth joined #git
01:39 M-shine joined #git
01:39 M-meznak joined #git
01:39 M-mistake joined #git
01:39 aviraldg joined #git
01:39 Ineentho[m] joined #git
01:41 wxg joined #git
01:46 drbean joined #git
01:46 SwiftMatt joined #git
01:46 morenoh149 joined #git
01:46 fstd_ joined #git
01:48 e14 joined #git
01:50 durham joined #git
01:53 pks joined #git
01:53 Salander27 joined #git
01:55 tristanp joined #git
01:58 Milijus joined #git
02:00 MrWoohoo joined #git
02:02 chachasmooth joined #git
02:06 arescorpio joined #git
02:07 e14 joined #git
02:08 mizu_no_oto joined #git
02:08 Salander27 joined #git
02:09 shgysk8zer0 joined #git
02:12 mycyber joined #git
02:13 tristanp joined #git
02:14 eka joined #git
02:17 tristanp joined #git
02:17 moestevens joined #git
02:17 tristanp joined #git
02:18 tristanp joined #git
02:19 tristanp joined #git
02:21 Milijus joined #git
02:25 snthsnth joined #git
02:27 mycyber joined #git
02:34 prawnzy joined #git
02:35 ojdo joined #git
02:35 QwertyDragon joined #git
02:36 prawnzy joined #git
02:41 lagothri1 joined #git
02:45 anonymuse joined #git
02:47 chachasmooth joined #git
02:49 JanC_ joined #git
02:52 jaguarmagenta joined #git
02:52 jottr joined #git
02:53 BenderRodriguez joined #git
02:54 jottr joined #git
02:55 cyan__ joined #git
02:55 jottr joined #git
02:56 jottr joined #git
02:57 clemf joined #git
02:57 hexagoxel joined #git
03:00 andlabs joined #git
03:02 jottr joined #git
03:05 fedepad_ joined #git
03:05 prawnzy joined #git
03:06 fuchstronaut joined #git
03:09 jottr joined #git
03:17 jaguarmagenta joined #git
03:17 e14 joined #git
03:18 cspotcode joined #git
03:24 nitesh joined #git
03:25 actinide joined #git
03:27 snthsnth joined #git
03:34 eizua joined #git
03:34 morenoh149 joined #git
03:38 nerdystreetrat joined #git
03:39 durham joined #git
03:40 irqq joined #git
03:46 diogenese joined #git
03:47 cagedwisdom joined #git
03:49 phroa joined #git
03:49 justanotheruser joined #git
03:57 clemf joined #git
03:58 nerdystreetrat joined #git
04:07 fuchstronaut joined #git
04:09 Cabanossi joined #git
04:14 ismaris joined #git
04:14 Castor_Troy joined #git
04:15 Castor_Troy Hello. I'm new to Git. I created a repository on github. Should I create a branch and work on it, or should I work on master directly? What is the best practice
04:16 archaic joined #git
04:17 preaction Castor_Troy: i usually treat master as "ready to release", so i only work on it if i don't yet care about stability (<v1.00) or if i know it's stable (bugfixes with good tests)
04:17 Castor_Troy preaction, So, create a branch, work on it. When its ready, merge it with master and delete the working branch:
04:17 Castor_Troy ?
04:17 preaction if you want, sure
04:18 inflames joined #git
04:18 Castor_Troy Ok. Thanks.
04:18 e14 joined #git
04:19 barteks2x joined #git
04:20 _W_ joined #git
04:21 Castor_Troy preaction: If I have two branches on github (master, home) and I want to clone both locally, is that possible? does that make any sense.
04:22 indieross joined #git
04:22 preaction Castor_Troy: a "git clone" contains all commits and files that have ever been saved in it. so a single clone has all the branches from the remote
04:23 Castor_Troy ok. will try that.
04:23 daey joined #git
04:23 preaction if the remote has new branches since you've cloned, you need to fetch
04:26 fhackdroid joined #git
04:29 Castor_Troy preaction: I tried it but I only got master, not home
04:29 Castor_Troy I cloned the repository from github, but only got the master branch, not the Home branch.. I verified by using the git branch command
04:30 Castor_Troy nevermind. I used smartgit to checkout the other branch too.
04:34 preaction Castor_Troy: the branch refs aren't created locally, but the remote branch refs do exist. check "git branch -a" to see them
04:34 Castor_Troy oh, gotcha..
04:34 Castor_Troy so, i can use the checkout command to create the new  branch locally?
04:34 preaction that's how it knows when you ask for "git checkout -b home" what to do
04:35 preaction yes
04:35 preaction but you only need to do that if you intend to do work on it
04:35 Castor_Troy I committed a change on the github directly (created a readme), how can I get that commit to local?
04:36 mgedmin joined #git
04:36 e14 joined #git
04:38 preaction git pull. this is all in the !book you should probably read
04:38 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
04:40 Castor_Troy will do preaction. Thanks
04:44 mikecmpbll joined #git
04:46 anonymuse joined #git
04:46 GyrosGei1r left #git
04:47 languitar joined #git
04:48 e14 joined #git
04:51 cspack joined #git
04:51 e14_ joined #git
04:56 l4v2 joined #git
04:59 e14 joined #git
05:00 dermoth joined #git
05:01 qws-user-1229 joined #git
05:07 fuchstronaut joined #git
05:09 raatiniemi joined #git
05:13 Thorn joined #git
05:17 e14 joined #git
05:17 _ng joined #git
05:20 alex1a joined #git
05:23 durham joined #git
05:23 morenoh149 joined #git
05:23 Gsham joined #git
05:28 chachasmooth joined #git
05:32 lindenle joined #git
05:33 diogenese joined #git
05:34 _ng joined #git
05:36 indieross joined #git
05:37 drupald joined #git
05:38 e14 joined #git
05:39 GT4066 joined #git
05:44 Kulrak joined #git
05:44 pcfreak30 joined #git
05:44 snowkidind joined #git
05:44 pcfreak30 git fetch upstream and git reset --hard upstream/master cause fatal: ambiguous argument 'upstream/master': unknown revision or path not in the working tree.?
05:47 anonymuse joined #git
05:47 durham joined #git
05:48 pcfreak30 left #git
05:57 eka joined #git
05:57 durham joined #git
05:59 Defcronyke joined #git
06:00 freimatz joined #git
06:01 chachasmooth joined #git
06:04 jnavila joined #git
06:07 dreiss joined #git
06:08 fuchstronaut joined #git
06:13 ap0c joined #git
06:15 Thorn joined #git
06:17 MattMaker joined #git
06:19 moop joined #git
06:19 madprocess joined #git
06:25 cyphase joined #git
06:26 OnBrokenWings joined #git
06:30 noyb joined #git
06:36 GandalfTheWizard joined #git
06:43 Algebr`` joined #git
06:47 t0by joined #git
06:48 a_thakur joined #git
06:51 rendar joined #git
06:52 mikecmpbll joined #git
06:55 eycsigfy joined #git
06:55 subhojit777 joined #git
06:57 bobdobbs joined #git
07:08 a_thakur joined #git
07:09 fuchstronaut joined #git
07:12 morenoh149 joined #git
07:16 aviraldg joined #git
07:16 aviraldg joined #git
07:18 dsdeiz joined #git
07:22 cyphase joined #git
07:25 bocaneri joined #git
07:33 wrouesnel1 joined #git
07:34 ljc joined #git
07:36 Pulp joined #git
07:38 johnny56_ joined #git
07:39 Orion3k joined #git
07:40 tax joined #git
07:43 hanshenrik joined #git
07:44 hanshenrik is there some way to get git to output something more parsable?  like a JSON or XML ?
07:44 hanshenrik something easier to parse?*
07:47 anonymuse joined #git
07:52 nowox_ left #git
07:52 a_thakur joined #git
07:53 nowox joined #git
07:57 _ikke_ No, git does not output any metadata ase xml or json
07:57 _ikke_ What do you need to parse?
08:00 jaguarmagenta joined #git
08:04 narendraj9 joined #git
08:06 cyphase joined #git
08:06 tango_ joined #git
08:07 EY joined #git
08:10 fuchstronaut joined #git
08:14 Seveas hanshenrik: use plumbing commands, their output is designed to be machine parseable
08:17 _ikke_ rite
08:17 fedepad joined #git
08:17 AndreSomers joined #git
08:23 prawnzy joined #git
08:23 MattMaker joined #git
08:25 qws-user-1228 joined #git
08:27 cyphase joined #git
08:29 satifant joined #git
08:35 vuoto joined #git
08:36 vuoto joined #git
08:38 MattMaker joined #git
08:38 whatsupdoc joined #git
08:40 whatsupdoc What does 'to check in/out from a repository" mean?
08:41 eizua joined #git
08:44 nwkj86 joined #git
08:52 vuoto joined #git
08:52 vuoto joined #git
08:52 t0by joined #git
08:53 j416 whatsupdoc: git does not have the terminology "check in", but it usually means to put something in the repo. "check out" is the opposite.
08:53 whatsupdoc ok thanks that's what i was thinking
08:53 cyphase joined #git
08:55 robotroll joined #git
08:58 MattMaker joined #git
09:01 morenoh149 joined #git
09:06 mohabaks joined #git
09:08 MattMaker joined #git
09:09 zeroed joined #git
09:09 harish joined #git
09:10 fuchstronaut joined #git
09:12 mehola joined #git
09:13 ShekharReddy joined #git
09:16 spr0tsuki joined #git
09:16 Orphis joined #git
09:17 MattMaker joined #git
09:17 catsup joined #git
09:21 cyphase joined #git
09:21 vuoto joined #git
09:22 Levex joined #git
09:24 alex1a_ joined #git
09:24 Levex joined #git
09:25 Levex joined #git
09:33 MattMaker joined #git
09:33 mycyber joined #git
09:34 lindenle joined #git
09:35 Levex joined #git
09:35 Levex joined #git
09:37 Impaloo joined #git
09:37 codfection joined #git
09:41 m0viefreak joined #git
09:42 blackwind_123 joined #git
09:45 rorro joined #git
09:47 MattMaker joined #git
09:48 anonymuse joined #git
09:50 Urbany joined #git
09:53 codfection joined #git
09:55 stamina joined #git
10:00 cyan__ joined #git
10:00 Fijit joined #git
10:00 cyphase joined #git
10:01 jaguarmagenta joined #git
10:01 a_thakur joined #git
10:02 InfoTest joined #git
10:02 MattMaker joined #git
10:06 usm4n joined #git
10:09 fedepad joined #git
10:09 nidr0x joined #git
10:11 fuchstronaut joined #git
10:13 MattMaker joined #git
10:13 codfection joined #git
10:16 narendraj9 left #git
10:17 freimatz joined #git
10:18 bket joined #git
10:19 fuzzmz joined #git
10:19 cyphase joined #git
10:21 wgrant joined #git
10:22 MattMaker joined #git
10:24 prawnzy joined #git
10:31 WayToDoor joined #git
10:31 King_Hual joined #git
10:31 cdown joined #git
10:32 cyphase joined #git
10:33 codfection joined #git
10:36 King_Hual joined #git
10:36 EY joined #git
10:36 fuchstronaut joined #git
10:37 ahmedelgabri joined #git
10:37 MattMaker joined #git
10:40 Balliad joined #git
10:46 cyphase joined #git
10:49 Silenced joined #git
10:49 Silenced joined #git
10:50 ap0c joined #git
10:50 morenoh149 joined #git
10:53 MattMaker joined #git
10:56 Chloe joined #git
11:00 duderonomy joined #git
11:00 joki joined #git
11:03 cyphase joined #git
11:03 Darcidride joined #git
11:03 MattMaker joined #git
11:04 mikecmpbll joined #git
11:04 hanshenrik _ikke_, really just need to parse if a "git pull" was up-to-date or not
11:04 mohabaks joined #git
11:10 PCatinean joined #git
11:11 fuchstronaut joined #git
11:15 robotroll joined #git
11:15 cyphase joined #git
11:17 HappyLoaf joined #git
11:19 anonymuse joined #git
11:19 CheckDavid joined #git
11:20 ToBeCloud joined #git
11:22 dreiss joined #git
11:22 eivarv joined #git
11:22 fuchstronaut joined #git
11:22 MattMaker joined #git
11:27 cyphase joined #git
11:29 eivarv joined #git
11:34 niels__ joined #git
11:37 HappyLoaf joined #git
11:37 MattMaker joined #git
11:40 crameth joined #git
11:40 cyphase joined #git
11:41 eizua joined #git
11:48 MattMaker joined #git
11:54 Ph_ joined #git
11:57 cyphase joined #git
11:57 MattMaker joined #git
12:01 guest3360 joined #git
12:02 jaguarmagenta joined #git
12:02 rewt joined #git
12:05 raijin joined #git
12:06 nuc joined #git
12:06 somaReverse Hi, how can I make git not touch my source file.
12:07 somaReverse I use ninja to compile my c++ project. When doing some git command, it triggers a full rebuild
12:07 somaReverse I have no clue what makes ninja think those unmodified source files are updated.
12:08 MattMaker joined #git
12:08 cyphase joined #git
12:10 Vampire0 somaReverse, git does not preserve timestamps. If it changes a file due to checkout or whatever, the timestamp is updated. This time you can also checkout an older version and a build-tool that uses timestamps for up-to-date checks should see the files as changed and rebuild which would not be possible if file timestamps would be preserved.
12:11 Vampire0 somaReverse, but files that are not change by git should also not be touched
12:11 ahmedelgabri joined #git
12:14 Chloe joined #git
12:17 sdothum joined #git
12:20 ismaris joined #git
12:20 anonymuse joined #git
12:23 a_thakur joined #git
12:24 vuoto joined #git
12:25 prawnzy joined #git
12:28 MattMaker joined #git
12:29 LeMike joined #git
12:33 nikivi joined #git
12:34 cyphase joined #git
12:39 morenoh149 joined #git
12:40 joki joined #git
12:42 Ph_ joined #git
12:47 trewe joined #git
12:50 cyphase joined #git
12:50 robotroll joined #git
12:51 codfection joined #git
12:53 sebhoss joined #git
12:53 kutenai joined #git
12:53 unholycrab joined #git
12:53 cstrahan joined #git
12:53 [diecast] joined #git
12:53 bbhoss joined #git
12:53 contracode joined #git
12:53 discopatrick joined #git
12:53 addshore joined #git
12:53 timwis joined #git
12:53 Anupkumar joined #git
12:53 rfv joined #git
12:53 ionelmc joined #git
12:53 cmosguy joined #git
12:53 cloudcell_ joined #git
12:54 techntoke joined #git
12:54 barq joined #git
12:54 imdsm_ joined #git
12:54 DannyFritz joined #git
12:54 zero7 joined #git
12:54 Ender13 joined #git
12:54 imanc joined #git
12:54 boxrick1 joined #git
12:54 johtso joined #git
12:55 lxnch joined #git
12:55 evanc joined #git
12:55 prosody joined #git
12:55 mehdi___ joined #git
12:55 JackMc joined #git
12:55 iamdevnul joined #git
12:55 Awesomecase joined #git
12:55 teadrop_ joined #git
12:55 parliament joined #git
12:56 richardlitt joined #git
12:56 rxo joined #git
12:57 angular_mike_ joined #git
12:57 ManiacTwister joined #git
12:58 nikivi joined #git
12:58 MattMaker joined #git
12:59 ghostlight joined #git
12:59 _flow_ joined #git
13:04 ismaris joined #git
13:05 } joined #git
13:07 } Hey! There's this awesome branch new-debug, naturally you would want to work on it for the better debugging, however new-debug can't be merged into master... Is there some way to make a branch out of new-debug and then merge that branch into master but NOT merge anything in new-debug
13:08 } So it would be... master->new debug->my branch, and I want to merge only my branch ignoring any changes in new debug
13:08 cyphase joined #git
13:08 somaReverse Vampire0: I may checkout and back
13:08 } Or will it always try to pull in the new debug part too ? :(
13:08 somaReverse Vampire0: to review previous files
13:08 somaReverse what can I do in this situation
13:09 somaReverse is there a way to preserve timestamp?
13:09 } somaReverse, ?
13:11 Vampire0 somaReverse, no
13:11 Vampire0 somaReverse, not with git
13:11 Vampire0 somaReverse, at least not that I know of
13:11 Vampire0 somaReverse, only if you do it externally
13:12 CEnnis91 joined #git
13:12 somaReverse Vampire0: Is there a build tool that not relies on timestamp?
13:12 treehug88 joined #git
13:13 Vampire0 }, will "my branch" be a local branch or something you push and collaborate on with others?
13:13 } only local
13:13 } until finished
13:13 } then its merged
13:13 } no one will even know i made the branch
13:14 Vampire0 somaReverse, Gradle e. g. does calculate checksums of files for up-to-date checks. It is originally developed to Build Java projects, but since some time also has some C++ building capabilities. Gradle per-se is the best build tool I know, but I never built a C++ program with it, so I cannot say anything C++ specific about it
13:14 SpeakerToMeat joined #git
13:14 Vampire0 }, then just use rebasing
13:15 Vampire0 }, after you are finished, rebase the difference between new-debug and my-branch to master and you are fine
13:15 } hmm
13:15 ^7heo the most annoying nick in the world
13:15 Vampire0 }, something like     git rebase --onto master new-debug my-branch
13:15 ^7heo one symbol
13:15 Vampire0 ^7heo,  indeed
13:15 Vampire0 :-D
13:15 ^7heo nothing to autocomplete
13:15 } I'll try that Vampire0
13:15 } Thanks man
13:16 gitinfo }: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
13:16 } o_O
13:16 } cheers Vampire0
13:16 Vampire0 }, yw
13:16 Vampire0 :-)
13:17 } (-:
13:17 ^7heo annoying_nick: all it means is that you have to say "thanks Vampire0"
13:17 ^7heo not "thanks man"
13:17 } Where if someons nick is man
13:17 } s/Where/What
13:17 ^7heo then it works
13:17 ^7heo but it is not the case
13:18 MattMaker joined #git
13:18 } I thought it worked when I said cheers Vampire0 ?
13:18 Vampire0 .karma man
13:18 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
13:18 danimal2 joined #git
13:18 Vampire0 sure it did }
13:18 } Ok
13:19 } Oh, there's something else I wonder about rebasing... if I do an interactive rebase is there some way to see the "diff" between the rebased version and the original before you rebase --continue
13:19 } To make sure you didnt mess up
13:20 } So for example, I do interactive rebase, and "edit" some commits, "pick" all the others, after I finish editing, can I see the entire diff between the original history and the rebased one
13:21 dsdeiz joined #git
13:21 dsdeiz joined #git
13:24 aviraldg joined #git
13:28 cyphase joined #git
13:28 MattMaker joined #git
13:29 Vampire0 Sure, just diff the old SHA against your current version
13:29 Vampire0 }
13:30 whitby joined #git
13:30 } hmm
13:31 } I didnt think that would work, I'll try it next time
13:31 } Thanks again Vampire0 :-) have a good sunday
13:32 Vampire0 }, why shouldn't it work?
13:32 Vampire0 }, yw
13:32 Vampire0 }, you too
13:32 } I thought when in interactive rebase the original history is essentially "lost" so you cant look it up
13:32 } Unless you cancelled the rebase
13:33 Vampire0 No, until the rebase is finished, the branch still points to the original history, just HEAD points to the new history. After the rebase is finished, the branch is repointed to the new history
13:33 Remram[m] joined #git
13:33 Vampire0 }, and even then the old history is still referenced in the man git reflog of the branch for 90 days by default
13:33 gitinfo }: the git-reflog manpage is available at http://jk.gs/git-reflog.html
13:34 Vampire0 }, after that a garbage collection may completely purge the old commits
13:34 phaleth joined #git
13:35 anonymuse joined #git
13:36 aviraldg joined #git
13:36 aviraldg joined #git
13:37 SteffanW joined #git
13:39 raijin joined #git
13:40 jeffreylevesque joined #git
13:42 Balliad joined #git
13:43 MattMaker joined #git
13:45 danimal2 joined #git
13:46 ahmedelgabri joined #git
13:48 eivarv joined #git
13:48 HappyLoaf joined #git
13:48 MattMaker joined #git
13:49 danimal2 joined #git
13:50 danimal2 joined #git
13:54 cyphase joined #git
13:56 leeN joined #git
13:58 isbotnetcool joined #git
14:00 Balliad joined #git
14:01 M-shine joined #git
14:02 M-meznak joined #git
14:03 jaguarmagenta joined #git
14:03 MattMaker joined #git
14:04 salamanderrake_ joined #git
14:04 re1 joined #git
14:05 jottr joined #git
14:06 ribasushi joined #git
14:09 salamanderrake joined #git
14:10 afuentes joined #git
14:15 cyphase joined #git
14:17 salamanderrake is git lfs supposed to use http/https all the time, even if the url is an ssh url?
14:17 danimal2 joined #git
14:21 mizu_no_oto joined #git
14:22 ShekharReddy joined #git
14:23 MattMaker joined #git
14:23 p4trix joined #git
14:24 a_thakur joined #git
14:25 anonymuse joined #git
14:25 prawnzy joined #git
14:27 cyphase joined #git
14:27 morenoh149 joined #git
14:29 snowkidind joined #git
14:42 e14 joined #git
14:43 MattMaker joined #git
14:45 circ-user-130ZE joined #git
14:45 HappyLoaf joined #git
14:46 SwiftMatt joined #git
14:47 quetz joined #git
14:48 cyphase joined #git
14:49 danimal2 joined #git
14:49 jeffreylevesque joined #git
14:50 l4v2 joined #git
15:03 MattMaker joined #git
15:03 cyphase joined #git
15:05 JSharpe joined #git
15:11 jottr_ joined #git
15:14 MattMaker joined #git
15:14 raijin joined #git
15:15 Lomex joined #git
15:16 dviola joined #git
15:16 ismaris joined #git
15:17 heroux joined #git
15:20 cyphase joined #git
15:20 ahmedelgabri joined #git
15:20 Milijus joined #git
15:21 mihaicris joined #git
15:23 MattMaker joined #git
15:23 Pan_ joined #git
15:24 eivarv joined #git
15:27 andlabs joined #git
15:28 jeffreylevesque joined #git
15:29 mizu_no_oto joined #git
15:30 e14 joined #git
15:31 HappyLoaf joined #git
15:31 vjacob joined #git
15:33 King_Hual joined #git
15:33 drbean_ joined #git
15:34 anonymuse joined #git
15:34 miklcct joined #git
15:35 e14_ joined #git
15:38 jottr_ joined #git
15:38 eshlox joined #git
15:38 drbean joined #git
15:39 MattMaker joined #git
15:39 Muzer joined #git
15:39 hanshenrik joined #git
15:40 cyphase joined #git
15:40 prawnzy joined #git
15:41 prawnzy joined #git
15:41 madewokherd joined #git
15:42 Darren_ joined #git
15:42 batrick joined #git
15:42 neilthereildeil joined #git
15:42 CEnnis91 joined #git
15:42 dsdeiz joined #git
15:43 a_thakur joined #git
15:43 drbean_ joined #git
15:43 neilthereildeil hey guys, i have a git repo that was not branched using a git-aware method (such as git clone), but the directory structure is the same. how can i replay those commits to my git tree?
15:44 neilthereildeil actually, replay them to ANOTHER git tree?
15:45 neilthereildeil i THINK its git merge, but these 2 repos dont have any common git ancestor (although they represent the same source tree)
15:45 mizu_no_oto joined #git
15:45 hfp Hi, I remember there is a way to have git run a webserver so you can review your local commits with a browser, but I can't remember the command. Googling for git http server returns results about the benefits of ssh over http, or how to setup a production git http server. Could anyone remind me the command?
15:45 drbean- joined #git
15:46 Harzilein joined #git
15:46 Harzilein hi
15:47 tgummerer hfp: is it gitweb you are looking for?
15:47 Harzilein can i only git check if only a subset of my working directory is clean?
15:47 Harzilein s/only/have/
15:48 Harzilein working copy*
15:48 madewokherd neilthereildeil: you can use git merge -s ours or -s theirs to "join" the two graphs and get a common ancestor
15:49 hfp tgummerer: Yes, thank you!
15:50 madewokherd although if you just want to "replay" the commits, it may be simpler to generate patches (git format-patch) and apply them in the other repo (git am)
15:50 tgummerer Harzilein: man git status takes an optional pathspec argument, with which you can limit the parts of the working directory are included
15:50 gitinfo Harzilein: the git-status manpage is available at http://jk.gs/git-status.html
15:50 DJ_Spies joined #git
15:51 miklcct joined #git
15:51 rgrinberg joined #git
15:52 drbean joined #git
15:52 Harzilein tgummerer: basically i want to incrementally check my working copy to get to the state where i can do git update-index --assume-unchanged
15:55 neilthereildeil madewokherd: how can i specify the other git repo in the merge command (please keep in mind there are no common ancestors)
15:55 madewokherd you can add the other repo as a remote and fetch from it
15:56 kpease joined #git
15:57 rgrinberg joined #git
15:57 Milijus joined #git
15:59 cyphase joined #git
15:59 drbean_ joined #git
15:59 neilthereildeil madewokherd: how would i specify which commit to start fetching from?
16:00 nydel07 joined #git
16:00 tgummerer Harzilein: what do you mean with incrementally check?  Do you want to do this programmatically?
16:00 madewokherd neilthereildeil: before we continue, do you really want the other commits in your history in their original form? if you just want a rebase, I think that's simpler to do another way
16:01 Balliad joined #git
16:02 JamesBaxter joined #git
16:03 NeverDie joined #git
16:03 MattMaker joined #git
16:03 jaguarmagenta joined #git
16:03 drbean joined #git
16:04 Harzilein tgummerer: yes. when you confirmed that git status would only check its argument subtree, i started writing out subtreename.times files (perhaps i should detect its advice to use -uno instead). now if everything runs without detected files, i'll set the whole thing to --assume-unchanged
16:05 neilthereildeil madewokherd: heres what happened: i had a repo that i didnt wanna fully share. show i checked out a commit, and copied the working tree but not .git/ and gave it to someone. they initialized a seperate git repo in the folder and started committing changes. I just want those changes in my original git repo. what do you think is the best way to do this?
16:05 Harzilein tgummerer: when i use the tree again, i'd like to only set --no-assume-unchanged for the parts of the tree that can be checked quickly
16:05 drbean_ joined #git
16:06 madewokherd neilthereildeil: does the initial commit in the new repo have an identical tree to one of your commits?
16:06 madewokherd if so, I would checkout master in the new repo and do: git format-patch <initial-sha1>
16:06 miklcct joined #git
16:07 drbean- joined #git
16:07 bpna joined #git
16:07 madewokherd then I would checkout the corresponding commit in the original repo and run 'git am', specifying the files generated by format-patch
16:08 madewokherd from there, you can rebase or merge the resulting branch on master
16:09 drbean joined #git
16:10 e14 joined #git
16:11 iskander joined #git
16:12 drbean_ joined #git
16:13 niels__ joined #git
16:13 ahmedelgabri joined #git
16:13 Chloe joined #git
16:13 cyphase joined #git
16:14 miklcct joined #git
16:15 drbean joined #git
16:16 morenoh149 joined #git
16:16 tgummerer Harzilein: not sure what exactly you put in the .times files, but if you want to parse the output you should pass the --porcelain flag to git status.  The output of that is guaranteed not to be changed and meant to be consumed in scripts.
16:17 tgummerer and with !assume_unchanged, just be careful that the files you mark with it really don't change, otherwise git might not do what you expect with them
16:17 gitinfo git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
16:18 MattMaker joined #git
16:19 madewokherd I wonder if git merge lets you specify the merge base
16:20 drbean_ joined #git
16:20 texasmynsted joined #git
16:21 Harzilein tgummerer: it's a freebsd ports-tree checkout, all changes happen in .gitignored "work"-directories or in my local shallow copy
16:21 drbean- joined #git
16:23 dreiss joined #git
16:23 moestevens joined #git
16:23 drbean joined #git
16:24 salamanderrake does git lfs still use http/s even when the url is for ssh?
16:25 mohabaks joined #git
16:25 kulelu88 joined #git
16:25 drbean_ joined #git
16:25 lv2eof joined #git
16:26 jeffreylevesque joined #git
16:29 raijin joined #git
16:30 shafun joined #git
16:30 drbean joined #git
16:31 justan0theruser joined #git
16:31 a_thakur_ joined #git
16:31 shinnya joined #git
16:32 drbean_ joined #git
16:33 MattMaker joined #git
16:34 usm4n joined #git
16:35 Gitzilla joined #git
16:35 drbean- joined #git
16:41 drbean joined #git
16:42 Rodya_ joined #git
16:43 drbean_ joined #git
16:43 ToBeCloud joined #git
16:48 MattMaker joined #git
16:49 DieguezZ joined #git
16:49 iskander joined #git
16:50 iveqy_ left #git
16:51 iveqy joined #git
16:51 AlexxNica joined #git
16:58 drbean joined #git
16:59 MattMaker joined #git
17:04 mozzarella joined #git
17:04 quenode_ joined #git
17:04 rivarun_ joined #git
17:04 styx_ joined #git
17:04 durham joined #git
17:04 rivarun joined #git
17:05 tinanoo1 joined #git
17:05 zyxep joined #git
17:05 dwsr joined #git
17:05 fling joined #git
17:05 alex1a joined #git
17:06 Goplat joined #git
17:06 umbSublime_ joined #git
17:06 MLM joined #git
17:09 drbean_ joined #git
17:09 MattMaker joined #git
17:10 HappyLoaf joined #git
17:10 joki joined #git
17:12 saik0 joined #git
17:14 Limes left #git
17:14 saik0 I have a commit on a local feature branch I'd like to ammend, can I do something like rebase -i <SHA>~1, while preserving timestamps?
17:15 Limes joined #git
17:15 rahtgaz joined #git
17:15 Salander27 joined #git
17:16 drbean joined #git
17:17 Balliad joined #git
17:18 MattMaker joined #git
17:19 JamesBaxter joined #git
17:19 sharkz joined #git
17:19 Limes joined #git
17:20 DolpheenDream joined #git
17:21 Limes left #git
17:22 Limes joined #git
17:24 drbean_ joined #git
17:24 iveqy saik0: --committer-date-is-author-date could that perhaps help you?
17:26 nerdystreetrat joined #git
17:26 a_thakur joined #git
17:27 overlord_tm joined #git
17:28 dsdeiz joined #git
17:29 MattMaker joined #git
17:30 clemf joined #git
17:30 glebihan joined #git
17:32 saik0 iveqy: That looks promising, I'm not sure how to edit a commit without --interactive
17:32 polyzen joined #git
17:32 HappyLoaf joined #git
17:34 thiago joined #git
17:34 saik0 with rebase -i --committer-date-is-author-date <SHA>, (then ammend, --continue) the timestamps are all new. But with git rebase --committer-date-is-author-date <SHA> all the history is rewritten with the old timestamps
17:35 glebihan joined #git
17:35 clemf joined #git
17:37 jaguarmagenta joined #git
17:37 saik0 Ahhh. git keep both commit and author timestamps. Rebasing by default changes the commit ts, not the author ts. That will do just fine.
17:38 AfroThundr joined #git
17:39 jnavila joined #git
17:41 anonymuse joined #git
17:43 MattMaker joined #git
17:44 circ-user-130ZE joined #git
17:44 kulelu88 joined #git
17:44 CheckDavid joined #git
17:45 dreiss joined #git
17:46 Impaloo joined #git
17:47 c^ joined #git
17:51 c0ded joined #git
17:54 hanshenrik joined #git
17:54 MattMaker joined #git
17:54 hahuang65 joined #git
17:56 ochorocho__ joined #git
17:59 multi_io joined #git
17:59 Shakeel_ joined #git
18:01 epaulog joined #git
18:03 MattMaker joined #git
18:04 freimatz joined #git
18:05 morenoh149 joined #git
18:05 c0ded joined #git
18:08 lv2eof joined #git
18:09 azerus joined #git
18:09 cyan__ joined #git
18:12 m0viefreak joined #git
18:13 ShapeShifter499 joined #git
18:14 MattMaker joined #git
18:16 Chloe joined #git
18:21 WayToDoor joined #git
18:21 prawnzy joined #git
18:23 prawnzy joined #git
18:30 neilthereildeil is it possible to take a patch file and extract/apply changes to certain files from it to my repo?
18:31 nilg joined #git
18:33 MattMaker joined #git
18:36 e14 joined #git
18:37 thiago yes
18:37 thiago use the patch command
18:37 thiago or git apply, or git am
18:45 clemf joined #git
18:45 LeBlaaanc joined #git
18:46 snowkidind joined #git
18:48 MattMaker joined #git
18:49 ealvarez___ left #git
18:50 DarkMukke_ left #git
18:50 jaguarmagenta joined #git
18:51 multi90 joined #git
18:51 anonymuse joined #git
18:52 chamunks joined #git
18:53 SegFaultAX joined #git
18:54 mizu_no_oto joined #git
18:55 miklcct joined #git
18:57 nd_ joined #git
18:58 mohabaks joined #git
18:58 hanshenrik_ joined #git
19:00 jeffreylevesque joined #git
19:01 jnewt joined #git
19:02 miklcct joined #git
19:03 rorro joined #git
19:03 MattMaker joined #git
19:04 stamina joined #git
19:08 Shentino joined #git
19:10 e14 joined #git
19:11 Chloe joined #git
19:12 tom[] joined #git
19:13 overlord_tm joined #git
19:14 hexagoxel joined #git
19:15 prawnzy joined #git
19:18 MattMaker joined #git
19:20 forrestv joined #git
19:21 mizu_no_oto joined #git
19:23 Klumben joined #git
19:25 ismaris joined #git
19:28 tomtix joined #git
19:28 MattMaker joined #git
19:29 bpna joined #git
19:29 ciss joined #git
19:31 f3r70rr35f joined #git
19:32 neilthereildeil left #git
19:34 bremner what are the (purported) advantages of signed commits over signed tags?
19:35 ShekharReddy joined #git
19:36 Milijus joined #git
19:36 ahr3n joined #git
19:37 HappyLoaf joined #git
19:37 omx joined #git
19:39 omx hey. So I got this repo which I did some changes to it and now I want to git pull origin master but I can't because I first have to push the changes
19:39 omx which I do not want
19:39 bmahe joined #git
19:39 e14 joined #git
19:39 omx how can I bypass that?
19:42 tomtix did you commited the changes? do you want to keep them or just wipe them?
19:42 omx I just want to wipe them I do not care about them
19:43 thiago bremner: it doesn't create a tag
19:43 omx I want to reatrive what I got on github and wipe what I wrote
19:43 MattMaker joined #git
19:43 thiago omx: git fetch && git reset --hard @{u}
19:43 omx ok, I'll try it
19:44 omx thiago, thanks mate
19:45 Guest38480 joined #git
19:45 dreiss joined #git
19:51 tomtix I have a git repo where I want to remove (filter-branch) file that I should have ignored since beginning, but at some point it fails because there is one of the file I want to remove whom git thinks is symbolic link but in fact in a real file (error: unable to create symlink missing: File name too long; Could not checkout the index); Is there a way to remove this file? Or to force filemode or all commit where this file appear? (whithou
19:51 tomtix t checkout)
19:53 mizu_no_oto joined #git
19:54 morenoh149 joined #git
19:55 barteks2x joined #git
19:57 fstd joined #git
19:57 robotroll joined #git
19:58 MattMaker joined #git
19:59 _sfiguser joined #git
19:59 fstd_ joined #git
20:00 prawnzy joined #git
20:04 tomtix I think i will try my luck with the index filter and git-update-index
20:05 nwkj86 joined #git
20:06 jeffreylevesque joined #git
20:09 titankiller joined #git
20:09 endiruna joined #git
20:10 aurelien joined #git
20:11 whitby joined #git
20:12 khfeng joined #git
20:12 aurelien is it possible to push the same directory project to diffent git repository servers?
20:12 MrWoohoo joined #git
20:13 ResidentBiscuit joined #git
20:13 MattMaker joined #git
20:13 texasmynsted joined #git
20:14 tgummerer aurelien: what do you mean with the same directory project?  the same repository?
20:14 aidalgol joined #git
20:15 aurelien tgummerer: I have one projet that i want to push to github and savannah
20:15 whitby You can add two remotes and `git push` to both separately
20:16 whitby e.g. `git push github` and `git push savannah`
20:16 aurelien how can i do that?
20:16 tgummerer aurelien: have a look at man git remote
20:16 gitinfo aurelien: the git-remote manpage is available at http://jk.gs/git-remote.html
20:17 tgummerer use git remote add to add a new remote and then you can just push to it
20:17 vF3hNGxc47h8 joined #git
20:19 endiruna joined #git
20:22 drbean joined #git
20:26 Milijus joined #git
20:28 MattMaker joined #git
20:29 hahuang62 joined #git
20:30 aurelien ok thanks
20:32 _sfiguser joined #git
20:36 multi90_ joined #git
20:38 aurelien hmm
20:38 titankiller joined #git
20:39 MattMaker joined #git
20:39 aurelien can i just add a new url in [remote "origin"] in .git/config?
20:39 bpna joined #git
20:40 tgummerer aurelien: you can't have two different urls for one remote
20:40 tgummerer you could add a new section (e.g. [remote "savannah"])
20:41 tgummerer I would really recommend using the git remote command though instead of editing these files manually
20:41 ahmedelgabri joined #git
20:42 atomi joined #git
20:43 KeelOfSteel joined #git
20:44 duderonomy joined #git
20:49 m0viefreak joined #git
20:49 TH3-G0D5 joined #git
20:50 ahr3n joined #git
20:52 hahuang62 joined #git
20:54 armyriad joined #git
20:56 DolpheenDream joined #git
20:56 noyb joined #git
20:57 snthsnth joined #git
20:58 alex1a joined #git
20:58 MattMaker joined #git
20:59 mizu_no_oto joined #git
20:59 theskillwithin joined #git
21:01 aurelien hmm it create a branch github on savannah -_-'
21:01 NeverDie joined #git
21:01 aurelien and does not push anything to github
21:01 texasmynsted joined #git
21:03 thiago what is "it" that did that?
21:04 Darren_ joined #git
21:05 ahmedelgabri joined #git
21:05 flobin joined #git
21:06 aurelien thiago: the thing i do
21:06 aurelien in fact it seems that it create a sort of pull request on github
21:07 flobin hi everyone, I think I accidentally committed a huge .psd file in a repo several commits ago—is there anything I can do to retroactively remove it? I searched around a bit and found this https://rtyley.github.io/bfg-repo-cleaner/ but I don't think it worked
21:07 thiago aurelien: well, if it doesn't do what you want, don't do that thing you do
21:08 thiago flobin: have you pushed it?
21:08 aurelien thiago: hmm
21:08 flobin thiago no, I'm not sure I even can
21:08 flobin I mean since the psd got in there
21:08 thiago flobin: have you merged anything since?
21:08 flobin this is a really small project, so only a master branch
21:09 Milijus joined #git
21:09 thiago flobin: but did you pull?
21:09 thiago pull merges
21:09 flobin oh no, there aren't any
21:09 thiago ok
21:09 thiago so git log filename.psd
21:09 flobin ah, one sec
21:09 thiago copy the last (bottommost) SHA-1, then git rebase -i <thatsha1>~
21:09 thiago include the ~ at the end
21:10 thiago change pick to edit for that commit
21:10 flobin oh actually I think it's several .psd
21:10 flobin ss
21:10 flobin frig, .psd files*
21:10 thiago do you want to remove all of them
21:10 thiago ?
21:10 flobin yeah
21:11 thiago flobin: so read the man git-filter-branch. There's a section on removing a file.
21:11 gitinfo flobin: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
21:11 thiago expand it to match a wildcard
21:11 flobin oh, thanks
21:11 rgrinberg joined #git
21:12 cagedwisdom joined #git
21:13 flobin so basically:
21:13 MattMaker joined #git
21:15 boombatower joined #git
21:16 clemf joined #git
21:17 flobin git filter-branch --index-filter 'git rm --cached --ignore-unmatch *.psd' HEAD
21:17 flobin or am I doing that wrong?
21:23 runciter joined #git
21:24 runciter suppose i have a local branch 'foo', and a remote 'origin' with branch foo
21:24 runciter i do: git fetch origin foo:refs/remotes/origin/foo
21:25 runciter is it the case that this is the same as doing: git fetch origin refs/heads/foo:refs/remotes/origin/foo
21:27 f3r70rr35f joined #git
21:28 Vgr joined #git
21:28 MattMaker joined #git
21:29 cdown_ joined #git
21:29 AmazeCPK joined #git
21:30 AmazeCPK When using webstorm, if I checkout to another branch, I do not see the refected changes in webstorm like I do in other text editors. Is there a way to fix this?
21:32 miklcct joined #git
21:33 filcab joined #git
21:33 filcab joined #git
21:35 MattE joined #git
21:35 eivarv joined #git
21:35 realz joined #git
21:35 ochorocho__ joined #git
21:36 astrofog joined #git
21:37 eivarv_ joined #git
21:37 rba_ joined #git
21:39 perrier-jouet joined #git
21:39 MattMaker joined #git
21:41 peepsalot joined #git
21:43 morenoh149 joined #git
21:43 bpna joined #git
21:46 Darren_ joined #git
21:46 berndj joined #git
21:48 e14 joined #git
21:52 hanshenrik__ joined #git
21:52 f3r70rr35f joined #git
21:52 _ikke_ AmazeCPK: Hmm, it should automatically update
21:52 anonymuse joined #git
21:55 Rodya_ joined #git
21:56 e14 joined #git
21:56 miklcct joined #git
21:57 Rodya__ joined #git
21:58 e14 joined #git
21:58 ayjay_t joined #git
21:58 MattMaker joined #git
21:59 jaguarmagenta joined #git
22:00 Atm0spher1c joined #git
22:02 Atm0spher1c joined #git
22:03 snthsnth joined #git
22:04 e14 joined #git
22:05 miklcct joined #git
22:09 BlaXpirit I would like to `git add` files that have changes which do not contain some text
22:09 MattMaker joined #git
22:09 BlaXpirit to make this clearer... imagine I ran  git diff | grep -v 'my text'    - and then I would add only files which have any "+" or "-"
22:12 prawnzy joined #git
22:12 AmazeCPK thanks _ikke_ looks like it was just a bug
22:13 p4trix joined #git
22:17 e14_ joined #git
22:18 f3r70rr35f joined #git
22:19 Rodya_ joined #git
22:19 MattMaker joined #git
22:20 gr joined #git
22:21 miklcct joined #git
22:24 MattMaker joined #git
22:25 gr Hello, need some help. I am on branch, I have some commits that are not pulled, I has make a checkout of a special commit. now i want back to my previous head.
22:27 clemf joined #git
22:29 Guest57568 joined #git
22:30 gr somebody here?
22:32 j416 gr: git checkout -
22:33 gr i tried git checkot myBranch, i doesnot work
22:33 gr i see my commit in reflog
22:33 gr but i cannot checkout the commit
22:35 fedepad joined #git
22:36 tristanp joined #git
22:37 gr intellij fix it
22:37 gr has fix it
22:38 holodoc joined #git
22:39 iamthad joined #git
22:41 e14 joined #git
22:42 anuxivm joined #git
22:42 jimi_ joined #git
22:44 MattMaker joined #git
22:49 skyres joined #git
22:51 perrier-jouet joined #git
22:53 e14_ joined #git
22:55 miklcct joined #git
22:56 mellernoia joined #git
22:56 Milijus joined #git
22:58 Guest79586 joined #git
22:59 MattMaker joined #git
23:01 f3r70rr35f joined #git
23:01 opiates joined #git
23:02 opiates Is there any way to tell whether `git commit --date` was used?
23:05 _sfiguser joined #git
23:05 harish joined #git
23:06 heroux joined #git
23:07 opiates nvm :)
23:07 opiates Apologies.
23:10 MattMaker joined #git
23:10 Noldorin joined #git
23:11 mikecmpbll joined #git
23:12 miklcct joined #git
23:12 JRHaigh joined #git
23:12 e14 joined #git
23:16 dodobrain joined #git
23:17 e14 joined #git
23:17 wxg joined #git
23:19 Castor_Troy joined #git
23:19 Remram[m] joined #git
23:19 Remram[m] joined #git
23:19 Castor_Troy Hello. I couldn't understand the concept of remotes. Suppose I host my project on github, I will have github remote. But why do I need a second remote>
23:21 raijin joined #git
23:21 nedbat Castor_Troy: you might not
23:22 nedbat Castor_Troy: some people have other remotes because there are other sources of changes.
23:22 Castor_Troy in a collaboration environment, all the code is hosted at one place, right? so where does more origins come from.
23:23 Castor_Troy for example there are 3 collaborators to a project on github... there will be only 1 remote for all three users
23:23 wxg joined #git
23:24 cagedwisdom joined #git
23:24 e14 joined #git
23:25 DolpheenDream joined #git
23:25 nedbat Castor_Troy: github has lead to a very centralized model of collaboration, but git doesn't require a central hub like GitHub.
23:26 nedbat Castor_Troy: but for example, I might have two remotes on GitHub: the main repo, and a fork by someone I collaborate with. He might have a branch he's working on, and I want to try out his changes. I can pull directly from his fork.
23:27 Castor_Troy nedbat: ok. but in case of forking, the directory structures could be vastly different, right?
23:27 Castor_Troy i'm asking, i dont know about forking.
23:28 nedbat Castor_Troy: i mean a fork in the GitHub sense, which is to say, a clone on GitHub.
23:28 f3r70rr35f joined #git
23:29 Castor_Troy got it nedbat. thanks.
23:29 nedbat Castor_Troy: another use: you can deploy to heroku by setting up a remote there and pushing to it.
23:30 Castor_Troy nedbat: ok. also, does git push <remotename> push data to all branches on that remote that i'm working on?
23:31 nedbat Castor_Troy: not sure, tbh
23:31 Castor_Troy ok.
23:32 morenoh149 joined #git
23:34 bremner Castor_Troy: see push.default in man git config
23:34 gitinfo Castor_Troy: the git-config manpage is available at http://jk.gs/git-config.html
23:34 e14 joined #git
23:36 clemf joined #git
23:36 pikajude joined #git
23:37 Marbug_ joined #git
23:40 durham joined #git
23:43 fedepad joined #git
23:44 Sleepy63 joined #git
23:48 boombatower joined #git
23:49 lolmac joined #git
23:49 e14_ joined #git
23:50 jeffreylevesque joined #git
23:50 sonOfRa joined #git
23:51 prawnzy joined #git
23:53 Gitzilla joined #git
23:56 niels__ joined #git
23:56 Milijus joined #git
23:58 niels__ joined #git

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