Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-04

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

All times shown according to UTC.

Time Nick Message
00:02 Balthasar joined #git
00:03 renlo joined #git
00:03 Siegfried joined #git
00:04 converge joined #git
00:06 eca joined #git
00:07 matoro joined #git
00:07 eca i did git init/fetch in my home dir, any way to remove all files?
00:07 anuxivm left #git
00:10 shmuli joined #git
00:13 Raed joined #git
00:14 venmx joined #git
00:14 rewt eca, do the git clone in another dir, and do something like:  for f in *; do rm ~/$f; done  # and hope that the fetch didn't overwrite any files you wanted to keep
00:15 Sasazuka joined #git
00:15 theskillwithin joined #git
00:16 converge joined #git
00:22 HoierM joined #git
00:24 rbern joined #git
00:26 eca rewt, thanks
00:26 Gsham joined #git
00:26 eca left #git
00:28 mischat joined #git
00:34 Raed joined #git
00:35 infernix joined #git
00:36 converge joined #git
00:36 converge joined #git
00:38 atesc joined #git
00:39 JanC_ joined #git
00:40 didik joined #git
00:44 nd- joined #git
00:45 EricPoe joined #git
00:47 Siegfried joined #git
00:47 nettoweb joined #git
00:47 howitdo joined #git
00:49 qws-user-1228 joined #git
00:49 FilipNortic__ joined #git
00:50 holgersson joined #git
00:51 cdesai joined #git
00:51 Siegfried joined #git
00:54 Muzer joined #git
00:56 jccn joined #git
01:01 cdown joined #git
01:03 Garen joined #git
01:05 renlo joined #git
01:05 jeesss joined #git
01:10 Siegfried joined #git
01:16 renlo joined #git
01:17 sgtbigman joined #git
01:18 mizu_no_oto joined #git
01:27 renlo joined #git
01:27 arescorpio joined #git
01:28 fstd joined #git
01:29 akurniawan joined #git
01:33 cdown joined #git
01:34 alex1a joined #git
01:35 crazyhorse18 joined #git
01:39 tmz joined #git
01:40 nothingmuch joined #git
01:40 maxb joined #git
01:40 BinGOs joined #git
01:40 yohnnyjoe joined #git
01:41 edeca joined #git
01:42 nowhere_man joined #git
01:44 liuzhen joined #git
01:44 venmx joined #git
01:53 akurniawan joined #git
01:53 nicksloan joined #git
01:59 User458764 joined #git
01:59 bruce_lee joined #git
01:59 bruce_lee joined #git
02:00 User458764 joined #git
02:00 SwiftMatt joined #git
02:03 cdg joined #git
02:04 jstimm joined #git
02:05 menip joined #git
02:05 darkbit joined #git
02:06 f3r70rr35f joined #git
02:06 rbern joined #git
02:08 masuberu joined #git
02:08 finalbeta joined #git
02:08 Vampire0 joined #git
02:09 MrDave20161 joined #git
02:10 Dougie187 joined #git
02:12 done joined #git
02:14 MrDave20161 I'm sure this has been asked but the search engines don't seem to give me any answers I can use.  Does anyone know how to set up github to send a email to the repo owner when there are changes to the wiki?  In the webhook setup it needs a url, what url can I put in there to have it trigger github to send the email to me?
02:15 Anja joined #git
02:16 railssmith joined #git
02:17 Jameser joined #git
02:17 cjohnson MrDave20161: the point of the url is that github will make a request to that url
02:17 cjohnson ie you should use a url that points to a server of yours that you can then use to trigger the email
02:18 yohnnyjoe joined #git
02:19 fission6 joined #git
02:20 fission6 how do i diff a merge conflict to see the changes, its hard to see when i look at the markers in the file
02:20 dreiss joined #git
02:22 hahuang61 joined #git
02:23 MrDave20161 cjohnson: Thanks.  I was hoping that wasn't the only option.  I don't have a nice fixed server waiting to receive requests and was hoping that there was a way to just configure it so that I get emails like I do for other events.
02:23 mizu_no_oto joined #git
02:27 KnownSyntax joined #git
02:27 Limes joined #git
02:30 mischat joined #git
02:34 svm_invictvs joined #git
02:34 Dougie187 joined #git
02:36 romerocesar joined #git
02:36 rbern joined #git
02:39 Pent joined #git
02:40 Darren_ joined #git
02:41 e14 joined #git
02:41 navidr joined #git
02:46 xall joined #git
02:46 e14 joined #git
02:46 d^sh joined #git
02:48 ejb joined #git
02:49 red82 joined #git
02:50 rmbeer joined #git
02:50 rmbeer hello
02:52 rmbeer when must i added the other files like music, sound and images in a git? or this never is added?
02:52 dsantiago joined #git
02:56 e14 joined #git
02:58 NoOutlet joined #git
02:59 gfixler joined #git
03:00 whomp joined #git
03:01 aavrug joined #git
03:01 howdoi joined #git
03:02 aavrug joined #git
03:02 PioneerAxon joined #git
03:03 Dougie187 left #git
03:03 aavrug joined #git
03:05 jeffreylevesque joined #git
03:05 jstimm joined #git
03:05 Gsham joined #git
03:08 sunri5e joined #git
03:08 e14 joined #git
03:08 austin987 joined #git
03:08 watabou joined #git
03:09 nizram joined #git
03:10 PerlJam joined #git
03:10 Ryanar joined #git
03:13 zumba_ad_ joined #git
03:15 venmx joined #git
03:16 Electrometro joined #git
03:17 netj joined #git
03:17 Xarodon joined #git
03:19 Andrew_K joined #git
03:20 Random832 rmbeer: there's nothing technically stopping you from doing so
03:20 Random832 if they change frequently your repository may grow large since they're harder to delta-encode
03:22 hahuang61 joined #git
03:24 red82 joined #git
03:24 BSaboia joined #git
03:25 akushner joined #git
03:25 NoOutlet1 joined #git
03:28 ohiojason77 joined #git
03:28 m___ joined #git
03:31 mischat joined #git
03:31 Rickmasta joined #git
03:31 Klumben joined #git
03:33 ohiojason77 left #git
03:34 PioneerAxon joined #git
03:38 jstimm joined #git
03:44 hexagoxel joined #git
03:45 cjohnson MrDave20161: well it won't be done using the webhooks feature anyway. I'm not sure if github provides some other option for setting up additional email notifications. my guess is not.
03:48 Random832 joined #git
03:50 Siegfried joined #git
03:53 Skryll joined #git
03:56 BSAlb joined #git
03:59 mehola joined #git
04:00 PaulCapestany joined #git
04:00 jost__ joined #git
04:06 cdown_ joined #git
04:06 chachasmooth joined #git
04:11 Rodya_ joined #git
04:12 cyphase joined #git
04:14 mar77i joined #git
04:15 Vortex34 joined #git
04:18 PioneerAxon_ joined #git
04:19 phanimahesh joined #git
04:21 pks joined #git
04:25 hahuang61 joined #git
04:25 a_thakur joined #git
04:25 tchan joined #git
04:30 cdown joined #git
04:33 BSAlb joined #git
04:33 mischat joined #git
04:35 Sasazuka joined #git
04:37 bmahe joined #git
04:45 venmx joined #git
04:47 sssilver joined #git
04:47 ngrin joined #git
04:47 snthsnth joined #git
04:51 shmuli joined #git
04:51 akushner joined #git
04:52 satya4ever joined #git
04:53 subhojit777 joined #git
04:53 ArchNoob joined #git
04:54 Siegfried joined #git
04:55 Anupkumar joined #git
04:57 tristanp joined #git
04:59 satya4ever joined #git
05:02 unreal joined #git
05:03 subhojit777 joined #git
05:03 subhojit777 joined #git
05:06 Rickmasta Hey guys, whenever I try to push, is prompts me to enter a password
05:06 Rickmasta Is there any way I can disable it?
05:07 Rickmasta Everywhere I look it says to make sure that the repo url is  a ssh: url but mine already is
05:08 ThunderChicken have you set up authorized_keys ?
05:11 strugee joined #git
05:13 User458764 joined #git
05:13 _cyril_ joined #git
05:16 dreiss joined #git
05:18 xall joined #git
05:22 Rickmasta Thanks ThunderChicken, that was the solution lol
05:24 mmattice joined #git
05:25 hahuang61 joined #git
05:27 snthsnth joined #git
05:32 scarabx joined #git
05:33 jfr joined #git
05:33 nilg joined #git
05:34 mischat joined #git
05:35 Cabanossi joined #git
05:41 polyzen joined #git
05:44 resurtm joined #git
05:44 djb-irc joined #git
05:47 cdown joined #git
05:48 jaafar joined #git
05:49 shmuli joined #git
05:51 mauzilla joined #git
05:53 liuzhen joined #git
05:54 akurniawan joined #git
06:00 Rodya_ joined #git
06:06 MrMojito joined #git
06:08 POQDavid joined #git
06:08 hagabaka joined #git
06:10 zulutango joined #git
06:10 resurtm joined #git
06:11 kulelu88 joined #git
06:15 cagedwisdom joined #git
06:15 mrpackethead joined #git
06:16 mmattice joined #git
06:16 venmx joined #git
06:20 pijiu joined #git
06:22 XuCC joined #git
06:23 phanimahesh joined #git
06:23 WayToDoor joined #git
06:23 nilg joined #git
06:30 ngperfex joined #git
06:32 Khisanth joined #git
06:33 lordjancso joined #git
06:34 mischat joined #git
06:36 eivarv joined #git
06:37 qt-x joined #git
06:41 done joined #git
06:41 overlord_tm joined #git
06:45 satya4ever left #git
06:45 ThomasLocke joined #git
06:45 ThomasLocke joined #git
06:47 cdown joined #git
06:51 Rickmasta joined #git
06:57 shubhnik joined #git
06:59 Raging_Hog joined #git
07:00 jaguarmagenta joined #git
07:02 red82 joined #git
07:02 venmx joined #git
07:05 rscata joined #git
07:09 User458764 joined #git
07:10 LucaTM_ joined #git
07:12 roelmonnens joined #git
07:13 roelmonnens joined #git
07:13 sea-gull_ joined #git
07:14 zeroed joined #git
07:14 zeroed joined #git
07:14 _cyril_ joined #git
07:16 lb1c joined #git
07:16 venmx joined #git
07:17 PCatinean joined #git
07:18 hyperair joined #git
07:19 tvw joined #git
07:26 chele joined #git
07:27 hahuang61 joined #git
07:27 jnavila joined #git
07:31 yanome joined #git
07:31 snthsnth joined #git
07:33 freimatz joined #git
07:34 skunkz joined #git
07:35 Sceorem joined #git
07:35 mischat joined #git
07:42 venmx joined #git
07:43 zeroed joined #git
07:48 snthsnth joined #git
07:50 hfp_work joined #git
07:50 hfp joined #git
07:54 fees joined #git
07:56 eduardas_m joined #git
08:02 User458764 joined #git
08:02 snthsnth joined #git
08:03 mrpackethead joined #git
08:04 brk_ joined #git
08:05 danslo joined #git
08:06 jknetl joined #git
08:07 danslo joined #git
08:07 eduardas_ joined #git
08:07 xaa joined #git
08:08 danslo joined #git
08:08 jfr joined #git
08:11 zotherstupidguy joined #git
08:12 johnlage joined #git
08:12 Darcidride joined #git
08:15 TomyWork joined #git
08:19 troulouliou_div2 joined #git
08:19 LucaTM joined #git
08:20 Repox joined #git
08:22 bakibour joined #git
08:22 bakibour left #git
08:23 bourbaki joined #git
08:23 bourbaki Hidiho
08:24 bourbaki When i shallow clone for a build server that i want to build incrementally on (so i need to be able to pull commits) is there a problem when i pull commits that have been commenced before the shallow clone?
08:24 grawity no
08:25 bourbaki I read that there are problems with merging but they do not effect pulling any commit?
08:25 akurniawan joined #git
08:27 GavinMagnus joined #git
08:27 hahuang61 joined #git
08:31 Siegfried joined #git
08:33 PaulePanter joined #git
08:33 rendar joined #git
08:34 laumann joined #git
08:37 GavinMagnus joined #git
08:38 _noblegas joined #git
08:40 ahmedelgabri joined #git
08:42 robotroll joined #git
08:43 corsibu joined #git
08:46 elect joined #git
08:51 jaguarmagenta joined #git
08:52 pijiu joined #git
08:54 pijiu joined #git
08:54 encod3 joined #git
08:55 InfoTest joined #git
08:57 Siegfried joined #git
08:58 venmx joined #git
08:59 halbomin joined #git
08:59 kurkale6ka joined #git
09:01 stoned joined #git
09:02 stoned I don't know what I did but something is messed up in my gitlab repository
09:02 stoned I seem to have lost an entire folder
09:02 nettoweb joined #git
09:02 stoned the changes are live on my site, but the gitlab repo is missing the folder, and my local copy is too
09:02 jcalonso_ joined #git
09:03 stoned ffs.
09:03 halbomin joined #git
09:03 stoned past 5 hours of work is somehow lost, gone soemwhere :(
09:06 mikecmpbll joined #git
09:07 icedwater joined #git
09:07 marcogmonteiro joined #git
09:07 icedwater Hello! I just noticed the git user survey only has results for 2006-2012 and 2016. Was there no survey conducted in between?
09:12 tango_ joined #git
09:13 denimsof_ joined #git
09:13 okdamn joined #git
09:14 okdamn Hi, sorry how do i release a .dmg file in git tag ? I don't want to track .dmg files with git
09:14 okdamn .....
09:14 vjacob joined #git
09:15 dodobrain joined #git
09:15 demize okdamn: Release?
09:15 _cyril_ joined #git
09:17 eduardas_m joined #git
09:17 okdamn demize:  .dmg app release yes
09:17 okdamn or .exe as you wish
09:18 demize A tag is just a pointer to a commit.
09:18 GavinMagnus joined #git
09:18 demize There is literally no way to have it as part of a tag without tracking it.
09:18 grift joined #git
09:19 okdamn demize:  somebody told me tags are not part of the repo …. :(
09:19 osse they are wrong
09:19 okdamn how do you think they release .dmg in tags https://github.com/wulkano/kap/releases ?
09:20 okdamn i don't understand how to do this
09:20 canton7 okdamn, through the github interface
09:20 zeroed joined #git
09:20 zeroed joined #git
09:20 okdamn canton7:  oh……………….. let me try maybe is that
09:20 canton7 okdamn, in your repo, click 'Releases', 'Draft a new release', then write stuff and add files
09:21 PioneerAxon joined #git
09:22 okdamn canton7:  that's it!!! crazy i use github since 2005 i did not know about this :O
09:22 okdamn thanks a lot
09:22 canton7 :)
09:23 okdamn do you know if it's possible to achieve this programmatically?
09:23 qpdb joined #git
09:23 canton7 sure, use the api
09:23 okdamn cool
09:24 holodoc joined #git
09:25 vjacob left #git
09:27 mkoskar joined #git
09:28 hahuang61 joined #git
09:28 XuCC joined #git
09:30 a_thakur joined #git
09:34 dodobrain joined #git
09:39 ismithers joined #git
09:40 BlaXpirit joined #git
09:42 ngperfex joined #git
09:43 clmsy joined #git
09:45 miguelfernandes joined #git
09:48 jcalonso joined #git
09:48 masak joined #git
09:49 masak is there a way to rebase, but keep the history structure from merges? does that make sense?
09:50 User458764 joined #git
09:50 roflin joined #git
09:51 snthsnth joined #git
09:51 MikeChernev joined #git
09:51 mrpackethead joined #git
09:55 mischat joined #git
09:55 Serpent7776 joined #git
09:58 roflin joined #git
09:59 King_Hual joined #git
09:59 tristanp joined #git
10:00 MikeChernev joined #git
10:01 mmattice joined #git
10:03 masak heh -- when I rebase with `--keep-empty`, it fails with "error: Commit fb54402f268f425b292749e438f0d3041f11533c is a merge but no -m option was given."
10:03 masak but I can't pass -m1 to the `git rebase` command, because the -m flag for rebase chooses merge strategy, not parent.
10:04 masak so... if there's a way to keep the merge commits while rebasing, that wasn't it :)
10:06 rnsanchez joined #git
10:06 xof joined #git
10:06 Xethron joined #git
10:08 sbeller joined #git
10:09 jstein joined #git
10:09 mmattice joined #git
10:11 a_thakur joined #git
10:12 ferr joined #git
10:13 venmx joined #git
10:13 j416 masak: --preserve-merges
10:14 vjacob joined #git
10:14 j416 masak: also, BUGS section of man page states: "The todo list presented by --preserve-merges --interactive does not represent the topology of the revision graph. Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results."
10:14 j416 keep in mind
10:15 elsevero joined #git
10:15 mischat joined #git
10:16 vjacob left #git
10:20 davesidious joined #git
10:20 davesidious Hey folks - does anyone know how to find child branches of a given branch?
10:20 Rickmasta joined #git
10:20 aax joined #git
10:21 jbitdrop joined #git
10:22 j416 davesidious: git branch --contains <given branch>
10:23 PCatinean joined #git
10:23 davesidious Thanks, j416 - I'll give it a look :)
10:24 ocbtec joined #git
10:26 yohnnyjoe joined #git
10:28 maroloccio joined #git
10:29 maroloccio hi. sorry if i have a particular commti C1 introducing a diff D1 of changes on branch B2.. how can i check if my current branch B1 includes that diff or not?
10:34 encod3 joined #git
10:35 corsibu joined #git
10:36 DonaldDuck joined #git
10:37 mmattice joined #git
10:39 strugee joined #git
10:39 pirate21994 joined #git
10:39 j416 maroloccio: not that particular commit necessarily, but its diff?
10:40 j416 maroloccio: if it's the exact commit, you can "git branch --contains <thatcommit>"
10:40 qws-user-1229 joined #git
10:40 j416 maroloccio: if it's say a cherry-picked commit (or one with identical diff), you can use man git-cherry
10:40 j416 what happened to gitinfo
10:40 j416 maroloccio: man git-cherry
10:41 j416 huh. dead
10:41 finalbeta1 joined #git
10:41 robotrolll joined #git
10:41 j416 git cherry, anyway. :)
10:41 _ikke_ !ping
10:42 mischat_ joined #git
10:42 rishi` joined #git
10:43 athaller_ joined #git
10:43 inflames joined #git
10:43 MLM_ joined #git
10:44 nowhereman joined #git
10:44 sonOfRa_ joined #git
10:44 VampiricPadraig_ joined #git
10:44 ohcibi_ joined #git
10:44 heftig joined #git
10:44 Blkt joined #git
10:44 mafrasi2 joined #git
10:45 Seveas joined #git
10:45 NeverTired joined #git
10:45 shennyg joined #git
10:45 ilmari joined #git
10:45 FritzLakritz joined #git
10:45 johtso joined #git
10:45 iamthad joined #git
10:45 xkr47 joined #git
10:45 Neo joined #git
10:45 Bengi joined #git
10:46 worstadmin joined #git
10:46 matrixa1 joined #git
10:46 barq joined #git
10:46 ieee joined #git
10:46 elmcrest joined #git
10:46 theresajayne joined #git
10:46 dpower joined #git
10:46 Bombe joined #git
10:46 prosody joined #git
10:46 fcrick joined #git
10:46 yena joined #git
10:46 pizzaops joined #git
10:46 spr0tsuki joined #git
10:46 martin_g joined #git
10:46 vcoinminer joined #git
10:46 Lor_ joined #git
10:46 iota_pi joined #git
10:46 wenzowski joined #git
10:46 timwis joined #git
10:46 beckyconning__ joined #git
10:47 sfan786_ joined #git
10:47 gyre007 joined #git
10:47 Iacobus_ joined #git
10:47 ulkesh joined #git
10:47 da5id joined #git
10:47 harleypig joined #git
10:47 felowe joined #git
10:47 mehdi___ joined #git
10:47 ELLIOTTCABLE joined #git
10:47 cmosguy joined #git
10:47 techntoke__ joined #git
10:47 joco42 joined #git
10:47 cloudcell_ joined #git
10:47 zero7 joined #git
10:47 Whisket joined #git
10:48 kier joined #git
10:48 dmarr joined #git
10:49 languitar joined #git
10:49 trelane joined #git
10:49 trelane joined #git
10:49 meZee joined #git
10:49 robinsmidsrod joined #git
10:49 canton7 joined #git
10:49 Keridos joined #git
10:49 SupaHam joined #git
10:49 midgetspy joined #git
10:49 msonntag joined #git
10:50 CustosLimen joined #git
10:50 matthiaskrgr joined #git
10:50 saidelike joined #git
10:50 souther joined #git
10:51 aax joined #git
10:51 Eugene joined #git
10:52 corsibu joined #git
10:54 PCatinean joined #git
10:54 liuzhen joined #git
10:55 madduck joined #git
10:55 Guest27381 joined #git
10:55 Guest27381 joined #git
10:55 MrMojito joined #git
10:55 MrMojito joined #git
10:56 swift1_ joined #git
10:56 rom1504 joined #git
10:56 User458764 joined #git
10:57 mmlb joined #git
10:57 ghostlight joined #git
10:57 kjsage[m] joined #git
10:57 nioncode joined #git
10:57 montyboy joined #git
10:57 hexa- joined #git
10:57 davix[matrix] joined #git
10:58 maroloccio joined #git
10:58 Guest42 joined #git
10:58 mmattice joined #git
10:58 contracode joined #git
10:59 daurnimator joined #git
10:59 systemovich joined #git
11:00 corsibu joined #git
11:00 tristanp joined #git
11:01 ferr joined #git
11:01 Peng_ joined #git
11:03 Guest42 left #git
11:03 raijin joined #git
11:04 alhariel joined #git
11:05 byte512 joined #git
11:05 cdg joined #git
11:06 Jahhein joined #git
11:07 DieguezZ joined #git
11:07 Gloomy joined #git
11:07 okdamn joined #git
11:08 gitinfo joined #git
11:10 xaa__ joined #git
11:10 ArchNoob joined #git
11:10 mmattice joined #git
11:11 rchavik joined #git
11:12 converge joined #git
11:12 converge joined #git
11:13 guest4521 joined #git
11:15 strugee joined #git
11:15 flaviodesousa joined #git
11:16 robotrolll joined #git
11:16 kraut joined #git
11:16 _cyril_ joined #git
11:17 encod3_ joined #git
11:17 xaa__ joined #git
11:20 jknetl joined #git
11:26 corsibu joined #git
11:27 freimatz joined #git
11:27 Mir4g3 joined #git
11:27 lvns joined #git
11:28 johnny56 joined #git
11:30 fuchstronaut because reasons, I have stashed away to config files i have to 'git stash apply' whenever I switch my branch. Can I somehow apply a stash and have these files unstaged?
11:30 fuchstronaut because I fear I will commit them somehow
11:31 grawity unstage them with `git reset`?
11:31 fission6 joined #git
11:32 PCatinean joined #git
11:33 fuchstronaut just thought there might be a way to apply the stash and not stage them
11:34 finalbeta joined #git
11:34 fuchstronaut I tend to forget this, or maybe I have other files already staged
11:34 fuchstronaut the projects architecture stinks
11:36 Jahhein joined #git
11:37 cdg_ joined #git
11:39 dan2k3k4 joined #git
11:40 Hobbyboy joined #git
11:40 mmattice joined #git
11:40 buzzLightBeer joined #git
11:40 kba joined #git
11:41 AlexanderS joined #git
11:42 qws-user-1228 joined #git
11:42 MrMojito joined #git
11:47 Anupkumar joined #git
11:47 lss8 joined #git
11:49 mmattice joined #git
11:52 mizu_no_oto joined #git
11:52 xall joined #git
11:56 TomyWork joined #git
11:59 osse git config alias.stink '!git stash && git reset && :'
12:00 mmattice joined #git
12:00 rudi_s && : ?
12:00 done joined #git
12:01 osse to slurp up extra args
12:01 rudi_s Ah, thanks.
12:02 xall_ joined #git
12:03 User458764 joined #git
12:05 sonOfRa Is there a way to configure git diff to output something similar to githubs word-based diff? https://github.com/sonOfRa/crypto-notes/comm​it/9b78281dd698db3508741bea256e8a8e0a7e75a4 I know about git diff --color-words, but that /only/ highlights the words changed, not the entire line and then the changed words in a different color.
12:06 notebox joined #git
12:06 synthroid joined #git
12:08 al-damiri joined #git
12:09 grawity set diff-so-fancy as your core.pager
12:09 moritz sonOfRa: search for diff-highlight
12:09 grawity https://github.com/so-fanc​y/diff-so-fancy#screenshot
12:10 sonOfRa grawity: that is perfect. I had just stumbled upon diff-highlight, but this looks even better
12:10 grawity I think it might include both
12:10 barteks2x joined #git
12:10 irco joined #git
12:11 lindenle joined #git
12:12 mmattice joined #git
12:12 mischat joined #git
12:12 fuchstronaut thanks osse, is there a way to git reset files that are in the stash?
12:12 fuchstronaut not all  of em
12:13 led_belly joined #git
12:14 _cyril_ joined #git
12:18 mcon joined #git
12:20 manuels joined #git
12:21 Rickmasta joined #git
12:21 moritz git reset -p stash@{1} # maybe?
12:21 moritz stash@{0} maybe
12:22 zeroed joined #git
12:22 brk_ joined #git
12:23 j416 ffg
12:23 Darcidride_ joined #git
12:23 masak j416: thank you
12:23 j416 wrong window, sorry
12:23 j416 masak: o/
12:24 subhojit777 joined #git
12:24 manuels joined #git
12:24 mcon Hi, I'm trying to setup a (very simple) centralized repo with unrestricted read access, but with no direct write access. Updates should be sent via mail (git format-patches && git send-email) to an integrator and applied (after testing) with "git am". All seems to work and now I (user), after a pull, am aligned (git diff origin/master is empty), but I still have "Your branch is ahead of 'origin/master' by 3 commits.". What
12:25 moritz mcon: your line was truncated after "What a"
12:25 leeN joined #git
12:26 mcon moritz: It was almost the end ;) the full sentence was: "What am I doing wrong?"
12:27 moritz mcon: !repro please
12:27 gitinfo mcon: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
12:30 hahuang61 joined #git
12:30 SunOS joined #git
12:31 SunOS Cloning into 'eggdrop'...
12:31 SunOS fatal: unable to access 'https://github.com/eggheads/eggdrop.git/': Problem with the SSL CA cert (path? access rights?)
12:31 SunOS why thath
12:31 roelmonn_ joined #git
12:31 SunOS hell
12:31 PilkinsonSport joined #git
12:31 om_henners joined #git
12:32 grawity chill the fuck down, export GIT_CURL_VERBOSE=1, and try again
12:32 grawity look for "CAfile:"
12:32 grawity check if it's correct
12:32 fmcgeough joined #git
12:33 a_thakur joined #git
12:36 SunOS grawity :) 10x
12:41 t0by joined #git
12:41 mmattice joined #git
12:43 sdothum joined #git
12:45 jaguarmagenta joined #git
12:45 jeffreylevesque joined #git
12:49 mcon moritz: Here it comes ;) https://gist.github.com/mcondarell​i/c16f3400003123f011902821bbb480c3
12:50 stfn joined #git
12:50 mmattice joined #git
12:51 Achylles joined #git
12:51 fission6 joined #git
12:51 moritz mcon: if you can't push, you should develop in a branch, and abandon that branch when the integrator has pushed the changes to master
12:55 chachasmooth joined #git
12:56 j416 grawity: thanks! diff-so-fancy is even fancier than diff-highlight. Although, not in contrib :/ works nicely though.
12:59 geoid_ joined #git
12:59 InfoTest joined #git
13:00 led_belly joined #git
13:00 akurniawan joined #git
13:01 geoid_ joined #git
13:02 cdg joined #git
13:02 tristanp joined #git
13:03 led_belly joined #git
13:03 User458764 joined #git
13:05 Jameser joined #git
13:05 Rodya_ joined #git
13:06 EricPoe joined #git
13:06 jozwior joined #git
13:07 solf1re joined #git
13:08 led_belly joined #git
13:08 solf1re joined #git
13:14 zotherst1 joined #git
13:14 Jameser joined #git
13:14 _ikke_ THey stopped adding project to contrib nowadays
13:15 _ikke_ projects
13:15 MrDave20161 left #git
13:16 mcon moritz: ok. I [mis]understood "git am" would recreate the commit "as if" pushed; if that's not the case then everything's clear. Thanks.
13:16 robotroll joined #git
13:16 _ikke_ mcon: It's not the same, comitter and comitter date are different
13:16 _ikke_ and the parent can also be different
13:18 rindolf joined #git
13:18 rindolf Hi all! How can I combine «git pull --ff-only upstream master ; git fetch upstream ; git fetch upstream --tags» into one command?
13:18 User458764 joined #git
13:20 ejb joined #git
13:21 a_thakur_ joined #git
13:21 cjohnson rindolf: you asked this question yesterday, and you were answered yesterday
13:21 ExoUNX joined #git
13:22 rindolf cjohnson: who answered?
13:22 _ikke_ preaction
13:22 mischat joined #git
13:23 rindolf _ikke_: he didn't tell me how to do that.
13:23 t4nkd joined #git
13:26 rendar joined #git
13:26 mmattice joined #git
13:26 Oatmeal joined #git
13:27 wcux joined #git
13:28 mrpackethead joined #git
13:28 butters_ joined #git
13:29 Starky joined #git
13:30 mcon _ikke_: I see. In this situation is there a way to recover a clean master without resorting to a new "git clone"? I mean: can I discard my commits (git rebase ?) and just pull out what's on current master? if so: how?
13:30 todd_dsm joined #git
13:31 Noldorin joined #git
13:31 achadwick joined #git
13:31 renlo joined #git
13:35 re1 joined #git
13:35 Jameser_ joined #git
13:36 pbrewczynski joined #git
13:36 _ikke_ mcon: git fetch && git reset --hard origin/master
13:36 AaronMT joined #git
13:36 mmattice joined #git
13:37 PCatinean joined #git
13:37 sbc joined #git
13:38 moritz mcon: any reason you're not using pull or merge requests, and a web GUI that supports them?
13:40 Es0teric joined #git
13:42 robotrolll joined #git
13:43 DieguezZ joined #git
13:44 rudi_s rindolf: man git-config | less -p alias
13:44 EricPoe joined #git
13:44 gitinfo rindolf: the git-config manpage is available at http://jk.gs/git-config.html
13:45 rindolf rudi_s: thanks
13:45 rudi_s np
13:46 acetakwas joined #git
13:47 romerocesar joined #git
13:47 nicksloan joined #git
13:48 mcon moritz: simply because we have a private git repo, backed by Redmine and I don't know (read: "didn't take the time to learn how to") set up a github clone in this environment. Everything started "simple" (i.e.: developers were directly pushing), but that lead to some "incomprehension" and thus "someone" decided we need an integrator. Any suggestion *most* welcome.
13:49 red82 joined #git
13:50 freimatz joined #git
13:50 moritz mcon: I have no experience with redmine. I know that gitlab is free to install on-premise, and supports merge requests
13:51 moritz http://www.redmine.org/plugins​/redmine_gitlab_merge_request
13:51 Gsham joined #git
13:52 rnsanchez_ joined #git
13:53 f3desha joined #git
13:53 SunOS left #git
13:54 berndl joined #git
13:54 boombatower joined #git
13:54 discopatrick how would i turn off git lfs for a repo
13:55 rindolf rudi_s: this gives me an error - how can I fix it? «    s = !( remote=\"$1\"; shift; git pull --ff-only "$remote" master && git fetch "$remote" && git fetch "$remote" --tags )»
13:56 mcon moritz: thanks. I'll have a look. Gitlab is the "recommended" net suit, do I understand correctly?
13:56 lvns joined #git
13:56 brk_ joined #git
13:56 rindolf rudi_s: it's under .gitconfig's alias - i also tried without escaping the double quotes
13:56 moritz mcon: well, I've used it, and would recommended it
13:56 _ikke_ rindolf: You can remove the first fetch. Like preaction said, the pull includes a fetch
13:57 _ikke_ rindolf: what error do you get?
13:57 rindolf _ikke_: ( remote="$1": -c: line 1: syntax error: unexpected end of file
14:00 rindolf discopatrick: what is "lfs" in this context?
14:00 _ikke_ !lfs
14:00 _ikke_ http://git.io/git-lfs
14:02 lvns joined #git
14:02 ahmed_elgabri joined #git
14:02 CubiK joined #git
14:03 e14 joined #git
14:05 matumbo left #git
14:05 admin| joined #git
14:06 tristanp joined #git
14:06 shubhnik joined #git
14:06 PCatinean joined #git
14:08 nickthetait joined #git
14:08 discopatrick rindolf: git-lfs (large file storage). we had to stop using it because my teammate was reporting errors after upgrading to mac osx sierra. we removed the lfs entries (.jpg, .png) from .gitattributes, but he's saying he has 0kb images in his local repo. i've asked him to delete the repo and reclone now.
14:09 rindolf discopatrick: ah
14:09 discopatrick just wondering if remove the entries from .gitattributes is  sufficient, or if there's other things we need to do to "turn off" git lfs
14:09 matumbo joined #git
14:09 samae joined #git
14:10 samae I have a git repo in a git repo, how do I turn the inner one into a submodule without removing it and then `git submodule add` it?
14:11 lindenle joined #git
14:11 rudi_s rindolf: I think you need quotes for the whole command.
14:12 rudi_s But just run strace -e execve -f git ... to see what's actually executed.
14:12 ResidentBiscuit joined #git
14:12 s103r joined #git
14:12 s103r left #git
14:13 tvw joined #git
14:13 Dougie187 joined #git
14:15 rindolf rudi_s: ok, thanks!
14:15 jwest joined #git
14:15 akurniawan joined #git
14:15 mcon left #git
14:15 VagabondAzulien joined #git
14:17 Mogget joined #git
14:17 tjone270 joined #git
14:18 samae left #git
14:20 shinnya joined #git
14:21 mischat joined #git
14:22 Rickmasta joined #git
14:23 ShekharReddy joined #git
14:24 jstimm joined #git
14:24 tom[] left #git
14:24 rasto joined #git
14:24 rindolf rudi_s: seems like I can also create a "git-s" command which is a moer robust solution. thanks!
14:25 rudi_s rindolf: Well, yes. Call it git-s and you can even run it with git s.
14:25 roelmonnens joined #git
14:27 fission6 joined #git
14:27 rindolf rudi_s: yes.
14:28 matumbo joined #git
14:28 matumbo left #git
14:28 jozwior joined #git
14:29 zumba_ad_ joined #git
14:30 refried_ joined #git
14:32 eivarv joined #git
14:32 hahuang61 joined #git
14:32 flavius joined #git
14:33 matumbo joined #git
14:36 BSaboia joined #git
14:36 p4trix joined #git
14:36 mischat joined #git
14:38 mischat_ joined #git
14:39 lukeer joined #git
14:40 Ryanar joined #git
14:41 BSaboia joined #git
14:43 nilez joined #git
14:44 lukeer I am in my master branch. "$git merge Branchname" got me a conflict. I wanted to set up vimdiff3 as merge tool but $MERGED is empty. So are $LOCAL and $BASE and $REMOTE. Why are those variables empty? I use git 1.9.5.msysgit.1.
14:47 akurniawan joined #git
14:49 sangy joined #git
14:50 Random832 lukeer: can you post your whole setup on a paste site
14:52 Random832 also what is vimdiff3 and how does it differ from git's built-in vimdiff mergetool?
14:53 lukeer Random832: It has a third source window for the file before either branch changed it.
14:53 lukeer Random832: What do you mean with "whole setup"?
14:53 lukeer git config?
14:54 Random832 the configuration where you set up your vimdiff3 tool
14:55 lukeer Random832: Ok. Will do. And no built-in vimdiff because that doesn't work either. I stumbled over vimdiff3 here https://www.toofishes.net/blog/t​hree-way-merging-git-using-vim/
14:55 Learath2 joined #git
14:56 lvns joined #git
14:56 Achylles joined #git
14:57 Random832 what exactly "doesn't work"? and git's default vimdiff mergetool has had four windows for a while, though i don't know how old 1.9.5 is
15:01 SourTrout joined #git
15:01 phaleth joined #git
15:02 cdown joined #git
15:02 VagabondAzulien joined #git
15:03 rbern joined #git
15:04 Pazo joined #git
15:06 lukeer Random832: That configuration is only two lines:
15:06 lukeer mergetool.vimdiff3.cmd=vim -f -d -c "wincmd J" "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
15:06 lukeer merge.tool=vimdiff3
15:07 lungaro is there a way to have a global git push hook?
15:07 lungaro I want to see "git describe" after every push to convenience
15:07 mwleeds joined #git
15:08 matoro joined #git
15:08 romerocesar joined #git
15:09 lukeer Random832: Issuing "$git mergetool" then just tells me that "" is a directory. I suspect that there should be a file name between those quotation marks. But with above variables all being empty, it is not.
15:09 cdg joined #git
15:10 cdg joined #git
15:11 Random832 are you sure they are all empty? the manpage says "if available" for $BASE
15:14 netj joined #git
15:15 mischat joined #git
15:16 geoid joined #git
15:16 mrpackethead joined #git
15:16 clemf joined #git
15:16 lukeer Random832: I asked "$set" and got none of the variables even existing. '$echo "$LOCAL"' produces one newline.
15:17 lukeer Same for the other three.
15:17 snowkidind joined #git
15:17 Random832 they're only set inside the mergetool command, so checking set at your own command prompt won't tell you anything useful
15:17 Random832 try setting the mergetool command to "echo M=$MERGED L=$LOCAL B=$BASE R=$REMOTE"
15:18 ejb joined #git
15:18 mischat_ joined #git
15:19 mischat_ joined #git
15:20 brillenfux joined #git
15:22 madewokherd joined #git
15:24 lukeer Random832: Hah! There are indeed variables of said name and they contain paths.
15:25 Random832 wait so what was your problem?
15:25 Random832 were you trying to start "$ vim -f -d -c ..." directly from the command line?
15:27 BSaboia joined #git
15:27 danslo joined #git
15:28 geoid joined #git
15:28 danslo joined #git
15:28 anuxivm joined #git
15:28 ngperfex joined #git
15:28 plos joined #git
15:28 converge joined #git
15:28 converge joined #git
15:28 lukeer Random832: That I did after '$git difftool' did complain about "" being a directory.
15:28 lukeer Random832: Let's just forget about that whole thing and get the original mergetool to work.
15:29 dunpeal joined #git
15:30 zacts joined #git
15:30 dunpeal Hi. I always forget this one: I have a branch branching off master, and I want to see all the changes it introduced relative to master. How do I do it?
15:30 grawity diff or log master..
15:30 Random832 wait, you said difftool or mergetool
15:32 Random832 anyway, all four of them had values when you tried it with echo?
15:32 lukeer Random832: I removed the merge-tool-configuration. Then only added merge.tool=vimdiff. And voilà: success. Thank you so much.
15:32 lukeer Random832: Yes, they all had.
15:33 hahuang61 joined #git
15:33 jwcapps joined #git
15:34 phanimahesh joined #git
15:34 Rodya_ joined #git
15:34 lukeer Random832: That's the perfect moment to call it a day. Have a nice weekend.
15:34 zeroed joined #git
15:35 jwcapps Is there a way to temporarily ignore the index and make an empty commit with just a message?
15:36 grawity git commit <files>
15:36 grawity empty? git commit-tree HEAD -m hello
15:36 grawity er, wait
15:36 Darren_ joined #git
15:36 grawity commit-tree -m message -p HEAD HEAD
15:37 jwcapps grawity: thanks, I was about to start mucking with stashes but that just brings on new problems
15:38 pks joined #git
15:38 ^7heo maybe someone should remove the (closed) survey from the topic?
15:38 ^7heo _ikke_: ? ^
15:40 joki- joined #git
15:40 jwcapps grawity: fatal: Cannot give more than one trees; with just one HEAD I get fatal: <sha-1 @ HEAD> is not a valid 'tree' object
15:40 grawity hrm, it's picky
15:41 grawity give it HEAD^{tree}
15:41 grawity the "-p HEAD" is required to make it 'on top' of the current commit, rather than standalone
15:41 grawity and I forgot the `git update-ref` afterwards
15:41 donatj joined #git
15:41 yehowyada joined #git
15:42 tvw joined #git
15:42 jccn joined #git
15:42 donatj So if I have two branches, lets say A and B and I have changes in A and B, if I want the changes in B that aren't in A, but not the reverse how do I do that? git diff B when I'm on A gets me all the differences
15:43 grawity git diff A..B / git diff B..A
15:44 synthroid joined #git
15:44 vuoto joined #git
15:44 donatj That's still getting me everything that changed in A, either order
15:44 mischat joined #git
15:45 synthroi_ joined #git
15:45 jwcapps grawity: so HEAD^{tree} works without -p, and returns a commit ID to command line, but with -p it says the very first object I created is not a valid commit, even if I run it again
15:46 fission6 joined #git
15:47 grawity you must be holding it wrong or something
15:47 grawity http://sprunge.us/ISML
15:47 synthroid joined #git
15:52 akushner joined #git
15:53 jwcapps grawity: git merge $(git commit-tree -m "message" -p HEAD HEAD^{tree}) seems to work, any way to incorporate the merge into commit-tree?
15:53 grawity no, it's a plumbing command that doe exactly one thing
15:54 zeroed joined #git
15:54 zeroed joined #git
15:54 jwcapps grawity: At least it works, thanks for the help
15:56 kadoban joined #git
15:56 shgysk8zer0 joined #git
15:56 nikivi joined #git
15:58 mischat_ joined #git
15:58 _cyril_ joined #git
15:59 rmbeer joined #git
15:59 ngperfex joined #git
16:01 Siegfried joined #git
16:03 robattila256 joined #git
16:03 refried_ joined #git
16:04 rmbeer left #git
16:04 cdg joined #git
16:09 boondox joined #git
16:09 ojdo joined #git
16:09 tpreston joined #git
16:09 boondox left #git
16:10 boondox joined #git
16:10 aeontech joined #git
16:11 Electrometro joined #git
16:12 mischat joined #git
16:12 re1_ joined #git
16:12 Sound joined #git
16:12 artisanIndia joined #git
16:12 shmuli joined #git
16:13 laumann joined #git
16:13 artisanIndia I have 10 files into a branch A 5 of them are in the correct branch and 5 of them should be into branch B but unfortunately I have made the changes in branch A and committed them
16:13 tyreld joined #git
16:13 artisanIndia how would I split ?
16:14 mmattice joined #git
16:14 cdg joined #git
16:14 ^7heo artisanIndia: git checkout -b B
16:14 artisanIndia that way I will have all the files which should be in branch A into B too
16:15 ^7heo yeah then
16:15 ^7heo git rm $filesfromA
16:15 ^7heo git commit --amend
16:15 ^7heo then
16:15 ^7heo git checkout A
16:15 dan2k3k4 joined #git
16:15 ^7heo git rm $filesfromB
16:15 ^7heo git commit --amend
16:15 ^7heo done
16:15 artisanIndia oooh
16:15 artisanIndia smart !
16:15 artisanIndia thanks
16:16 ^7heo you're welcome.
16:16 tjone270 joined #git
16:18 acetakwas joined #git
16:18 moei joined #git
16:19 TomyLobo joined #git
16:20 svm_invictvs joined #git
16:21 ash_workz joined #git
16:22 donatj joined #git
16:23 xall_ joined #git
16:23 User458764 joined #git
16:23 Rickmasta joined #git
16:23 re1 joined #git
16:24 User458764 joined #git
16:24 crayon joined #git
16:24 crayon joined #git
16:25 initial_g joined #git
16:26 qws-user-1229 joined #git
16:27 initial_g left #git
16:27 initial_g joined #git
16:28 eizua joined #git
16:28 initial_g left #git
16:29 eizua joined #git
16:30 lindenle joined #git
16:33 Darcidride__ joined #git
16:34 hahuang61 joined #git
16:35 jjasinski joined #git
16:35 eivarv joined #git
16:36 tcorneli joined #git
16:37 durham joined #git
16:39 zeroed joined #git
16:40 aeontech joined #git
16:41 barteks2x joined #git
16:41 Electrom_ joined #git
16:43 Bass10 joined #git
16:44 Bass10 joined #git
16:46 blackwind_123 joined #git
16:49 robotrolll joined #git
16:54 shubhnik joined #git
16:55 dviola joined #git
16:56 Electrometro joined #git
16:57 lvns joined #git
16:57 jstimm joined #git
17:00 mischat_ joined #git
17:01 austin987 joined #git
17:01 Gsham joined #git
17:02 Mobutils joined #git
17:02 donatj joined #git
17:02 mischat_ joined #git
17:03 Learath2 joined #git
17:03 geoid joined #git
17:04 Domhack_ joined #git
17:04 sea-gull joined #git
17:04 mrpackethead joined #git
17:04 Domhack joined #git
17:05 jcalonso joined #git
17:07 qws-user-1228 joined #git
17:07 a3Dman joined #git
17:08 PioneerAxon joined #git
17:08 emg joined #git
17:08 Siegfried joined #git
17:13 acetakwas joined #git
17:13 mattp_ joined #git
17:16 Es0teric joined #git
17:17 InfoTest joined #git
17:17 Ryanar joined #git
17:19 aeontech joined #git
17:19 kevwil joined #git
17:19 GavinMagnus left #git
17:22 aeontech joined #git
17:22 refried_ joined #git
17:24 qws-user-1228 joined #git
17:24 doener joined #git
17:24 oskarkv joined #git
17:25 mizu_no_oto joined #git
17:27 zeroed joined #git
17:27 zeroed joined #git
17:32 kamog joined #git
17:32 bluezone joined #git
17:32 Vinnie_win joined #git
17:33 MrWoohoo joined #git
17:33 shmuli joined #git
17:35 hariel joined #git
17:36 renlo joined #git
17:38 theseb joined #git
17:39 theseb after you "clone" a repo how "checkout a branch"?..(docs say to checkout the source branch)
17:39 whomp joined #git
17:39 donatj left #git
17:39 bremner oddly enough there are commands called "git clone" and "git checkout"
17:40 tvw joined #git
17:40 bremner it sounds like you might find a !tutorial helpful
17:40 gitinfo A list of interactive git tutorials: http://try.github.com
17:41 jcalonso joined #git
17:41 theseb bremner: got it..thanks!
17:43 bsanford joined #git
17:49 railssmith joined #git
17:49 mikecmpbll joined #git
17:49 meauses joined #git
17:50 GavinMagnus joined #git
17:51 elementalest joined #git
17:52 Sasazuka joined #git
17:53 GavinMagnus joined #git
17:53 joaocastanho joined #git
17:54 joaocastanho left #git
17:54 barteks2x joined #git
17:54 ash_workz joined #git
17:55 strugee joined #git
17:57 Peste_Bubonica joined #git
17:57 Bass10 joined #git
17:57 Peste_Bubonica Hi folks. Can I build a patch from a specific file between two branches?
17:57 anjen joined #git
17:58 underpantz joined #git
17:59 GavinMagnus left #git
17:59 bremner Peste_Bubonica: yup, see the SYNOPSIS  in man git-diff
17:59 gitinfo Peste_Bubonica: the git-diff manpage is available at http://jk.gs/git-diff.html
18:00 Peste_Bubonica bremner, Thanks!!
18:01 mischat joined #git
18:01 dan2k3k4 joined #git
18:02 synthroid joined #git
18:02 d5sx43 joined #git
18:04 aeontech joined #git
18:10 armin joined #git
18:11 Groscheri joined #git
18:12 treehug88 joined #git
18:13 Darren_ joined #git
18:17 WakiMiko_ joined #git
18:18 ochorocho__ joined #git
18:18 uebera|| joined #git
18:18 uebera|| joined #git
18:18 converge joined #git
18:18 converge joined #git
18:19 synthroi_ joined #git
18:20 Ryanar joined #git
18:21 sicelo left #git
18:27 nsh joined #git
18:28 Mixologic_ joined #git
18:28 kevwil joined #git
18:28 WakiMiko_ joined #git
18:28 nowhereman joined #git
18:29 ExoUNX joined #git
18:29 barteks2x joined #git
18:30 masuberu joined #git
18:31 Limes joined #git
18:33 rewt joined #git
18:35 geoid___ joined #git
18:35 d5sx43 joined #git
18:35 Impaloo21 joined #git
18:36 shmuli_ joined #git
18:37 sbeller joined #git
18:37 e14 joined #git
18:38 mizu_no_oto joined #git
18:38 linuxmodder joined #git
18:38 Domhack joined #git
18:38 shmuli joined #git
18:39 phil22 joined #git
18:39 Darcidride joined #git
18:40 Domhack joined #git
18:40 ahmed_elgabri joined #git
18:41 resurtm2 joined #git
18:45 manuels joined #git
18:46 pijiu joined #git
18:47 Achylles joined #git
18:49 netj joined #git
18:50 cdg joined #git
18:51 d5sx43 joined #git
18:52 gesker joined #git
18:53 svm_invictvs joined #git
18:55 kpease joined #git
18:58 lordjancso joined #git
18:58 _ADN_ joined #git
18:59 m0viefreak joined #git
18:59 Noldorin joined #git
18:59 denimsoft joined #git
18:59 jokester joined #git
19:00 asdofindia joined #git
19:01 kevwil_ joined #git
19:05 Es0teric joined #git
19:05 anjen joined #git
19:10 nilg joined #git
19:11 dunpeal joined #git
19:12 nivag joined #git
19:18 hanthings joined #git
19:22 Lingo joined #git
19:23 dhanush joined #git
19:23 qws-user-1228 joined #git
19:24 Jackneill joined #git
19:26 mikecmpbll joined #git
19:27 phil22 joined #git
19:28 bernardio joined #git
19:30 barteks2x joined #git
19:31 laumann joined #git
19:31 shubhnik joined #git
19:33 meauses joined #git
19:34 jisp joined #git
19:35 satifant joined #git
19:35 phox joined #git
19:38 pseudosudo joined #git
19:39 phox hi.  trying to figure out how I control a rebase such that I can basically take a series of n commits, go back to say the first or second one, undo something, and then merge all of the subsequent work and have a bunch of subsequent commits without that screwup.  I'm assuming basically I create a branch from the offending commit, fix it, commit that, and then rebase the former tip to that and all of the subsequen
19:39 phox t commits merged to my new branch will not contain the mistake that I patched out?  is that about right?
19:40 sangy joined #git
19:40 phox and then is there a way to have my new log reflect a single commit without the error, so that for example bisect doesn't stub its toe on the one broken commit?
19:40 emg joined #git
19:42 pseudosudo left #git
19:44 ejb joined #git
19:45 gesker_ joined #git
19:45 marlinc joined #git
19:45 ojacobson phox: this is what the "squash" and "fixup" modes are for in git-rebase's interactive list.
19:46 clemf_ joined #git
19:46 phox ok cool I will look it up, thanks!
19:46 ojacobson Presuming you can do so without introducing conflicts, you can create a new commit that fixes the defect in the original, then, in git rebase -i, reorder it to occur immediately after the origin with either "squash" (if you want to combine and edit the messages) or "fixup" (if you want to discard the fixup commit's message)
19:46 JanC_ joined #git
19:46 ojacobson git-rebase will replay both commits' diffs to create a single new commit
19:47 ojacobson git-commit even has options to help with this (`git commit --squash <commit-id>` and `git commit --fixup <commit-id>`), which interact with `git rebase -i --autosquash` to set up the ordering for you
19:47 renlo joined #git
19:47 ojacobson This is so useful for me that I have autosquash turned on in my global gitconfig
19:47 phox ok, so with commit --squash I would probably dot hat to the fixup branch before the rebase?
19:47 ojacobson da
19:48 phox ok thanks I will see where I get with this :)
19:48 cdown joined #git
19:48 setuid_0 joined #git
19:49 alex1a joined #git
19:51 barteks2x joined #git
19:54 mmlb joined #git
19:56 cdown joined #git
19:56 nilg joined #git
19:57 nwkj86 joined #git
19:58 theskillwithin joined #git
20:01 leolrrj joined #git
20:01 Electrom_ joined #git
20:01 leolrrj guys I'
20:02 railssmi_ joined #git
20:02 leolrrj hello guys! How can I search all github repos that has at least 15 stars and any file which contains this io.dropwizard.Application ? I'm trying io.dropwizard.Application stars:>15 ... but no success
20:02 tango_ leolrrj: you probably want to ask on #github
20:02 leolrrj sorry :P
20:04 gho5t joined #git
20:05 Electrometro joined #git
20:05 phanimahesh joined #git
20:06 bannakaffalatta joined #git
20:07 grumble joined #git
20:08 e14 joined #git
20:08 zezba9000 joined #git
20:09 Oatmeal joined #git
20:10 grumble joined #git
20:10 zezba9000 Hey wondering if Git has any plans on nativly supporting some type of LFS?  For like game content etc. Git-LFS from GitHub is cool but if it was built in seems like it would go a lot faster.
20:11 ojacobson What does "built-in" mean?
20:11 ojacobson Git itself is so modular that git-lfs is no different from git-rebase or git-commit
20:11 ojacobson (Other than not being distributed with Git, but I can't imagine how you propose _that_ would affect performance. :) )
20:12 zezba9000 ojacobson: as in a official LFS tool?
20:12 jbitdrop joined #git
20:12 ojacobson Right - how do you see official-ness affecting performance?
20:12 ojacobson I'm missing a connecting step, but I'm standing way too close to Git to see what you're getting at, I think.
20:13 e14 joined #git
20:13 fees joined #git
20:14 barteks2x joined #git
20:14 zezba9000 ojacobson: Git-LFS uses stdio and doesn't seem like it would be as fast as having a Git.Core lib/dll (instead of hacked lib2git) that that any c/c++ app could link to and invoke native methods that directly do what you would expect at high performance levels like any normal API.
20:15 zezba9000 stdio is faster on Linux but not Win32
20:15 ojacobson Most of what git-lfs does has nothing to do with interacting with Git, though. The slow parts are largely "copy large files to/from work tree" (you might be able to make that go faster, but you'd want to look at APIs like sendfile(), not at tighter git integration) and "transfer large blobs to/from LFS server" (ditto)
20:17 phanimah1sh joined #git
20:17 ojacobson I dunno. That's my theory.
20:17 zezba9000 ojacobson: Keeping Git-LFS in sync with Git core seems out of place. They are not tested againsed one another when a new version of Git core comes out?
20:17 ojacobson You could ask the !list though
20:17 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
20:17 Limes joined #git
20:17 zezba9000 Also Git missing a standard c/c++ API seems like design flaw to me?
20:17 ojacobson Depends. Git's pretty unix-y; its API is "invoke plumbing commands via fork+exec"
20:18 ojacobson which is, and I have tested this, plenty fast enough. It does come with some parsing & serialization challenges, but most of the plumbing formats are (intentionally) simple enough for scanf.
20:18 ojacobson I've wanted a structured API, and libgit2 does an okay job at that
20:18 ojacobson comparing with mercurial (which has a very rich python API) is instructive, too - in your favour
20:19 ojacobson anyways, re LFS specifically, I suspect the !list would be against it and would prefer the ability to reference remotely-stored objects without downloading them
20:19 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
20:19 ojacobson (a feature Facebook wanted, but were unable to implement, too)
20:19 zezba9000 thats a horrible way to design and API. Now lib2git could just randomly parse sdtio wrong that changed instead... so you get runtime errors instead of compile errors
20:19 ojacobson The plumbing commands have strong compatibility promises for that very reason
20:20 zezba9000 still bad design practices... at the end of the day bugs come in as a runtime issue not a compile time issue that can get you way more info about whats going on
20:20 jast with libgit2 you don't need parsing, it's a standalone implementation
20:20 zezba9000 yes that parses sdtio
20:20 fission6 joined #git
20:20 zezba9000 so parses text
20:21 jast are we talking about the same library?
20:21 zezba9000 yes: https://libgit2.github.com/
20:21 fission6 how do i find all files in somefolder/migrations/*.py and diff them between two branches to see what was introduced in one branch
20:22 ojacobson fission6: git diff branch-a branch-b -- somefolder/migrations/
20:22 zezba9000 jast: correct me if I'm wrong but that parses sdtio (aka some text) thats coming back from git
20:22 jast huh. which part of it parses text data from pipes?
20:22 jast no, libgit2 is a *standalone* implementation. it doesn't use the git binary.
20:22 fission6 ojacobson: some folder changes, its a wildcard
20:22 zezba9000 So its a fork of git core of sorts?
20:23 jast it's a re-implementation, as I've already mentioned
20:23 jccn joined #git
20:23 fission6 i have like ten folders which have migration subfolders
20:23 jast if you like I can repeat it a few more times ;)
20:23 zezba9000 LOL because Git doesn't have a standard c/c++ API...
20:23 jast right
20:23 jast if it did you'd hate it
20:24 zezba9000 thats kinda lame.
20:24 jast git would have to be rewritten almost from scratch for it to work as a library
20:24 phil22 joined #git
20:24 sq-one joined #git
20:24 zezba9000 no actually I could use the main implimination instead of some 3rd party version
20:24 preaction the API is on the filesystem
20:24 fission6 any ideas ojacobson
20:25 phaleth joined #git
20:25 jast libgit2 is written by some of the core contributors of git, so it's "not *that* third-party"
20:25 zezba9000 jast: But why? Git is compiled from c/c++. How would seperating out the core peaces into a git.core.dll file be hard?
20:25 ojacobson zezba9000: the answer to your original question is "nobody is working on it." Have a good day!
20:25 jast zezba9000: its allocation strategies are pretty simplified. if you were to use it as a library, an allocation failure would kill your entire application.
20:25 zezba9000 then git.exe would just link to it and any other 3rd party app
20:25 jast that's just one example
20:26 Skryll joined #git
20:27 zezba9000 jast: Thats not a valid argument. Thats like say all my GLES commands should go though stdio so it wont crash my main app.
20:27 zezba9000 If there is a bug in software as big and open as git, it just gets fixed
20:27 jast GLES doesn't die while allocating memory for you
20:27 jast git dying wouldn't be a bug
20:27 jast it simply aborts if an object from the repo doesn't fit into memory
20:27 zezba9000 but it would be a bug thus should be considered one..?
20:27 jast which is perfectly fine for the main binary
20:28 zezba9000 if git crashes thats a bug
20:28 jast it would be a bug in the sense of "you have to re-implement everything to make this sensible"
20:28 jast which, you know, happened. the result is called libgit2.
20:28 jast it's not a crash, it's a hard exit
20:28 jast basically fatal("Out of memory")
20:28 jast that's the correct thing to do in a binary, it's the wrong thing to do in a library
20:28 fission6 ojacobson: this does not work git diff master 1357 -- project/*/migrations/*
20:29 ojacobson fission6: you might have to diff project/ honestly
20:29 ojacobson which is probably not the answer you wanted
20:29 einnjo joined #git
20:29 fission6 well can i find just the files that diff and grep on "migrations or something"
20:29 zezba9000 jast: Are there any projects that just parse git text output and expose it in some API. So I could use the main implementation?
20:30 fission6 i just want to see all files that changes that are under a migrations folder
20:30 jast zezba9000: I believe there are bindings for many programming languages that work just like that. not sure what specifically you need.
20:30 zezba9000 anything in c/c++ or C#
20:30 Seveas libgit2
20:31 Seveas don't parse git output, use libgit
20:31 phox ok, designing a solution to my mess... I presume with rebase -i I can just omit commits, right?
20:31 fission6 ojacobson: git diff --name-only master 1357 | grep "migrations"
20:31 fission6 works
20:31 zezba9000 yes but if that just reimplements git its not the implementation standard 90% people use.
20:31 jast the most popular c# binding uses libgit2
20:31 e14 joined #git
20:31 ojacobson phox: yes; the corresponding diffs will not be replayed.
20:32 Seveas zezba9000: it's used by *many* git tools like github
20:32 jast as does the most popular ruby binding, ... the list goes on
20:32 jast libgit2 is everywhere these days
20:32 Seveas yeah
20:32 Seveas it's like a virus :)
20:32 phox cool :)
20:33 zezba9000 So now we have two implementations? Does libgit2 at least copy everything git is doing... like fork gits core methods?
20:33 jast phox: basically *any* change you make to the rebase instructions affects the result :)
20:33 Spec-Chum joined #git
20:33 phox so what happened... maybe I am missing a less-somewhat-ugly way of doing this... I broke something, say 10 commits ago, then saw it like 3 commits ago and fixed it as part of a patch that did something ELSE, and now I want to move the fix back, so what I am going to do (it's like 5LOC) is re-break it, then patch it again, and then rebase -i and move the re-patch back ~10 commits as a fixup and drop the re-break
20:33 jast you can add completely unrelated commits, too
20:33 Seveas zezba9000: it reimplements the core features
20:34 phox on the floor
20:34 jast phox: maybe just put 'edit' on the first broken commit, patch it, commit --amend, rebase --continue
20:34 zezba9000 This just reminds me of Mono vs .NET, Oracle Java vs OpenJDK, GCC vs VC++, etc, etc
20:34 phox although wait no that gets me back to the same problem... the patch that originally fixed it (~3 commits ago) won't apply clean.  but then I can just resolve and it will go away...
20:34 Seveas phox: interactive rebase up to the parent of the broken commit and change pick to edit for the breaker and fixer and put the things right manually
20:35 jast zezba9000: your point being? all of the things you mentioned work
20:35 zezba9000 and they all have fragmination problems because of it
20:35 zezba9000 thus my issue with git being this way
20:35 jast zezba9000: welcome to real life
20:35 phox ok.  and I will just have to resolve where it hits deletions that make no sense 7 commits later, and then --continue.  I think.  ok thanks! :)
20:35 Seveas you say fragmentation, I say healthy competition
20:35 jast https://xkcd.com/927/
20:35 zezba9000 thats not a valid exuse... we learn, we should change
20:36 Seveas jast: I knew it would be that one before clicking it :)
20:36 zezba9000 but anyway I may just make a Git parser
20:36 jast who said competition is an excuse?
20:36 ojacobson zezba9000: arguments of the form "everyone should agree with you, or they're wrong" will get you nowhere.
20:36 ojacobson If you persist, I _will_ moderate you out of the channel.
20:36 byte512 joined #git
20:36 jast what exactly are you needing to parse, anyway?
20:36 zezba9000 ojacobson: No sorry but if thats how you deducted what I said you didn't understand. You're using a red herring.
20:36 jast Seveas: oh really :P
20:37 ojacobson zezba9000: this isn't a discussion. Stop doing it.
20:37 jast no, the troll on the bridge uses a red herring
20:37 Seveas https://xkcd.com/386/
20:37 vuoto joined #git
20:37 zezba9000 ojacobson: Just because I don't like pointless fragmination doesn't mean I'm wrong because I'm criticising.
20:37 zezba9000 ojacobson: But yes I'm done
20:37 jast Seveas: eh, boring. I prefer being wrong on purpose. :)
20:38 Es0teric joined #git
20:38 jast example: I love Python!
20:39 phox ok, before I commit --amend in there, do I need to 'git add' or whatever?  or commmit -a I guess?
20:39 jast phox: 'git add' and amend, or commit -a --amend (though I prefer not using -a in the middle of a rebase to avoid accidentally messing anything else up)
20:39 masak phox: yes
20:39 phox jast: ok.  one file in 'git status' changed, so -a should be safe, but that's a point thanks :)
20:40 mrpackethead joined #git
20:41 dan2k3k4 ok lets say I have a starter-project on git... and git clone this then have lots of changes (and use a different repo to push/pull to etc. since starter is just a simple skeleton app)
20:41 phox interesting, it magically replayed a diff that had subtractions I just patched earlier in time.  was -not- expecting that :o
20:41 dan2k3k4 but let's say the skeleton/starter-app got updated and I want to bring in those changes to my project - what's the best way to do this ?
20:42 dpower_ joined #git
20:43 Peste_Bubonica joined #git
20:43 zezba9000 jast: just FYI "competition" outside the context of inovation doesn't solve real world problems. Just saying. I do appologise for the tone Iv'e taken. Old design patterns are something that frustrait me. Sorry about that
20:44 zezba9000 **frustrate
20:44 chilversc joined #git
20:44 dan2k3k4 brb
20:45 dan2k3k4 joined #git
20:47 zezba9000 Are there any docs on updating the Git-GUI UI? Git-GUI uses a UI I'm not familar with and was wondering if .tcl files are just interpreted like html or something?
20:48 cdown joined #git
20:48 ojacobson zezba9000: thank you!
20:48 snsapiens joined #git
20:49 ojacobson zezba9000: https://tcl.tk/ is the language & framework
20:50 lacour joined #git
20:51 zezba9000 ojacobson: ok tnx. So if I was to better understand that, I could a right-click options to files or add a simple mode with two buttons (Commit and Sync)?
20:51 zezba9000 **I could add...
20:52 ojacobson Probably, yeah. I'm a bit surprised that doesn't already exist, tbh, but since it doesn't…
20:52 CalimeroTeknik joined #git
20:53 zezba9000 Iv'e started to make a git gui in C# that requires git-lfs for game content devs that are not technical. I would wrather the built in Git-GUI tool just have a simple mode for people like this.
20:53 relipse joined #git
20:53 WayToDoor joined #git
20:53 vuoto joined #git
20:53 zezba9000 I think git is missing out on a lot of use from people in this field because the tool is designed for tech minded people and not artists etc
20:54 aard_ joined #git
20:55 zezba9000 So i'm trying to solve this issue. I'll take a look at Tcl to see if thats a better path then C#.
20:55 relipse i have a branch called FIXTHIS i created a new branch on the server i'll call FOOBAR, how do i transfer my FIXTHIS branch onto the FOOBAR branch?
20:55 aidalgol joined #git
20:56 dan2k3k4 joined #git
20:56 aidalgol- joined #git
20:57 invisbl joined #git
20:57 phox yeah +1 there is no reason you can't control git with buttons.  you're doing one step at a time, regardless, not writing code vs clicking...
20:58 phox Python has essentially replaced Tcl.  Not that I am an entirely huge fan of either, but...
20:59 meauses joined #git
20:59 jaafar joined #git
20:59 refried_ joined #git
21:00 phanimahesh joined #git
21:00 e14 joined #git
21:00 zezba9000 phox: Is Tcl that old?
21:00 phox Tcl is kind of awful.  And yes it's older than dirt.
21:01 phox the syntax hurts my eyes.
21:01 phox it's robust and powerful, I can't argue with that, I just avoid it because >_<
21:01 zezba9000 relipse: git pull; git checkout FOOBAR; git merge FIXTHIS;
21:01 snthsnth joined #git
21:03 pfloyd left #git
21:03 zezba9000 phox: How is Git-GUI handling git commands without a standard c API? Just stdio? If this is the case maybe making a new tool with a newer UI might be good.
21:03 phox no idea
21:04 barteks2x joined #git
21:04 zezba9000 I use Deluge which uses the Python UI I think. That looks way better.
21:05 zezba9000 Or there is CEF
21:05 zezba9000 So you could make an HTML5 UI for git
21:10 barteks2x joined #git
21:11 cagedwisdom joined #git
21:13 Achylles joined #git
21:16 renlo joined #git
21:23 Peste_Bubonica joined #git
21:23 BlackMaria joined #git
21:24 renlo joined #git
21:25 e14 joined #git
21:27 github441 joined #git
21:28 Ryanar joined #git
21:30 cdown joined #git
21:30 menip joined #git
21:30 lvns joined #git
21:31 leeN joined #git
21:31 drodger joined #git
21:33 m___ joined #git
21:35 strugee joined #git
21:35 kamog` joined #git
21:37 jstimm joined #git
21:41 kyan joined #git
21:41 CalimeroTeknik joined #git
21:42 ArchNoob joined #git
21:44 jstimm joined #git
21:45 Mikerhinos joined #git
21:46 lvns joined #git
21:47 e14 joined #git
21:50 Siegfried joined #git
21:50 cdown_ joined #git
21:51 renlo joined #git
21:52 cosmos joined #git
21:53 bannakaffalatta joined #git
21:53 apotry joined #git
21:54 ejb joined #git
21:55 hahuang61 joined #git
21:58 kenden joined #git
21:58 cosmos joined #git
21:58 cdown joined #git
21:59 raijin joined #git
21:59 svm_invictvs joined #git
22:02 mablae joined #git
22:04 jaafar joined #git
22:05 atrus joined #git
22:05 mmlb joined #git
22:06 mablae joined #git
22:11 sammyo joined #git
22:13 jccn joined #git
22:13 e14 joined #git
22:15 JanC_ joined #git
22:16 cosmos_ joined #git
22:17 zezba9000 If you don't use Git-LFS for large files, from what I know this can make things go rly slow after a while. Will doing a git rebase solve the issue?
22:18 zezba9000 My real question is, do we rly need Git-LFS on a private server?
22:18 zezba9000 For large game assets
22:19 jaafar joined #git
22:20 clemf joined #git
22:20 zezba9000 aww I remember, git doesn't support files like over some gb amound but can't remember the number
22:21 clemf joined #git
22:21 Repox joined #git
22:23 sammyo git is a source control tool, it's power is recording deltas, how many multi gb source files? refactor :-)
22:24 aeontech joined #git
22:24 polyzen joined #git
22:24 zezba9000 sammyo: Do you know the largest binary file it can keep track of?
22:25 safe joined #git
22:26 zezba9000 ojacobson: Hey do you know what tcl file has the Commit / Push UI buttons in it for Git-GUI?
22:27 cdown joined #git
22:27 Rickmasta joined #git
22:29 sammyo I'm suggesting it's the wrong tool. Amazon S3 or other object store is ideal for big files. How often do you edit these files?
22:30 clemf joined #git
22:31 ojacobson zezba9000: sorry, I don't
22:32 ArchNoob joined #git
22:32 sammyo I don't think there's a hard limit to file size, but it could slow the particular git tree significantly
22:33 zezba9000 sammyo: You edit binary files with the editor that saved them. I don't understand your question it sounds rhetorical. We have our own GitLab server. Big files get tracked via Git-LFS.
22:37 phox left #git
22:37 inflames joined #git
22:39 cosmos_ left #git
22:39 refried_ joined #git
22:40 Es0teric joined #git
22:40 ejb joined #git
22:41 dsantiago joined #git
22:41 zezba9000 does anyone know where the Commit button UI is in Git-GUI tcl files?
22:41 jmpp joined #git
22:41 jmpp joined #git
22:41 Lingo joined #git
22:42 ejb joined #git
22:42 netj joined #git
22:44 ejb joined #git
22:46 jstimm joined #git
22:50 troulouliou_div2 joined #git
22:51 rahtgaz joined #git
22:52 bannakaffalatta joined #git
23:00 Sasazuka joined #git
23:00 glebihan joined #git
23:00 rmbeer joined #git
23:00 rmbeer hello
23:01 rmbeer with git is possible work with multiple project? i have a directory with each project in each directory, but unknown if this is best for work or i need create a git for each project.
23:03 zezba9000 rmbeer: If the projects depend on one another you can put them all in one repo. An example would be a Visual Studios solution might have multiple projects you would keep in one git repo
23:03 led_belly joined #git
23:04 zezba9000 Anyone here work on GitGUI? I can't find anything that invokes: "proc commit_tree".
23:05 rmbeer zezba9000, in this case all project depend by 1 project in the same dir
23:05 rmbeer the .gitignore work only in main directory?
23:05 zezba9000 Well if the other projects arn't related but just depend on the 1, I would give them each there own repo
23:06 zezba9000 but if they are all part of the same solution (aka for the same master project with lots of parts) put them all in one if that makes sense
23:06 ||JD|| joined #git
23:06 zezba9000 rmbeer: .gitignore goes in your root repo path
23:07 zezba9000 the same path as the .git folder
23:07 zezba9000 just look on GitHub for examples
23:07 rmbeer is hard for decide...
23:07 theskillwithin joined #git
23:08 Lingo joined #git
23:08 zezba9000 Its not rly. If the projects exist to create a single product put them in one repo. If they are seperate products seperate them
23:08 Sasazuka__ joined #git
23:08 hoshi joined #git
23:09 rmbeer each project is like a plugin, not is really a unique product or separate products...
23:09 hoshi hi
23:09 gitinfo hoshi: 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.
23:09 hoshi if i do --amend, why the first commit still exist?
23:09 e14 joined #git
23:11 zezba9000 rmbeer: Without more context it sounds like you want a single repo
23:11 hoshi or, i got one commit, i want to amend the changes to the first, it commits changes to another commit
23:11 hoshi (just learning git so dont be angry for me :P)
23:12 ||JD|| I've been working with git for a while, but always with a local repo, now I would like to start updating my production web server, will a simple push do this task or it is something more complex?
23:12 ejb joined #git
23:13 dsantiago joined #git
23:14 rmbeer zezba9000, if i create a single repo, with git can't work in each directory like a separate git, it's always use each project like a subdirectory, sure?
23:15 lindenle joined #git
23:15 zezba9000 rmbeer: All sub-folders get tracked. I'm not sure what you're asking
23:16 rmbeer i asked by each directory like a main directory. or something...
23:17 zezba9000 What do you mean by "main directory"?
23:17 zezba9000 Whats a "main directory"?
23:17 rmbeer also unknown if is possible that each branch have a each directory like a main directory
23:18 zezba9000 O no, there is a branch per repo not per folder
23:19 zezba9000 You are confusing branches and folders
23:19 qws-user-1228 joined #git
23:19 zezba9000 You have branches per git repo... folders are irrelevent.
23:20 meloc joined #git
23:20 hoshi ok i fixed my problem, thanks
23:20 rmbeer no, no confused, only asked by known about of git and limitations
23:21 rmbeer if not is possible then i go find by other solution...
23:21 rmbeer ok, thank.
23:21 lindenle joined #git
23:21 zezba9000 I can't understand your English very well. I would ask someone in your native language
23:21 sea-gull joined #git
23:23 rmbeer also thinking create git for each project, and git for the parent directory of all project with exclude each project for take the rest like a project and source files in this directory
23:24 meloc joined #git
23:24 arand__ joined #git
23:25 nawwmz joined #git
23:26 rmbeer is this a good enviroment? http://pasteall.org/100664
23:29 rmbeer sorry, is this http://pasteall.org/100671
23:29 j416 don't nest repos like that
23:30 j416 if you must nest repos, use submodules
23:30 j416 don't use submodules.
23:30 rmbeer submodules?
23:31 j416 git is not a dependency manager.
23:31 j416 so don't try to use it as one.
23:31 rmbeer ah, ok ok. thank.
23:32 j416 submodules _may_ be the right choice in your case, but they are a pain to use, so I would think carefully about it before deciding to use them.
23:32 j416 as zezba9000 said above, putting it all in one repo is not a terribly bad idea.
23:33 re1 joined #git
23:33 einnjo joined #git
23:33 j416 ||JD||: !deploy
23:33 gitinfo ||JD||: 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
23:35 j416 ||JD||: it also depends on what your production server is. Is it, say, Heroku that already relies on git as a means to deploy things? Is it your own server? And so, on.
23:35 clemf joined #git
23:35 rmbeer good, thank. i decide by 1 repo. i now have a prepare .gitignore for exclude all datas and search in each project by clean code. :)
23:35 j416 rmbeer: nice.
23:36 fission6 joined #git
23:36 ||JD|| j416: thanks, I'm reading about git-ftp, do you think it is the right tool?
23:37 j416 never heard about it.
23:37 ||JD|| ok
23:37 madewokherd joined #git
23:37 ||JD|| it is on the debian repo
23:37 j416 I don't use debian.
23:38 lindenle joined #git
23:38 anuxivm joined #git
23:38 Lingo joined #git
23:39 j416 ||JD||: I'd use the simplest means possible for the given environment. Sometimes it's a server hook, sometimes it's rsync, sometimes there is something already in place.
23:39 j416 simplest, and most convenient.
23:42 lindenle_ joined #git
23:45 Lingo joined #git
23:45 aeontech joined #git
23:56 pbrewczynski joined #git

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