Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-07

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

All times shown according to UTC.

Time Nick Message
00:00 quetz joined #git
00:02 asimismo Using 2.11.0 on a Mac, I have a file that keeps getting marked as deleted. If I discard the change it's marked as deleted again within a second. Suggestions on how to stop this cycle?
00:07 askb joined #git
00:07 Cerise joined #git
00:07 Cerise joined #git
00:08 llamapixel is it .ds_store by chance asimismo ?
00:08 ResidentBiscuit joined #git
00:09 arescorpio joined #git
00:10 SuperSeriousCat joined #git
00:11 madewokherd joined #git
00:14 mischat joined #git
00:16 swalladge joined #git
00:18 chachasmooth joined #git
00:18 dendazen joined #git
00:19 mischat joined #git
00:19 cheater joined #git
00:20 _Vi joined #git
00:22 zivester joined #git
00:23 asimismo llamapixel: No. Just a random text file.
00:24 llamapixel what is the filename and what environment are you working in might give more insights
00:24 asimismo That is, it's one that's part of my project, but I don't intend to delete it and it keeps getting marked as deleted.
00:24 qqx asimismo: Does the file name have accented characters?
00:25 adymitruk joined #git
00:25 adymitruk hello
00:26 adymitruk what's the latest version of git?
00:26 qqx It might help to run `git config core.precomposeunicode false`  or depending on your setup you might need to change `false` to `true`.
00:27 hahuang61 joined #git
00:28 asimismo No the filename just has underscores. I possible candidate to blame, we recently added a .gitattributes file to the project, with "* text=auto" and "*.sql text eol=lf" (and it IS a .sql file). I'm not sure how this would lead to the file being marked as deleted, but it's the only thing I could think of that might have changed.
00:28 Olipro_ joined #git
00:32 ResidentBiscuit joined #git
00:32 beatdown joined #git
00:32 wcpan joined #git
00:34 jimi_ joined #git
00:35 leeN joined #git
00:37 f4_ joined #git
00:38 mischat joined #git
00:38 mischat joined #git
00:39 mischat joined #git
00:40 mischat joined #git
00:41 mischat joined #git
00:42 mischat joined #git
00:42 BSaboia joined #git
00:43 hahuang65 joined #git
00:43 thebope joined #git
00:44 tango_ joined #git
00:47 Gsham joined #git
00:48 mellernoia joined #git
00:51 setuid joined #git
00:51 webdev007 joined #git
00:51 shpew12 joined #git
00:54 kireevco joined #git
00:55 Brant joined #git
00:55 tmsmith joined #git
00:58 swalladge joined #git
01:01 nickabbey joined #git
01:02 anuxivm left #git
01:05 gafotas_ joined #git
01:09 pks joined #git
01:15 r4nd0m-0ne joined #git
01:15 _Vi joined #git
01:17 jaguarmagenta joined #git
01:18 tuor joined #git
01:18 likewhoa joined #git
01:19 traxo-xx joined #git
01:22 harwood joined #git
01:23 nidr0x joined #git
01:24 bauruine joined #git
01:25 tnecniv joined #git
01:25 roygbiv joined #git
01:26 NeonSynth joined #git
01:27 NeonSynth joined #git
01:27 Gsham joined #git
01:31 autofly joined #git
01:33 pR0Ps_ joined #git
01:38 rchavik joined #git
01:39 cdown_ joined #git
01:42 meLon joined #git
01:42 mischat joined #git
01:45 diogenese joined #git
01:45 thebope joined #git
01:46 aidalgol joined #git
01:50 a_thakur joined #git
01:52 bocaneri joined #git
01:53 aidalgol joined #git
01:55 oaaao joined #git
01:55 floatingman joined #git
01:55 harwood joined #git
01:57 cdown_ joined #git
01:58 durham_ joined #git
02:01 rbern joined #git
02:01 rubyonra_ joined #git
02:02 t-mart_ joined #git
02:06 pks joined #git
02:07 pR0Ps_ joined #git
02:12 harwood joined #git
02:13 harwood joined #git
02:13 aidalgol joined #git
02:18 Nilesh_ joined #git
02:19 finalbeta joined #git
02:23 scarabx joined #git
02:27 jaguarmagenta joined #git
02:29 Vampire0_ joined #git
02:29 rafasc joined #git
02:30 aidalgol joined #git
02:31 boombatower joined #git
02:32 t-mart joined #git
02:33 pR0Ps joined #git
02:38 mizu_no_oto joined #git
02:40 Gsham joined #git
02:43 mischat joined #git
02:46 thebope joined #git
02:51 cdown_ joined #git
02:52 dsantiago joined #git
02:53 venmx joined #git
02:54 cdown joined #git
02:54 howdoi joined #git
03:02 rafasc when I run git checkout HEAD -p file. And edit a hunk, the patch always fails.
03:02 romerocesar joined #git
03:03 rafasc when I edit hunks on with git add -p, it usually works... Can't figure it out what I am doing wrong.
03:04 rnat_ joined #git
03:04 pks joined #git
03:07 wcpan joined #git
03:08 MeltedLux joined #git
03:08 devster31 joined #git
03:08 swift1 joined #git
03:08 steelsw0rd joined #git
03:09 venmx joined #git
03:09 Derperperd joined #git
03:10 Nicmavr joined #git
03:10 Jameser joined #git
03:11 Guest44696 joined #git
03:11 Derperperd left #git
03:12 Goplat joined #git
03:13 rnat joined #git
03:13 aavrug joined #git
03:13 BrAsS_mOnKeY joined #git
03:14 rom1504 joined #git
03:14 tgy joined #git
03:14 autofly joined #git
03:15 mizu_no_oto joined #git
03:16 Kestrel-029 joined #git
03:16 Andrew_K joined #git
03:17 Guest50746 joined #git
03:19 Derderderd joined #git
03:19 Derderderd joined #git
03:19 Andrew_K joined #git
03:21 inflames joined #git
03:22 harwood joined #git
03:22 peeps[lappy] joined #git
03:23 chachasmooth joined #git
03:24 thiago joined #git
03:25 venmx joined #git
03:25 jaguarmagenta joined #git
03:26 SwiftMatt joined #git
03:31 BrAsS_mOnKeY joined #git
03:35 Padawan joined #git
03:36 cqi joined #git
03:36 Padawan So, say i have submodule and i want to edit it, so i create a new branch at the submodule local repo and i am using it. How can i pass it to the remote?
03:37 Efffe joined #git
03:37 Efffe Perferred branching strategies for a 3-5 person team?
03:37 Padawan Cuz at another machine when i try submodule update --init --recursive i get: error: no such remote ref
03:37 rom1504 joined #git
03:37 aarobc joined #git
03:38 moei joined #git
03:38 fstd joined #git
03:41 Andrew_K joined #git
03:41 cagmz joined #git
03:41 venmx joined #git
03:42 sunri5e joined #git
03:42 timewalker joined #git
03:43 b4x joined #git
03:43 Olipro joined #git
03:43 quizzi joined #git
03:43 matthiaskrgr joined #git
03:44 ski7777 joined #git
03:44 mischat joined #git
03:46 thebope joined #git
03:47 marvi joined #git
03:48 b3kN joined #git
03:49 b3kN joined #git
03:50 linuxmodder joined #git
03:51 a_thakur joined #git
03:51 pks joined #git
03:53 sbulage joined #git
03:54 venmx joined #git
03:57 ResidentBiscuit joined #git
03:57 SwiftMatt joined #git
03:58 dreiss joined #git
04:00 ResidentBiscuit joined #git
04:00 hexagoxel joined #git
04:01 t-mart_ joined #git
04:04 infernix joined #git
04:05 t-mart joined #git
04:08 govg joined #git
04:08 _Vi joined #git
04:09 stevenspasbo joined #git
04:10 venmx joined #git
04:15 sword joined #git
04:15 Vortex34 joined #git
04:16 t-mart joined #git
04:16 Ryanar joined #git
04:18 WizJin joined #git
04:24 silverfox joined #git
04:26 svm_invictvs joined #git
04:27 venmx joined #git
04:28 fstd_ joined #git
04:29 GT4066 joined #git
04:31 SwiftMatt joined #git
04:31 Lyqyd joined #git
04:32 _leb joined #git
04:36 xall joined #git
04:38 NightMonkey joined #git
04:40 subhojit777 joined #git
04:40 mizu_no_oto joined #git
04:43 justanotheruser joined #git
04:45 mischat joined #git
04:47 thebope joined #git
04:48 arnsa joined #git
04:52 fatalhalt joined #git
04:53 lindenle joined #git
04:56 _Vi joined #git
05:01 mischat joined #git
05:01 govg joined #git
05:04 ayogi joined #git
05:08 subhojit777 joined #git
05:10 dreaddymck joined #git
05:11 Padawan_ joined #git
05:11 TikityTik joined #git
05:12 iliv joined #git
05:12 TikityTik I don't get merging, when I merge a feature branch that has a bunch of junk commits into the master branch, how do I hide those commits from the master branch? Also should I just rely on tags to tell if the commit is working or buggy?
05:13 kadoban TikityTik: Branches aren't alive. What does it mean that you want to hide the commits from the master branch?
05:14 irqq joined #git
05:14 martin_g_ joined #git
05:14 TikityTik Like I have commits that I made to my remote branch such as "saving work" and the program doesn't compile
05:15 TikityTik I wouldn't want to show that in the master branch.
05:15 evilmquin joined #git
05:15 evanc_ joined #git
05:15 cttttt_ joined #git
05:15 worstadmin_ joined #git
05:15 DuncanT_ joined #git
05:15 johtso_ joined #git
05:15 synchronous joined #git
05:15 kadoban TikityTik: You should typically clean up the branch however you want before you merge it in. Often with either rebase -i   or you can do  a --squash merge if you just want it to appear as one big commit and lose all of the individual ones.
05:16 CussBot_ joined #git
05:16 qqx_ joined #git
05:16 TikityTik kadoban: but it's bad to rebase when i already pushed to remote?
05:16 MeltedLux joined #git
05:16 sbeller joined #git
05:16 dsdeiz joined #git
05:16 _28_ria joined #git
05:17 jaafar joined #git
05:17 kadoban TikityTik: Typically in most projects, which branch a commit is on determines the expectations for its stability. Like one common workflow defines "master" as the commits that are essentially released. "develop" branch is less stable, but what will likely be merged into master eventually, etc.
05:17 r3c0d3x joined #git
05:17 BinGOs joined #git
05:17 doppo joined #git
05:17 souther joined #git
05:17 parliament joined #git
05:17 kadoban TikityTik: It depends for what purpose it was pushed to a remote. If it was just for you or if it's clear that it's a work-in-progress thing that will get rewritten eventually, it's expected. It's all about communication with your peers, if any of your peers can even see it.
05:18 vcoinminer joined #git
05:18 Outsider__ joined #git
05:18 realz joined #git
05:18 Nilesh_ joined #git
05:18 imanc joined #git
05:18 zero7 joined #git
05:18 Peng_ joined #git
05:18 rnat joined #git
05:18 altendky joined #git
05:18 davidstrauss joined #git
05:18 MLM_ joined #git
05:18 [diecast] joined #git
05:18 diogenese joined #git
05:18 tjbp joined #git
05:18 ams__ joined #git
05:19 yena joined #git
05:19 kadoban Usually feature branches are a lot more open to being rewritten, especially right before being merged than typically more shared branches like 'master' and etc. That's not to say you should just mess with their history all the time, but it can be okay to do so if you're clear in what you're doing.
05:19 codedmart joined #git
05:19 da5id joined #git
05:20 Iacobus__ joined #git
05:20 mehdi___ joined #git
05:20 cjohnson TikityTik: my rule of thumb: if anybody else for any reason may be using that branch, don't force push (rebase)
05:20 thiago joined #git
05:20 Samual joined #git
05:20 Samual joined #git
05:20 cjohnson If you must, let them know they will need to rectify manually
05:20 idmistir joined #git
05:20 idmistir joined #git
05:21 cschneid joined #git
05:21 rideh joined #git
05:21 alyptik joined #git
05:21 aca20031 joined #git
05:21 CIAguy- joined #git
05:22 krillr joined #git
05:22 lightstalker joined #git
05:23 troyt joined #git
05:23 lebster joined #git
05:23 gmh joined #git
05:23 gyre007 joined #git
05:23 asdofindia joined #git
05:24 Padawan_ left #git
05:24 yoyoyo_____ joined #git
05:25 unholycrab joined #git
05:25 MeltedLux joined #git
05:25 POQDavid joined #git
05:27 hagabaka joined #git
05:27 arooni joined #git
05:28 swift1 joined #git
05:28 samwise[m] joined #git
05:28 mtso[m] joined #git
05:28 _Vi joined #git
05:28 Sheogorath[m] joined #git
05:28 patrickr[m] joined #git
05:28 eltopo[m] joined #git
05:29 Carlos[m] joined #git
05:29 timlyo[m] joined #git
05:29 WakiMiko_ joined #git
05:29 Klumben joined #git
05:30 infernix joined #git
05:30 Caelum joined #git
05:30 BlessJah joined #git
05:30 batrick joined #git
05:31 fragMental joined #git
05:31 dhanush joined #git
05:32 ghostlight joined #git
05:37 fahadash joined #git
05:38 Limes_ joined #git
05:38 nedbat joined #git
05:43 regedit joined #git
05:47 brillenfux joined #git
05:48 thebope joined #git
05:48 Vangelis joined #git
05:55 Cabanossi joined #git
05:55 mseyne joined #git
05:57 aavrug joined #git
06:00 jaguarmagenta joined #git
06:00 dodobrain umm.. how do i checkout a path from a different branch that only exists in that branch
06:00 dodobrain and not in the current one?
06:01 dodobrain if i try `git checkout foobranch somedir` it says 'pathspec 'somedir' did not match any file(s) known to git
06:02 mischat joined #git
06:03 kireevco Hi all, I'm looking for some tool if exists to do the following: I have `repoA/file.txt` and I would like to ensure there are repoB/file.txt, repoC/file.txt. Anything that folks know that is written already?
06:04 chachasmooth joined #git
06:04 pR0Ps joined #git
06:04 kadoban dodobrain: That should just work. Are you sure you're not typoing? Can you try  git checkout foobranch -- somedir/   maybe?
06:05 xberg joined #git
06:05 xberg joined #git
06:05 dodobrain ./somedir does not exist in the current branch
06:05 dodobrain and theres no typo
06:05 dodobrain if i checkout a file that does exist in the current branch and in the other branch, it works fine
06:06 xberg_ joined #git
06:07 kisonecat joined #git
06:09 kadoban Hm. Well, I can't say I've ever used it for directories like that, maybe you can't for some reason.
06:12 rscata joined #git
06:13 overlord_tm joined #git
06:13 own3dz joined #git
06:13 overlord_tm joined #git
06:15 JanC_ joined #git
06:16 xberg joined #git
06:17 marvi joined #git
06:18 rumble joined #git
06:19 johnnyfive joined #git
06:22 diogenese joined #git
06:23 jephsf joined #git
06:23 dodobrain kadoban, yeah i also tried checking out a single file in the (non-existen in current branch, but available in the other branch) dir
06:24 dodobrain same complaint
06:24 chachasmooth joined #git
06:24 dodobrain i'll try creating the dir locally and then try again
06:25 f0rks joined #git
06:25 ome joined #git
06:27 Wayne_Shephard joined #git
06:30 phox joined #git
06:31 _main_ joined #git
06:31 sea-gull_ joined #git
06:31 W_Shephard joined #git
06:32 dsantiago joined #git
06:32 Walex joined #git
06:33 AustinMatherne joined #git
06:33 jab416171 joined #git
06:33 Dandelock joined #git
06:33 Wayne_Shephard joined #git
06:35 _Vi joined #git
06:35 Kamilion joined #git
06:36 GodGinrai joined #git
06:37 Learath2 joined #git
06:37 netj joined #git
06:41 _Vi joined #git
06:42 jnewt joined #git
06:43 venmx joined #git
06:45 jnewt i'm trying to clean up a branch before pushing, and am in the middle of a rebase, and keep getting a bunch of "deleted by them" where i deleted files during development.  when i get this, how do i just tell git "yeah, delete those, i didn't chose to edit this commit"
06:46 silverfo_ joined #git
06:46 ThomasLocke joined #git
06:46 ThomasLocke joined #git
06:46 sbulage joined #git
06:49 thebope joined #git
06:49 Wayne_Shephard joined #git
06:53 muelli joined #git
06:57 jephsf joined #git
06:57 qt-x joined #git
06:58 AfroThundr joined #git
06:59 AfroThundr joined #git
06:59 chachasmooth joined #git
07:00 OOPMan joined #git
07:02 Doginal joined #git
07:03 mischat joined #git
07:04 Oatmeal joined #git
07:05 Raging_Hog joined #git
07:05 Khisanth joined #git
07:09 kadoban joined #git
07:10 ignarps joined #git
07:11 jknetl joined #git
07:11 rossome joined #git
07:12 peoliye joined #git
07:13 peoliye how can i only do git diff for files whose contents have changed? I am currently getting files whose permissions have changed which i don't want.
07:14 diogenese joined #git
07:16 kadoban You should fix up whatever is causing those spurious permission changes instead
07:19 romerocesar joined #git
07:19 lvns joined #git
07:20 systemovich joined #git
07:22 pks joined #git
07:22 zeroed joined #git
07:22 zeroed joined #git
07:23 JeroenT joined #git
07:23 chele joined #git
07:27 dodobrain joined #git
07:27 sea-gull_ joined #git
07:28 overlord_tm joined #git
07:29 Guest42664 joined #git
07:29 Guest42664 joined #git
07:30 quetz joined #git
07:31 Puffball joined #git
07:33 chachasmooth joined #git
07:33 _Vi joined #git
07:34 spacelord_ joined #git
07:34 silverfox joined #git
07:35 peepsalot joined #git
07:36 babilen joined #git
07:42 Sceorem joined #git
07:43 chachasmooth joined #git
07:43 jnavila joined #git
07:46 mar77i uh, I have a situation here
07:47 TheWild joined #git
07:47 TheWild hello
07:48 dreiss joined #git
07:48 JeroenT_ joined #git
07:48 TheWild I have problem on Windows. Git still says warning: LF will be replaced by CRLF despite local, global and system autocrlf being set to false.
07:49 JeroenT joined #git
07:49 mar77i I noticed that I started using a git author that's not "mar77i", but now I don't know how many repos or commits are affected.
07:49 rominronin joined #git
07:50 thebope joined #git
07:50 mar77i I'll probably have to rebase a whole bunch of repositories. Is there a quick way to search for a git author in a repository's commit history?
07:51 kadoban mar77i: --author on 'git log' sounds appropriate as a place to look
07:51 kadoban Also --all probably
07:52 NeverDie_ joined #git
07:53 SwiftMatt joined #git
07:54 sea-gull_ joined #git
07:55 telephone joined #git
07:55 telephone joined #git
07:56 cqi joined #git
07:56 mar77i kadoban: thanks.
07:56 msm joined #git
08:00 Dragonbird joined #git
08:03 JeroenT_ joined #git
08:04 Walex joined #git
08:04 mmattice joined #git
08:04 TheWild Git devs: please drop the conversion to CRLF, or at least make git not mess up line endings by default on Windows. AFAIK Windows notepad is the only program that can't bear with just LFs.
08:05 Atm0spher1c joined #git
08:05 fold4 joined #git
08:07 elect__ joined #git
08:08 chele joined #git
08:08 moritz TheWild: it's like, configurable :-)
08:09 swalladge joined #git
08:09 elect joined #git
08:09 darkbit joined #git
08:12 waveclaw joined #git
08:12 ayogi joined #git
08:13 cyan__ joined #git
08:14 thierryp joined #git
08:16 Seveas TheWild: that's not the git devs but dscho (sole maintainer of git for windows) who made that the default.
08:16 Seveas though it does prompt you about this when installing.
08:17 cheater joined #git
08:18 Alienpruts joined #git
08:19 MrMojito joined #git
08:19 AustinMatherne joined #git
08:20 anry joined #git
08:20 zeroed joined #git
08:22 Derderderd joined #git
08:22 SJr joined #git
08:24 scarabx joined #git
08:26 derk0pf joined #git
08:27 TheWild Seveas: ok, thanks for the info
08:27 TheWild wonder how many petabytes in this world are wasted by CRLF
08:28 User458764 joined #git
08:28 navidr joined #git
08:29 Balliad joined #git
08:29 canton7 far fewer than are wasted by using utf-16 instead of utf-8 for western languages :P
08:30 Derderderd joined #git
08:30 Derderderd joined #git
08:31 asgh joined #git
08:31 Seveas and far fewer still than twitter :P
08:31 Ratler joined #git
08:32 mar77i joined #git
08:32 jephsf joined #git
08:32 TomyWork joined #git
08:32 mar77i so I found two repos that are "contaminated", but rebasing it to change the author does not appear to have the desired effect.
08:33 Derderderd joined #git
08:33 Derderderd joined #git
08:33 pijiu joined #git
08:33 mar77i as git log --all still lists the past commit
08:34 pijiu joined #git
08:34 xall joined #git
08:34 Derderderd joined #git
08:35 mar77i can I somehow remove past deviations from head?
08:36 maret joined #git
08:36 barteks2x joined #git
08:36 bluezone joined #git
08:36 mar77i oh wait a minute. I don't even know if that counts for the remote state too
08:37 Xpl01t3rEF joined #git
08:37 maret joined #git
08:38 Xpl01t3rEF joined #git
08:38 pitastrudl joined #git
08:39 a_thakur joined #git
08:39 rads joined #git
08:40 mar77i it appears git rebase; git push -f; eradicates non-ancestor commits on the remote. that looks like good news to me.
08:40 rads joined #git
08:42 cqi joined #git
08:44 ahmedelgabri joined #git
08:44 venmx joined #git
08:44 mar77i heh, rebasing even has the effect that I claim authorship of the whole history since where I rebased. yay!
08:44 djb-irc joined #git
08:45 Iota joined #git
08:45 Iota Guys, I literally just discovered the secret to git!
08:45 Iota man git
08:45 gitinfo the git manpage is available at http://jk.gs/git.html
08:45 Iota It tells you everything!
08:45 b3kN joined #git
08:45 b3kN joined #git
08:46 Iota I'd better send an email to my colleagues, they'll love this.
08:50 d0nn1e joined #git
08:50 de-vri-es joined #git
08:50 thebope joined #git
08:51 red82 joined #git
08:54 satifant joined #git
08:54 mar77i derp.
08:57 marcogmonteiro joined #git
09:00 _Vi joined #git
09:02 djb-irc joined #git
09:04 mikecmpbll joined #git
09:04 JeroenT joined #git
09:06 JeroenT_ joined #git
09:06 mar77i actually, no. I had to update the author in each commit. now it's correct.
09:06 mar77i whew.
09:07 nettoweb joined #git
09:07 kurkale6ka joined #git
09:09 _joes__ joined #git
09:10 _ikke_ Iota: https://en.wikipedia.org/wiki/Poe's_law
09:10 Hobbyboy joined #git
09:13 eduardas_m joined #git
09:13 encod3 joined #git
09:14 TikityTik How do I see what my upstream is for the current branch I am on?
09:14 _ikke_ git branch -vv is the easiest way
09:15 hfp_work joined #git
09:15 _ikke_ I don't think there is a simple command that would simply return origin/foo
09:15 Derderderd joined #git
09:16 TikityTik this is what I get: * end-process 96c1f91 [remotes/origin/end-process] Implemented End Process Tree
09:16 TikityTik while everything else starts with origin/
09:16 TikityTik and git branch -u origin/end-process is giving me: warning: refname 'origin/end-process' is ambiguous.
09:18 ferr1 joined #git
09:18 causasui joined #git
09:19 aax joined #git
09:23 chll_ joined #git
09:24 _ikke_ TikityTik: You created a branch called refs/heads/remotes/origin/end-process I guess
09:24 _ikke_ which is ambiguous because the way git finds the actual ref you mean  refs/remotes/origin/end-proces
09:25 _ikke_ TikityTik: git for-each-ref refs/heads/remotes
09:25 _ikke_ what does that return?
09:25 willlondon joined #git
09:25 TikityTik _ikke_: nothing
09:25 clmsy joined #git
09:25 zeroed joined #git
09:25 zeroed joined #git
09:27 Alienpruts joined #git
09:28 Seveas _ikke_: TikityTik git rev-parse --symbolic-full-name --abbrev-ref @{u}
09:29 TikityTik Seveas: remotes/origin/end-process
09:29 TikityTik I'm done with this branch too, so i'm about to merge to master
09:30 _ikke_ TikityTik: what about git for-each-ref origin/end-process
09:30 Flowinho joined #git
09:32 TikityTik _ikke_: Nothing
09:33 rafalcpp ah, just git log works after all, my mistake
09:33 rafalcpp hm
09:33 rafalcpp So, can you checkout a repo that has submodules, and checkout it's submodules - all without downloading unneeded history?
09:34 rafalcpp when I git clone with --depth 1, then submodules init isn't working apparently
09:34 ahmed_elgabri joined #git
09:36 KevinDF joined #git
09:37 TikityTik sorry, trying to email my partner
09:37 TikityTik since he just did a worse version of a feature of what I already just did
09:38 cheater joined #git
09:39 JeroenT joined #git
09:42 mkoskar joined #git
09:42 scarabx_ joined #git
09:43 kedare joined #git
09:46 JeroenT joined #git
09:48 thierryp joined #git
09:49 albel727 joined #git
09:50 mar77i joined #git
09:50 tvw joined #git
09:51 thebope joined #git
09:56 c1arknova joined #git
09:56 marcogmonteiro joined #git
09:57 Vampire0 joined #git
10:00 netj joined #git
10:03 JeroenT joined #git
10:04 _Vi joined #git
10:04 muelli joined #git
10:12 rnsanchez joined #git
10:13 TikityTik I'm done
10:13 TikityTik alright, i'll just leave this branch broken
10:13 TikityTik how do I merge my branch into master?
10:14 re1 joined #git
10:14 Gloomy joined #git
10:15 lss8 joined #git
10:15 irqq joined #git
10:15 tobiasvl TikityTik: git checkout master && git merge my_branch
10:15 TikityTik thanks
10:15 JeroenT joined #git
10:16 TikityTik i am so exhausted, it's my bed time 5:15 am, been workign 15 hours a day on this school project
10:16 howitdo joined #git
10:16 howitdo joined #git
10:16 TikityTik me: 78 commits / 4,773 ++ / 4,056 --, partner: 6 commits / 215 ++ / 17 --
10:17 _ikke_ auch
10:17 tobiasvl kinda lopsided
10:17 TikityTik this is me -> https://i.imgur.com/j33vesu.jpg
10:17 tobiasvl worst part about school, one-sided collaborations
10:17 romerocesar joined #git
10:18 TikityTik oh yeah, especially when the other person is using you to keep making money from a job and while they do other course assignments
10:18 TikityTik and also while they do*
10:18 salamanderrake joined #git
10:19 tobiasvl tell your professor ;P
10:19 thierryp joined #git
10:19 achadwick joined #git
10:19 _ikke_ git config alias.rtb '! f() { ref=$(git rev-parse --abbrev-ref HEAD); remote=$(git config branch.$ref.remote); merge=$(git config branch.$ref.merge); branchname=$(git rev-parse --abbrev-ref $merge); printf "%s/%s\n" $remote $branchname; }; f'
10:20 _ikke_ alias to get the remote tracking branch for the current branch
10:20 iliv joined #git
10:20 tobiasvl strange that there's no easier way to do that
10:20 _ikke_ very crude version
10:21 _ikke_ There is :-/
10:21 _ikke_ git rev-parse --abbrev-ref @{upstream}
10:22 iliv joined #git
10:22 TikityTik alright how do I go back to HEAD~2, merge, then paste over the commits that my dumb partner made?
10:23 TikityTik I already did git checkout HEAD~2, git merge <my-branch>
10:23 _ikke_ TikityTik: git checkout HEAD~2 detaches your HEAD
10:23 _ikke_ that's not what you want
10:23 TikityTik What do I do then?
10:24 TikityTik I need to undo his commits without rebase and get rid of his code and put mine in.
10:24 TikityTik his commits can stay
10:24 _ikke_ revert the commits then
10:24 _ikke_ git revert HEAD~2..
10:24 TikityTik never used that before
10:24 _ikke_ It creates 2 new commits undoing the reverted commits
10:26 leeN joined #git
10:26 TikityTik It still has his code if I do git revert HEAD~2
10:26 _ikke_ yes
10:26 _ikke_ You say his commits can stay
10:26 _ikke_ and you cannot rebase
10:26 TikityTik alright, how do I just paste over the file without having to merge my stuff with his? I don't want to look for the non-merge-conflicts to erase them
10:27 _ikke_ So you are merging your code, right?
10:27 TikityTik I just want to merge my branch to before what he touched, then replace the file completely without merging with his changes.
10:27 silverfo_ joined #git
10:27 _ikke_ TikityTik: You can only do that by rewriting history (pretending he never made those commits)
10:28 TikityTik ah fine, I'll just merge and erase by hand
10:28 TikityTik thought it would be easier without rebase
10:29 _ikke_ This is not a common workflow in git. It can be done, though
10:30 TikityTik i screwd up my git HEAD, i have no idea what I did
10:30 _ikke_ You mean you are in a detached HEAD?
10:30 diogenese joined #git
10:30 tobiasvl you did "git checkout HEAD~2" like you said, and like _ikke_ said that results in a !detached HEAD
10:30 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
10:31 DieguezZ joined #git
10:32 cdown joined #git
10:32 TikityTik well I somehow have a commit from HEAD~2 as the HEAD but with the new changes below.
10:32 TikityTik I haven't pushed yet, how do I just reset to the remote?
10:33 DuncanT joined #git
10:34 TikityTik nevermind. git reset --hard origin/master
10:35 star_prone joined #git
10:36 cdown_ joined #git
10:36 DieguezZ joined #git
10:36 worstadmin_ joined #git
10:40 King_Hual joined #git
10:40 jast _ikke_: it's not that straightforward... the private key is on a different machine
10:40 jast the one for LE, that is
10:41 _ikke_ different from where you have LE on?
10:41 jast I have the LE key and the LE client on one machine, and the web server on a different one
10:42 _ikke_ Bit more involved, but I believe you can even work with a CSR
10:42 jast that's the easy part. the trickier part is refreshing validations (which I had to do for yesterday's renewal)
10:43 _ikke_ what verification method are you using?
10:43 jast http, currently
10:44 _ikke_ dns-01 should make that part easier
10:44 jast if I can figure out a good way to push the DNS update...
10:44 venmx joined #git
10:44 jast right now the nameserver is locked down pretty tightly
10:45 krarkrrrc joined #git
10:45 _ikke_ ah ok
10:45 WhiskerBiscuit joined #git
10:45 _ikke_ You have to set that token only once
10:45 PCatinean joined #git
10:45 _ikke_ it should be valid for quite a while (so no need to automatically do it)
10:45 jast it's a new one for each re-validation
10:45 JeroenT joined #git
10:46 jast and validations last for something like 12 months
10:46 jast right now I have six validations (at least) per year, that's enough to spend time automating it
10:47 jast I suppose I could use getssl and futz around with locking down its SSH account...
10:47 arnsa joined #git
10:47 aleb left #git
10:48 jast I'd much rather have the web servers pull certificates rather than my LE server having push access everywhere, though... and I'm not aware of an implementation of that kind of data flow
10:48 MatthewAllan93 joined #git
10:49 mahendratech joined #git
10:49 McKraken_zzzzz joined #git
10:49 xall joined #git
10:50 disi joined #git
10:52 _ikke_ jast: not sure if feasible, but whatabout proxying /.well-known/acme/ to the LE server?
10:52 thebope joined #git
10:52 _ikke_ though, that doesn't help much
10:52 wenzowski joined #git
10:52 thierryp joined #git
10:52 jast interesting idea
10:53 jost joined #git
10:53 Learath2 joined #git
10:55 cheater left #git
10:55 JeroenT joined #git
10:55 dmj` joined #git
10:56 kutenai joined #git
10:57 Silox| joined #git
10:58 jast thinking about it, there's an interesting weakness in the validation process... if someone MITMs the validation connection from LE to the target server and inserts their own validation data, they can easily get a validation
10:59 jast not much to be done about that, though, I guess
10:59 jast the only way to avoid it would be mumble mumble dnssec mumble
11:00 kireevco joined #git
11:00 ghostlight joined #git
11:00 Mixologic joined #git
11:01 jast anyway, it occurs to me that since no actual signing takes place in the key authorization string, you can generate a validation response without having to talk to the LE client
11:02 jast GET on /.well-known/acme-challenge/FOO -> output "FOO.<thumbprint of key>"
11:02 nsh joined #git
11:02 flupke joined #git
11:03 re1 joined #git
11:03 boxrick1 joined #git
11:03 cdown_ joined #git
11:07 ensign_ joined #git
11:08 mischat joined #git
11:10 cttttt joined #git
11:11 discopatrick joined #git
11:12 cqi joined #git
11:13 venmx joined #git
11:13 msonntag joined #git
11:14 _Xatenev joined #git
11:14 _Xatenev Hi
11:14 gitinfo _Xatenev: 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.
11:14 _Xatenev What kind of transfer method does git use in background?
11:14 t-richards joined #git
11:14 Peng There are several
11:14 _Xatenev So I can configure what kind of transfer method to use? Is there a list from whic hI can choose?
11:15 Peng https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols
11:15 Peng _Xatenev: It's specified in the URL when you "git clone" or whatever
11:16 _Xatenev Peng Thanks man :)
11:16 tterrag joined #git
11:17 _Xatenev left #git
11:17 anonymuse joined #git
11:17 Snugglebash joined #git
11:18 cqi joined #git
11:18 star_prone joined #git
11:19 _ADN_ joined #git
11:24 manuels joined #git
11:25 hussam joined #git
11:31 mikecmpb_ joined #git
11:33 HcsOmot joined #git
11:33 HcsOmot left #git
11:37 synbit joined #git
11:37 Hko !backup
11:37 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
11:37 mischat joined #git
11:39 dsdeiz joined #git
11:39 dsdeiz joined #git
11:40 Cavallari joined #git
11:43 Nicmavr joined #git
11:44 creppe joined #git
11:44 stfn joined #git
11:46 holodoc joined #git
11:47 habbasi joined #git
11:49 Grum joined #git
11:51 davisonio joined #git
11:52 Cavallari1 joined #git
11:53 thebope joined #git
11:55 arnsa joined #git
11:55 holgersson joined #git
11:56 lindenle joined #git
11:58 uranellus joined #git
11:58 uranellus joined #git
11:58 anonymuse joined #git
12:00 RickyB98 joined #git
12:00 RickyB98 joined #git
12:01 leftriver78 joined #git
12:01 CtrlC joined #git
12:01 CtrlC joined #git
12:03 re1 joined #git
12:04 ahmedelgabri joined #git
12:04 lb joined #git
12:07 sybariten joined #git
12:07 Silox| joined #git
12:09 staafl joined #git
12:11 rominronin joined #git
12:11 rominron_ joined #git
12:12 b3kN joined #git
12:12 b3kN joined #git
12:12 JeroenT joined #git
12:18 irqq_ joined #git
12:21 disi joined #git
12:21 star_prone joined #git
12:22 mikecmpbll joined #git
12:24 thierryp joined #git
12:24 jaguarmagenta joined #git
12:25 Vangelis joined #git
12:26 GavinMagnus joined #git
12:27 zeroed joined #git
12:27 zeroed joined #git
12:28 byte512 joined #git
12:29 mseyne joined #git
12:33 lvns joined #git
12:33 Jackneill joined #git
12:34 GavinMagnus left #git
12:39 noecc joined #git
12:46 webdev007 joined #git
12:46 tvw joined #git
12:46 elsevero joined #git
12:51 CubiK joined #git
12:52 ispn joined #git
12:53 thebope joined #git
12:55 vaesper joined #git
12:56 msonntag joined #git
12:56 cdown joined #git
12:56 sdothum joined #git
12:57 disi joined #git
13:00 davimore joined #git
13:00 johnmilton joined #git
13:02 qqx joined #git
13:03 re1 joined #git
13:05 Nnh joined #git
13:06 a_thakur joined #git
13:07 synthroid joined #git
13:12 jaguarmagenta joined #git
13:13 Nilesh_ joined #git
13:15 M3mphiZ joined #git
13:15 finalbeta joined #git
13:19 lvns joined #git
13:20 finalbeta joined #git
13:23 heroux_ joined #git
13:23 boombatower joined #git
13:27 serialoverflow joined #git
13:33 JeroenT joined #git
13:34 anonymuse joined #git
13:35 jeffreylevesque joined #git
13:35 synthroi_ joined #git
13:37 derk0pf joined #git
13:40 fhackdroid joined #git
13:42 faux___ joined #git
13:42 hs366 joined #git
13:45 User458764 joined #git
13:45 faux___ joined #git
13:45 bernardio joined #git
13:45 User458764 joined #git
13:45 mahendratech joined #git
13:47 marcogmonteiro joined #git
13:51 cdg joined #git
13:53 Noldorin joined #git
13:54 thebope joined #git
13:54 texinwien joined #git
13:54 xaa__ joined #git
13:58 Gsham joined #git
14:00 jeffreylevesque joined #git
14:00 rnsanchez_ joined #git
14:00 GodGinrai joined #git
14:01 rooftopjoe joined #git
14:02 rooftopjoe when i amend a commit, if i want github to reflect the change, do i "git push -f" or just do the regular "git push -u origin master"?
14:02 jimi_ joined #git
14:02 fahadash joined #git
14:02 lindenle joined #git
14:03 re1 joined #git
14:03 tobiasvl rooftopjoe: if the commit you amend was previously pushed, you will need to do "git push -f", yes
14:03 tobiasvl if you just try the latter command git will tell you if it didn't work
14:04 M3mphiZ Hi, I have a TFS repository containing about 50 projects, all seperately created as a Team Project which I want to convert to a GIT repository. The question is, is it better to keep this structure and create a git repository for every Team Project, or put them all into one big repository (with submodules maybe), or someone knows a third and better way?
14:05 dminuoso osse: Hey. I finally did it. rm .git; git init; git add .; git commit -m "Initial" - now I have tons of granular commits already. :)
14:05 nioncode joined #git
14:05 fiete joined #git
14:05 dminuoso No features branches yet, but in the early steps I don't really think in terms of features yet.
14:05 moritz M3mphiZ: I don't know what Team Project is
14:06 moritz M3mphiZ: the real question is: can you develop in each repo indepndently? If yes, keep them separate
14:08 mda joined #git
14:08 noctux joined #git
14:09 djh joined #git
14:11 GodGinrai joined #git
14:11 ExoUNX joined #git
14:11 Gloomy joined #git
14:12 ShekharReddy joined #git
14:13 muelli joined #git
14:14 deadnull joined #git
14:14 zeroed joined #git
14:15 M3mphiZ moritz: ill do that as the projects are not depending on each other. thanks!
14:16 colmobrien84 joined #git
14:16 synthroid joined #git
14:17 xberg_ joined #git
14:18 snowkidind joined #git
14:19 romerocesar joined #git
14:24 faux___ joined #git
14:29 AnxiousGarlic joined #git
14:29 Guest47960 joined #git
14:29 ams__ joined #git
14:30 jstimm joined #git
14:30 Es0teric joined #git
14:30 disi joined #git
14:31 Es0teric joined #git
14:32 osse dminuoso: That's good to hear, but I must admit I can't recall our previous conversation :P
14:32 JeroenT joined #git
14:32 mgaunard joined #git
14:33 mgaunard git checkout -b branch will create a new branch named "branch" from my current HEAD and checkout to it, but if the branch already exists it only checks out to it
14:34 mgaunard is there a variant I can use to force the creation of a new branch based on HEAD, erasing any previous one if needed?
14:34 g_zen joined #git
14:34 nicksloan joined #git
14:34 _ikke_ git checkout -B branch
14:34 mgaunard I guess this might just be what -B does
14:34 _ikke_ yes
14:36 synthroi_ joined #git
14:39 rubyonrailed joined #git
14:40 Dougie187 joined #git
14:43 zeroed joined #git
14:43 zeroed joined #git
14:48 synthroid joined #git
14:48 mada joined #git
14:52 govg joined #git
14:53 dminuoso osse: I was talking about this highly chaotic git repository the other day, where the majority of commits yielded non-functional components, making things such as git bisect impossible to use.
14:53 ash_workz joined #git
14:54 dminuoso osse: At any rate, you agreed that a such a hard reset of the repository could be okay - and now it's really smooth. :)
14:54 dminuoso Thanks.
14:54 osse i have a weak spot for nuking crap
14:55 _ikke_ :D
14:55 thebope joined #git
14:56 bronson joined #git
14:56 qqx It really shouldn't be necessary to nuke history for bisect's sake. You could instead tag the current state, and always mark that as good when running bisect.
14:56 nickabbey joined #git
14:57 lordjancso joined #git
14:59 finalbeta joined #git
15:00 dendazen joined #git
15:02 JeroenT joined #git
15:02 nickabbey joined #git
15:04 User458764 joined #git
15:08 mda1 joined #git
15:10 cdg_ joined #git
15:12 drbean joined #git
15:12 TomyWork joined #git
15:16 Kamilion joined #git
15:21 afuentes joined #git
15:22 fmcgeough joined #git
15:23 theonefoo joined #git
15:24 theonefoo I have 3 unstaged files and 1 untracked file in my working tree, and I had a stash with what looks to be the exact same as my working tree. I want to do a diff comparison between my working tree, (unstaged and untracked), and my stash@{0}. Is it possible to do this with `git stash`?
15:24 theonefoo and I have* a stash
15:24 jimi_sanchez joined #git
15:24 CubiK joined #git
15:25 theonefoo It seems like this is the best option: http://stackoverflow.com/a/14439846/4467167
15:26 selckin i tried to figure that out once and got confused as hell, my soluation was to just commit, apply the stash and diff normally, can then undo the commit with git reset HEAD^
15:26 theonefoo with `git diff`, d’oh
15:26 osse theonefoo: git diff stash@{0}
15:26 ResidentBiscuit joined #git
15:26 publio joined #git
15:26 lektrik joined #git
15:26 ResidentBiscuit joined #git
15:27 ResidentBiscuit joined #git
15:27 theonefoo osse: whoa, that didn’t work as expected, I got some totally different diff that is not even in my working tree or in my stash
15:27 ResidentBiscuit joined #git
15:27 jimi joined #git
15:28 osse hmm, the diff might not include the untracked file
15:28 theonefoo but `git stash show -p stash@{0}` shows me what I am expecting to see in my stash
15:28 theonefoo and `git diff stash@{0}` shows me something totally different
15:29 selckin the diff is like against the commit that was HEAD when you stashed
15:29 theonefoo ah
15:29 theonefoo that makes sense
15:29 jimi joined #git
15:29 selckin i could never make it show anything that made sense :)
15:29 theonefoo selckin, yes, I think commiting my working tree as `git commit -m ‘dirty stuff’`, then go from there
15:30 jimi joined #git
15:32 f3r70rr35f joined #git
15:35 rominronin joined #git
15:35 al-damiri joined #git
15:37 Darcidride joined #git
15:39 bsanford joined #git
15:40 acetakwas joined #git
15:42 sbulage joined #git
15:42 red82 joined #git
15:43 MarkFletcher joined #git
15:44 e14 joined #git
15:45 thebope joined #git
15:46 MatthewAllan93 joined #git
15:46 jaafar joined #git
15:47 mazert joined #git
15:48 jephsf joined #git
15:49 oxsyn joined #git
15:50 anbz joined #git
15:52 nanga joined #git
15:52 shinnya joined #git
15:54 aarobc joined #git
15:54 steelsw0rd joined #git
15:59 kini joined #git
16:00 finalbeta joined #git
16:01 Es0teric joined #git
16:01 alex1a joined #git
16:01 guest___ joined #git
16:02 govg joined #git
16:03 Darcidride joined #git
16:09 svm_invictvs joined #git
16:09 mattcen joined #git
16:10 anuxivm joined #git
16:12 muelli joined #git
16:12 ojdo joined #git
16:14 jstein_ joined #git
16:14 guest___ joined #git
16:18 robnester joined #git
16:18 robnester Hi all.
16:18 gitinfo robnester: 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.
16:19 robnester Question: i've got a development branch which has diverged significantly from master (basically a complete rewrite) and I'm wondering what is the best approach to bring it back to master?
16:20 peeps[lappy] joined #git
16:20 robnester would "git checkout master" followed by "git rebase -s ours dev" be appropriate?
16:21 dviola joined #git
16:21 nickabbey joined #git
16:22 cjohnson if it's a major overhaul I probably wouldn't rebase
16:22 cjohnson either way, whatever you do, I would do in a new branch from master first, just to be sure it can be done sanely
16:23 King_Hual` joined #git
16:23 brent__ joined #git
16:24 robnester cjohnson, would you do a merge instead?
16:24 tang^ joined #git
16:24 exarch joined #git
16:25 ResidentBiscuit `git checkout master; git reset --hard otherBranch`
16:25 synthroi_ joined #git
16:25 bronson joined #git
16:26 guest___ joined #git
16:26 ||Offcentered||| joined #git
16:28 garethdaine joined #git
16:29 Dragonbird joined #git
16:29 ayogi joined #git
16:29 dreiss joined #git
16:30 yqt joined #git
16:31 lordjancso_ joined #git
16:31 snowkidind if I download a repository from github it comes in a directory. Is there some way to just have the files install in the current directory? for example /var/www/here insteadof /var/www/whatever_master/nothere
16:31 abyx joined #git
16:32 theonefoo left #git
16:32 jephsf joined #git
16:33 abyx hmm... so I have a feature branch that i've created a PR with, but now i need to peel off the last 3 commits in that branch into its own branch based/rebased off of my master branch. How would i go about doing that?
16:34 ||Offcentered||| left #git
16:34 JeroenT joined #git
16:36 ejb joined #git
16:37 inflames joined #git
16:39 nettoweb joined #git
16:39 re1 joined #git
16:40 ShekharReddy joined #git
16:40 howitdo joined #git
16:41 cjohnson yes robnester that's what I personally would default to
16:41 cjohnson robnester: you can always branch master to master-test, and then attempt a rebase
16:41 cjohnson but if it doesn't go well I'd merge
16:41 star_prone joined #git
16:44 subhojit777 joined #git
16:45 nd_ joined #git
16:46 m___ joined #git
16:46 robnester a merge would require a lot of manual conflict resolution it seems?
16:46 cjohnson you're going to have a lot of conflicts either way I suspect
16:46 cjohnson like I said try rebase, if it works, great
16:46 cjohnson but I suspect you're going to have a lot of work either way
16:47 cjohnson and in my experience merge is usually a little less work, at least how I use git anyway
16:47 robnester yeah, the only thing that "worked" (in a loose sense of the word) was to do a hard cut like ResidentBiscuit suggested.
16:47 robnester but part of me feels like that might problematic in some way? (guessing)
16:48 star_prone joined #git
16:49 star_prone joined #git
16:49 ResidentBiscuit When you have branches that have diverged a lot like that (rewrite etc), there's no easy solution. Software rewrites are always a nightmare. You either freeze development or deal with the situation of trying to back-merge all the new features/fixes in the original code into the rewrite
16:50 cjohnson or just discard them entirely! ha
16:50 rts-sander Hi, I type: git rebase -i 44ecb30
16:50 rts-sander but now git calls me a noop
16:50 cjohnson robnester: it would be problematic if you had residual feature branches still based off the old master and somebody tried to merge those in
16:50 rts-sander what do I do about this please
16:50 robnester ResidentBiscuit: Since this was a complete rewrite, would there be any implications of doing your git reset --hard otherBranch? this is a closed project and has no other commiters.
16:50 robnester :%s/commiters/committers
16:51 ResidentBiscuit Anything in master that you never pulled into otherBranch would be killed
16:51 deadnull joined #git
16:51 ResidentBiscuit If its just you, then theres no worry
16:52 robnester ResidentBiscuit: no issues with that, anything that's in master was either completely revamped in dev or removed completely
16:52 guest___ joined #git
16:53 rooftopjoe can i ammend a commit that isn't the last commit (maybe worth mentioning there would be no conflicts to HEAD).
16:53 rooftopjoe that was meant to end in a question mark
16:53 rooftopjoe also, amend*
16:55 jstein_ joined #git
16:56 Random832 rooftopjoe, make your changes in a new commit, then rebase to a commit before the one you want to "amend", move your new commit to right after it, and mark it as a fixup. Be aware this will change the commit hash and committer metadata for every commit after that point.
16:56 e14 joined #git
16:56 Random832 er with git rebase -i
16:56 rooftopjoe yeah, i know. it's way more work than it's worth it
16:57 rooftopjoe it's fine to rebase, anyway, since it's a private repo
16:57 ResidentBiscuit Can you just rebase and mark that commit as reword?
16:57 Random832 ResidentBiscuit, i assumed he wanted to change the code, not just the commit message
16:57 rooftopjoe i don't know what reward means
16:57 rooftopjoe reword*
16:58 ResidentBiscuit reword just changes the message
16:58 rooftopjoe ah
16:58 Random832 rooftopjoe, in rebase -i you can "reword" to edit the commit message.
16:58 Random832 depends on what you meant by amend i guess
16:58 rooftopjoe yeah, i don't want to change the commit message, i want to change a file
16:58 rooftopjoe fix a typo
16:58 rooftopjoe it's fine
16:58 rooftopjoe i'll just do a new commit
16:59 Random832 you could checkout that commit, do the amend (in detached head), note the commit id, checkout the head, and then rebase to the amended commit id
16:59 rooftopjoe i understand that
16:59 ResidentBiscuit For a typo fix, Id just make a new commit. Nothing special
16:59 ResidentBiscuit Treat it as a bug fix
16:59 Random832 or just rebase -i and use "edit"
17:00 rooftopjoe what does -i do?
17:00 ResidentBiscuit Trying to make every commit a flawless state of code is futile
17:00 Random832 rebase -i lets you choose what to do with each commit (fixup/squash/reword/edit) and rearrange the order of changes
17:00 Random832 it's --interactive
17:00 rooftopjoe ResidentBiscuit: true but it was more so i wouldn't get lost in a sea of meaningless commits. if it's just a typo then meh
17:01 rooftopjoe i don't try to *hide* anything
17:01 rooftopjoe we all write bugs :p
17:01 rooftopjoe Random832: ok, thanks. i will read up on --interactive then
17:02 i7c joined #git
17:03 matsaman joined #git
17:04 cjohnson joined #git
17:04 Learath2 joined #git
17:06 WayToDoor joined #git
17:08 lucianangelus joined #git
17:08 jnewt so i made a commit (last commit, not pushed), which was done on my new machine, and consisted of line ending changes (all crlf to lf), and several actual code changes.  how can i split that last commit so that the line ending changes are separate from the actual changes?
17:08 Es0teric joined #git
17:08 jnewt i know how to reset, but i don't know how to select / filter line ending changes from other changes
17:10 cjohnson git add -p
17:10 cjohnson lets you stage hunks of files at a time
17:10 Random832 jnewt, save the commit id, reset --hard to the parent commit, make a new commit consisting of the line ending changes, cherry-pick your previous commit. You may get merge conflicts, but they should be easy to fix with mergetool
17:10 cjohnson and then in the future if ever you make whitespace changes I would always make them first before any code changes
17:10 Random832 (I assume you can easily recreate the line ending changes)
17:11 howitdo joined #git
17:11 jnewt cjohnson: the problem is that each file is just two hunks, one where everything is removed, the other where everything is added.
17:11 qqx jnewt: I'd checkout a temporary branch with the previous commit, redo the line-ending changes, commit that, switch back to the original branch, then `git reset <tmp-branch>`, then recommit the code change.
17:11 jccn joined #git
17:11 cjohnson jnewt: one of the commands in that mode is "s"
17:11 cjohnson or you can manually edit the staging in your editor
17:12 cjohnson but yeah the other suggestion about cherry-picking might be easier since you can probably easily reproduce whitespace changes
17:12 cjohnson er, rebasing after applying whitespace change
17:12 cjohnson if you rebase your code+whitespace commit over top of a commit that already does teh whitespace, your other commit should just be reduced to code changes
17:12 cjohnson in theory
17:14 Gsham joined #git
17:14 xberg joined #git
17:14 jnewt new commit with only line ending changes is a good idea
17:14 Random832 it might get merge conflicts but they'll be easy to fix
17:15 Random832 in theory you could commit-tree with the final commit, but that's a bit advanced
17:16 svm_invictvs joined #git
17:16 Gloomy joined #git
17:18 Ryanar joined #git
17:18 guest___ joined #git
17:19 logikos joined #git
17:20 kyan joined #git
17:20 logikos when i do `git branch --all` i see a branch remotes/origin/branchname that was deleted on remotely (github does not show the branch when you click to view all branches)
17:21 logikos why does it list the branch as being a remote branch when it isn't and how do i remove it?
17:21 askhl joined #git
17:22 matsaman logikos: I'm guessing if you did a git pull or the like (that is, updated your local from the remote), that information would be updated
17:22 logikos i have done a pull
17:22 logikos on the develop branch
17:22 logikos and now master
17:23 matsaman http://stackoverflow.com/questions/5094293/git-remote-branch-deleted-but-still-appears-in-branch-a maybe
17:23 cjohnson right, pull won't delete pruned branches
17:23 askhl Hello.  I would like to do a release, and I would like the release to correspond to a tag in git.  Also I use autotools, and the configure script and other generated things are not normally under version control.  What is the best way then - should I make a commit with all the autotools stuff (basically the result of 'make dist') and tag that as a release?  Most of it is simply a copy of master, but the situati
17:23 cjohnson and your local repo has a copy of every remote branch in addition to your local branch logikos
17:23 askhl on seems a bit 'funny'.
17:24 cjohnson basically the way it works is that you have two branches for any one branch, one local and one for origin. when you "push changes", what it actually does is merge your branch into your local copy of remote, and then it pushes that branch over top of the remote machine
17:24 cjohnson that way it can do the "work" on your machine
17:24 cjohnson to be sure it'll work
17:24 DistantStar joined #git
17:25 matsaman while that makes sense, it doesn't really make sense, to me, that it should pretend those working branches don't exist but a deleted branch still does
17:25 qqx cjohnson: pushing does *not* merge the remote tracking branch
17:25 rads joined #git
17:25 CubiK joined #git
17:25 logikos cjohnson: yeah, i have a basic understanding of that .. i had 2 branches in that list with the same name .. one prefixed with remotes/origin  .. and i knew it was removed remotly so i did git branch -d examplebranchname
17:25 logikos and it removed the local one
17:26 qqx It will only push your local copy of the branch, and if that succeeds it will update the remote tracking branch.
17:26 logikos however remotes/origin/examplebranchname
17:26 logikos still is in the list
17:26 cjohnson right, deleting your local copy doesn't prune the remote tracking branch
17:27 logikos so i do the git branch -d -r remotes/origin/examplebranchname ?
17:27 _Cyclone_ joined #git
17:27 madewokherd joined #git
17:28 cjohnson yep
17:28 logikos at this moment right now i have nothing local that should be different from remote in any branch
17:28 guest___ joined #git
17:28 cjohnson or git remote prune origin
17:29 logikos is there a way to just remove all the local tracked branches that do not exist remotly ?
17:29 cjohnson which does all defunct tracking branches
17:29 cjohnson :)
17:29 tobiasBora Hello,
17:30 cqi joined #git
17:30 tobiasBora I would like to know if it's possible to create a folder which is both a bare and a working repository.
17:30 matsaman tobiasBora: you'll have to clarify
17:30 matsaman you want to track the state of a bare?
17:30 logikos thanks
17:31 matsaman you want to have a working in the same place as the bare, but have them not track one another?
17:31 matsaman and then of course, there's this: why? =P
17:31 Linux-Ninja joined #git
17:31 rads joined #git
17:32 Linux-Ninja Team, I am new to git and I have been told to apply a patch from gibhub, can someone walk me thru this process.
17:33 cjohnson Linux-Ninja: you just need git apply
17:33 cjohnson man git-apply
17:33 gitinfo the git-apply manpage is available at http://jk.gs/git-apply.html
17:34 sea-gull_ joined #git
17:34 Linux-Ninja ok
17:35 Rodya_ joined #git
17:35 tobiasBora matsaman: Well, I have two machines A & B. The thing is that the machine B is available from the internet, so I would like it to be a bare repo (to do git clone ssh://...), but B is not very safe, so I would like that if B is dead, then I can create another B' by just doing something like "git clone --bare ssh://my_A_repo.git", and then when I want to sent things from A to B, I just do a push from A to B.
17:35 tobiasBora It may sounds strange, I understand
17:36 rorro joined #git
17:36 User458764 joined #git
17:36 tobiasBora but basiquely, I would like that B becomes the main bare repo, but I would like to be able to create it very easily from a classical git repo...
17:36 Linux-Ninja someone told me "you can grab the patch from   https://github.com/Katello/katello/pull/6485.patch"
17:37 Linux-Ninja do I just run "git apply --check https://github.com/Katello/katello/pull/6485.patch"
17:37 tobiasBora Hum...
17:37 nicksloan joined #git
17:37 tobiasBora The .git file in a working git folder can be used as a bare repo in "git clone ssh/.../myproject/.git" ?
17:38 matsaman tobiasBora: you can create a new bare repo from any set of data, yes
17:38 matsaman now if you wanted to formally keep a local unchanged copy of a remote repo, I think I'd just set up a cron job to regularly clone it / back it up
17:39 jimi_sanchez joined #git
17:39 jimi_sanchez joined #git
17:39 SwiftMatt joined #git
17:40 tobiasBora I don't like cron job... I thing (maybe I'm wrong) that's is often an easy dirty solution to avoid to think to be good way to proceed...
17:40 matsaman nah, cron is just a tool
17:40 matsaman a lovely tool that does a particular job
17:40 ResidentBiscuit cron is very nice
17:41 tobiasBora Well, let's imagine my cron job always run when I do not have internet
17:41 relgar joined #git
17:41 tobiasBora then the repo won't be saved
17:43 synthroid joined #git
17:43 manuels joined #git
17:44 cjohnson well then cron isn't the problem, lack of internet is
17:44 aswen joined #git
17:44 cjohnson and how you resolve that doesn't change based on the use of cron
17:44 synthroid joined #git
17:45 aavrug joined #git
17:45 rads joined #git
17:45 quesker left #git
17:46 synthroid joined #git
17:46 durham joined #git
17:46 lbr joined #git
17:46 deadnull joined #git
17:47 romerocesar joined #git
17:47 synthroid joined #git
17:47 durham joined #git
17:47 lbr Guys.  Weird problem.  I'm pushing to github on one box, fetching on another and git log origin/branchname gives different results.  Any ideas on how to diagnose this or force an update regardless of what git thinks is up to date?
17:47 aeontech joined #git
17:48 synthroid joined #git
17:48 lbr git remote -v is identical for both boxes
17:48 bronson joined #git
17:48 lbr By different results, I mean the second box doesn't see the most recent commit logs
17:49 synthroid joined #git
17:49 osse lbr: check git rev-parse refs/remotes/origin/branchname on both boxes immediately after a push and fetch.  Sometimes these issues are because you have *local* branch whose name is origin/branchname that you created by accident
17:49 osse so git log shows that instead. you can also right now try  git log refs/remotes/origin/branchname  instead of git log origin/branchname to see
17:50 robattila256 joined #git
17:50 raspado joined #git
17:51 lacour joined #git
17:52 lbr osse so, rev-parse gives different hashes, but I don't know why.  I've done a few pushes on one box followed by pulls on the other box today, and it was updating fine earlier.
17:53 osse lbr: what does 'git config remote.origin.fetch' say on both?
17:54 e14 joined #git
17:54 jimi_ joined #git
17:54 lbr osse: same on both boxes
17:54 Macaveli joined #git
17:54 osse but what is it?
17:55 lbr +refs/heads/*:refs/remotes/origin/*
17:55 qqx lbr: What does `git rev-parse --symbolic-full-name origin/branchname` show?
17:55 lbr refs/remotes/origin/fullauto
17:56 irqq joined #git
17:56 durham joined #git
17:57 osse lbr: ccan you pastebin the output of 'git fetch origin; git rev-parse refs/remotes/origin/fullauto' from both?
17:57 Salander27 joined #git
17:58 xberg joined #git
17:58 lbr osse: not sure if you wanted something with --verbose; that gives 01f767ca8ca5b97819e157c93d2ab42220ec07db on dest box, de40b2e34bbfd5b9fdf2135bf33b398a71237228 on source box
17:59 osse git fetch prints nothing?
17:59 lbr nope, with verbose, it's all [up to date]
17:59 DropItLikeItsHot joined #git
17:59 osse could it be that your recent pushes have failed and you haven't noticed?
18:00 justanotheruser joined #git
18:00 rafasc joined #git
18:01 nickabbey joined #git
18:01 lbr osse: nope, just double checked; last git log entry on the source box matches that on github.
18:01 lbr but the dest box can't see the updates.
18:02 lbr Same git version on both boxes
18:02 osse lbr: on the destbox:  git ls-remote origin | grep refs/heads/fullauto
18:02 osse fuck it, on both
18:02 guest___ joined #git
18:02 MarkFletcher joined #git
18:03 lbr dest box: 01f767ca8ca5b97819e157c93d2ab42220ec07db        refs/heads/fullauto
18:03 lbr source box: de40b2e34bbfd5b9fdf2135bf33b398a71237228        refs/heads/fullauto
18:04 tobiasBora matsaman: cjohnson : Maybe... I cannot find an ideal solution, I'm thinking about it
18:04 rafasc why isn't there a git stash apply --patch? I want to copy some code from my stash to my working tree. If I understand this correctly, I have to apply the whole patch, create two stash objects with save --patch then apply each one.
18:04 rafasc Is there a technical reason apply doesn't have a --patch?
18:04 tobiasBora By the way, is there any reason to be able to fetch from several repos, but forbid a push to several repos ?
18:05 osse lbr: git fetch;  ls -l .git/FETCH_HEAD;  cat FETCH_HEAD
18:05 kadoban rafasc: Assuming the index is clean, apply the stash, do 'git add -p', use checkout to nuke everything else
18:05 abyx Still looking for a solution.... I need to take the last 3 commits of a feature branch and move them to a new feature branch based off master. Anyone know how to do it?
18:05 kadoban Or you can use checkout -p too
18:05 kadoban abyx: That sounds like exactly rebase
18:06 rafasc oh wait. can you use checkout -p stash{2}?
18:06 lbr Ahh, feck.
18:06 lbr I'm in the wrong directory/repo.  They have matching branch names.  Sorry.
18:07 osse Hahaha :D
18:07 abyx it's not exactly a rebase that i need... Basically i've done work that should have been in its own branch but instead i've got essentially 2 features in the same branch that i want to separate
18:07 osse lbr: but you said remote -v was the same :p
18:07 kadoban abyx: Then rebase and change history on the current feature branch, assuming it hasn't been shared yet.
18:08 lbr Similarly named repos too :/
18:08 lbr osse but yeah, my bad.
18:08 osse de nada
18:09 irco joined #git
18:09 rafasc kadoban: thanks, for some reason I never though of using the stash@{0} reference in the other commands. Forgot that they're just commits. sigh. thanks!
18:09 rafasc
18:09 lbr osse: thanks for working through it anyway, that last command did make it obvious enough :)
18:09 cjohnson abyx: do you absolutely need to keep all three commits separately? or would you be ok with splitting them into two branches and all the changes being merged into one commit in each branch
18:09 cjohnson abyx: if so: git reset HEAD~3 to rewind commit history, and then all your changes from those commits will be unstaged. stage them in hunks using git add -p and only commit changes related to one branch
18:10 jaggz_ joined #git
18:10 osse lbr: that's good. my next suggestion would've been to nuke the dest box from orbit
18:11 cjohnson I feel like that should be the first suggestion
18:11 abyx cjohnson: wait, if it actually unstages like that, can't I just rewind, git stash, then change to a new branch and git apply?
18:11 cjohnson yeah. have you pushed your branch with those 3 changes already?
18:11 abyx i have, yeah :|
18:12 cjohnson ah then you would have to force push, assuming nobody else is using it yet
18:12 kadoban rafasc: 'welcome. I don't usually use them like that either, heh.
18:12 qqx abyx: Easiest way may be to just create a copy of your branch, then use rebase -i in each and pick the commits you want.
18:12 cjohnson if they are, then I would just do a revert
18:12 lep2 joined #git
18:12 abyx the branch i'm trying to pull these commits off of has an active PR
18:12 cjohnson yeah I would revert then. not super clean but it's safe
18:12 finalbeta joined #git
18:13 stomeeth joined #git
18:13 abyx hrm, not familiar with revert
18:13 jimi_ joined #git
18:13 WakiMiko_ joined #git
18:13 stfn joined #git
18:14 Gsham joined #git
18:14 cjohnson it takes your commit and it makes a new commit which is a negative of your old commit
18:14 uebera|| joined #git
18:14 uebera|| joined #git
18:14 jnavila joined #git
18:14 cjohnson so you'll see the original, and the revert, in your history. but then you can just stash/apply and/or cherry-pick or whatever you need to do to rectify, without screwing up anybody else's history
18:15 cjohnson That said if it's *only* in PR state it might be ok to force push. I would attempt a test PR with a force push to be sure
18:16 NeverDie joined #git
18:16 alex1a joined #git
18:17 bluezone joined #git
18:17 nidr0x joined #git
18:17 jstimm joined #git
18:18 bronson joined #git
18:18 sagerdearia joined #git
18:25 texasmynsted how do I reference a path when adding a submodule
18:25 cbreak joined #git
18:25 tyreld joined #git
18:26 texasmynsted Here is what I know works (imagine I have two local repos)  git submodule add ../sampleccl/.git ccl
18:26 texasmynsted what it wrong with that is that I do not want the entire path of the submodule
18:26 texasmynsted I want to do something like this
18:26 texasmynsted git submodule add ../sampleccl/.git/src/common ccl
18:27 jimi_ joined #git
18:27 texasmynsted so that I am only grabbing the src/common path of the designated submodule
18:27 texasmynsted is this possible?
18:28 sbeller texasmynsted: no, a repository is the smallest unit you can work with
18:28 ExoUNX joined #git
18:28 tobiasBora Is it possible to do a clone through the network, for example with something like "git clone --bare myprojet my@myserver.com:my_new_repo.git"
18:28 tobiasBora ?
18:28 scarabx_ joined #git
18:29 r4nd0m-0ne joined #git
18:29 dreiss joined #git
18:29 rom1504 yes
18:29 texasmynsted hmm.
18:29 wwalker joined #git
18:30 joki- joined #git
18:32 texasmynsted would this be a case for git subtree?
18:32 tobiasBora rom1504: You talk to me or texasmynsted ?
18:33 nickabbey joined #git
18:33 porsche944 joined #git
18:34 ejb joined #git
18:35 mikecmpbll joined #git
18:35 m0viefreak joined #git
18:35 finalbeta joined #git
18:35 YuGiOhJCJ joined #git
18:36 texasmynsted hmm subtree looks like it has the same restriction
18:36 kadoban texasmynsted: You can subtree split out of one repo and then subtree add in another if you really want to
18:37 texasmynsted I think I do not really know how subtree works.
18:37 texasmynsted What would you recommend for when you have repo B and only need a part of repo A.  Where repo A is HUGE.
18:38 kadoban Which direction(s) does future history have to go?
18:38 Limes_ joined #git
18:39 texasmynsted future history?
18:39 kadoban Easiest is probably just link them at the filesystem level and leave git out of it. But I imagine that's not what you want?
18:39 robotroll joined #git
18:39 kadoban Yes, do you want the two trees to share history going forward in any way? Are you going to make changes in one that you want to go to the other?
18:40 nicksloan joined #git
18:40 texasmynsted right because then I still need all of repo A and am symlinking to the directory I need for B.
18:40 texasmynsted image that repo B is tiny and repo A is tens of GB
18:41 kadoban Then either just copy the directory over and check it in, or do a subtree split and then a subtree add I guess. Not sure there's many other choices.
18:41 jimi_sanchez joined #git
18:42 rom1504 tobiasBora: you
18:42 texasmynsted I would be happy to manually move changes back to A, if it means that I can have something in B, that only uses part of A.
18:42 DrRobotic joined #git
18:43 rom1504 tobiasBora: that's called a ssh remote
18:43 rom1504 most people use that
18:43 tobiasBora rom1504: Did you notice that ssh is the destination, not the source ?
18:43 rom1504 there is no destination/source concept in git
18:43 rom1504 just remotes
18:44 rom1504 so your remote is "my@myserver.com:my_new_repo.git" here
18:44 MarkFletcher joined #git
18:44 moei joined #git
18:45 porsche944 kadoban: why not a submodule
18:45 porsche944 https://git-scm.com/docs/git-submodule
18:45 texasmynsted so if I have A/src/common that I want shared with B, I would split the A/src/common to its own repo?
18:46 rom1504 "Where repo A is HUGE." my solution is not having a huge repo
18:46 rom1504 it works well
18:46 rom1504 "repo A is tens of GB" very likely that doesn't make any sense
18:46 kadoban porsche944: Also possible. You'd still have to do the subtree split though.
18:46 texasmynsted LOL, yeah.  I agree with not having the repo be huge but I am not able to make that change
18:46 rorro joined #git
18:47 rom1504 even linux is like ~1GB iirc
18:47 texasmynsted yes
18:47 c1arknova joined #git
18:48 spacelord_ joined #git
18:48 texasmynsted there are things in that repo that . . . would not normally be part of a git repo.
18:48 texasmynsted I am not able to make that change.
18:49 uabf joined #git
18:49 texasmynsted and it still would not really solve the problem.  I still need only a part of repo A in repo B
18:49 emg joined #git
18:49 porsche944 what's the issue with it being huge?
18:49 cagedwisdom joined #git
18:49 _Cyclone_ joined #git
18:50 tobiasBora rom1504: Well when you git clone, you clone from a remove, into a folder. Here I called the folder "destination", and I tried, when I run something like "git clone --bare <my project folder> me@myserver:~/myproject.main", it does not work, it create instead a folder named "me@myserver..." and put the clone here...
18:50 tobiasBora *remote
18:50 garethdaine joined #git
18:50 texasmynsted what do you mean, why is it being large a problem, or why is it large?
18:50 porsche944 being a problem
18:50 porsche944 is it just the initial setup?
18:51 porsche944 or is that you don't want to have all of the git commits muddying up your other repo
18:51 texasmynsted Because if you do not have enough free space you run out of space pulling down the repo
18:51 aavrug_ joined #git
18:51 jimi_ joined #git
18:51 lep2 left #git
18:51 porsche944 what type of project is it
18:51 porsche944 isn't there an output like an assembly or something
18:52 texasmynsted Why pull down 80 GB for a few KB of source?
18:52 leprechau joined #git
18:52 bronson joined #git
18:52 fatalhalt joined #git
18:53 texasmynsted So for subtree.
18:53 matsaman joined #git
18:53 rom1504 porsche944: "what's the issue with it being huge?" conception problem
18:53 texasmynsted would it be true that I would split the A repo so that the common directory would be in its own repo.  Then join it back to the A repo and B repo?
18:54 rom1504 tobiasBora: oh
18:54 rom1504 you can't do that
18:54 tobiasBora too bad...
18:54 rom1504 just add the remote
18:54 rom1504 then push to it
18:54 rom1504 git add remote <read the man>
18:54 kadoban texasmynsted: You'd probably just join it back to the B repo and leave it alone in the A repo
18:54 rom1504 then git push
18:55 tobiasBora rom1504: Even if nothing is present on the server ?
18:57 emg joined #git
18:57 texasmynsted so when I split, does that make a new repo inside and exiting repo?
18:57 synthroid joined #git
18:58 jccn joined #git
18:58 texasmynsted I am reading the man page for subtree, trying to understand what split does.
18:58 rom1504 tobiasBora: no you need to at least do git init --bare in the "destination" folder
18:59 jimi_ joined #git
19:02 kulelu88 joined #git
19:02 cbreak or have an auto creation script like gitolite's wild repos
19:03 rnsanchez joined #git
19:04 aard_ joined #git
19:06 overlord_tm joined #git
19:08 texasmynsted what does a git subtree split do?
19:08 jimi_ joined #git
19:08 texasmynsted does it make a new .git directory?
19:08 Sasazuka__ joined #git
19:09 chardan joined #git
19:09 rafasc left #git
19:10 chardan_ joined #git
19:10 causasui joined #git
19:11 sdothum joined #git
19:12 jstimm joined #git
19:12 tnecniv joined #git
19:12 jimi_ joined #git
19:12 noodle joined #git
19:15 _ADN_ joined #git
19:16 durham joined #git
19:18 dsantiago joined #git
19:18 xberg joined #git
19:18 yanome joined #git
19:19 Random832 if the problem is total repo size why not make a shallow clone
19:19 msonntag joined #git
19:19 mda joined #git
19:19 apitheia joined #git
19:20 dsantiag_ joined #git
19:21 apitheia I've got some bash functions in my .bashrc, any idea how to call them from a git alias?  It keeps saying they don't exist
19:21 novas0x2a|laptop joined #git
19:21 ahmedelgabri joined #git
19:23 troppie joined #git
19:24 texasmynsted cloning with —depth 1 or something should help
19:24 texasmynsted I still need the right way to share a directory with two repos
19:26 tobiasBora rom1504: Ok thank you
19:26 kadoban texasmynsted: Read more, try some examples, etc.
19:27 texasmynsted so it sounds like git subtree split will collect all the commits for a subdirectory, then permit me to create a separate repo for that sub directlory
19:27 texasmynsted then I can join back the separate repo as a subtree (which I do not know how works) or as a submodule, that I have used before.
19:27 bannakaffalatta joined #git
19:28 boiaz9 joined #git
19:28 jimi_ joined #git
19:29 Flowinho joined #git
19:29 jaguarmagenta joined #git
19:30 e14 joined #git
19:31 manuels joined #git
19:32 GavinMagnus joined #git
19:32 jimi_ joined #git
19:33 Domhack joined #git
19:33 mar77i joined #git
19:37 f3r70rr35f joined #git
19:37 jimi_ joined #git
19:37 GavinMagnus joined #git
19:38 thesha joined #git
19:38 e14 joined #git
19:41 jimi_ joined #git
19:42 aollier joined #git
19:43 f3r70rr35f joined #git
19:43 yanome joined #git
19:44 cdown joined #git
19:44 GavinMagnus left #git
19:47 garethdaine joined #git
19:47 jccn joined #git
19:48 f3r70rr35f joined #git
19:49 tobiasBora I have a question : if I change a server hook linked with a received push, and push it on a server, is it the old received push which is run or the new one ?
19:49 tobiasvl what
19:49 nicksloan joined #git
19:49 cdown_ joined #git
19:51 tobiasBora if I push on a client something in .git/hooks/post-receive, and push it on a git server, will it be transfered on the git server ? If yes, is it run the first time or not ?
19:51 tobiasvl I'm not sure I understand you correctly, but you can't push git hooks
19:51 aollier joined #git
19:52 mentazoom joined #git
19:53 tobiasvl they're local to a repo
19:53 mentazoom I have tried for hours now, but still get: error: could not lock config file xyz.gitconfig: No such file or directory
19:54 mentazoom any idea how to fix it?
19:54 tobiasvl mentazoom: when do you get that?
19:54 Flowinho joined #git
19:54 mentazoom tobiasvl when I use --global user.email
19:55 tobiasBora tobiasvl: Hum too bad...
19:55 tobiasBora To their no way to push a hook to a git repo ?
19:56 tobiasvl mentazoom: strange that it looks for a file called "xyz.gitconfig"
19:56 tobiasvl tobiasBora: no. that'd be a security risk
19:56 tobiasBora ok
19:56 tobiasBora thank you
19:56 Macaveli joined #git
19:56 mentazoom tobiasvl Sorry i renamed it for here, it is looking for /Users/"my user"/.gitconfig
19:57 tobiasvl mentazoom: oh, ok. well, does that file exist? what are its permissions?
19:57 navidr joined #git
19:58 mentazoom tobiasvl What was the command to check that again?
19:59 mentazoom tobiasvl  1 "my user"  staff
19:59 mentazoom ops
19:59 mentazoom lrwxr-xr-x  1 "my user"  staff
19:59 kk joined #git
20:00 mentazoom tobiasvl ^
20:01 mentazoom lrwxr-xr-x  1 "my user"  staff  33 Aug  8 03:20 /Users/akil_91/.gitconfig -> /Users/"my user"/dotfiles/gitconfig
20:01 garethdaine joined #git
20:02 mentazoom lrwxr-xr-x  1 "my user"  staff  33 Aug  8 03:20 /Users/"my user"/.gitconfig -> /Users/"my user"/dotfiles/gitconfig
20:02 mentazoom any idea?
20:02 CubiK joined #git
20:02 tobiasvl well it's a symlink
20:02 xberg joined #git
20:02 tobiasvl what's the permissions of the file the link points to
20:03 mentazoom No such file or directory
20:03 mentazoom hm
20:04 tobiasvl well there you go?
20:04 tobiasvl maybe?
20:04 mentazoom what should i do then?
20:04 tobiasvl just touch it I guess?
20:04 tobiasvl why isn't it there? it seems you expected it to be there
20:04 tobiasvl you have created a symlink and everything
20:04 msonntag joined #git
20:05 mentazoom it's something about brew git and usual git getting confused by each other i think
20:05 jnavila joined #git
20:05 mentazoom i tried to uninstall both and reinstall brew
20:05 tobiasvl ok, no idea what that means, but did you not create the "dotfiles" directory?
20:05 stomplee joined #git
20:05 mentazoom tobiasvl Yea I think so long time ago
20:05 tobiasvl I don't know if this is the problem, mind you, you would perhaps think git could create a file pointed to by a symlink, but who knows
20:06 mentazoom is it just touch "filename" ?
20:06 tobiasvl yeah, I doubt brew would mess with the location of dotfiles, must be something you've done
20:06 tobiasvl yeah
20:06 tobiasvl check if there's a file called ~/.gitconfig.lock too btw
20:06 tobiasvl just in case
20:07 mentazoom No such file or directory
20:07 mentazoom i thought i checked it wtf
20:07 MrWoohoo joined #git
20:07 qqx Is it just the dotfiles/gitconfig file that doesn't exist, or the entire dotfiles directory?
20:07 aollier jnavila: bonsoir
20:07 hahuang61 joined #git
20:08 tobiasvl yeah apparently the whole directory, that explains why git couldn't create the file itself :P
20:08 mentazoom qqx Whole it seems like
20:08 tobiasvl then I would just remove the symlink
20:08 mentazoom so what should i do first now?
20:08 tobiasvl start fresh with a new .gitconfig that's actually in ~
20:08 tobiasvl if you're not even using a separate dotfiles repo or anything anyway
20:08 mentazoom so touch ~/.gitconfig.lock ?
20:08 tobiasvl no no
20:08 Domhack joined #git
20:09 tobiasvl you don't want that file to exist
20:09 mentazoom oh
20:09 mablae joined #git
20:09 mentazoom i need five year old guide :p
20:09 bronson joined #git
20:09 tobiasvl just "rm /Users/akil_91/.gitconfig" at this point and it should work. if you don't need it symlinked anywhere anyway
20:10 mentazoom nothing else to do?
20:10 tobiasvl don't think so, git should just create the file next time you run "git config --global"
20:10 irqq joined #git
20:10 mentazoom DAAAM, it worked
20:10 mentazoom thanks mate
20:10 tobiasvl np
20:11 Livecodingtv_Ale joined #git
20:12 jnavila joined #git
20:13 jimi_ joined #git
20:13 aollier left #git
20:13 kk left #git
20:14 VladGh joined #git
20:16 aidalgol joined #git
20:18 durham joined #git
20:19 Es0teric joined #git
20:20 durham joined #git
20:23 Orion3k joined #git
20:24 noecc left #git
20:24 GavinMagnus joined #git
20:24 zlag joined #git
20:25 NeverDie joined #git
20:29 kk joined #git
20:33 phox left #git
20:38 venmx joined #git
20:39 Atm0spher1c joined #git
20:43 ayjay_t joined #git
20:43 nickabbey joined #git
20:44 jccn joined #git
20:45 mar77i_ joined #git
20:48 star_prone joined #git
20:49 Jackneill_ joined #git
20:49 afuentes joined #git
20:56 thiago joined #git
20:57 safe joined #git
21:00 meZee joined #git
21:00 wrouesnel1 joined #git
21:01 Learath2 joined #git
21:03 muelli joined #git
21:05 mSSM joined #git
21:05 dsdeiz joined #git
21:06 mSSM I have unstaged changes to several files, but realized that I want to undo the deletion of several lines in one file. Is there a way to do that?
21:07 askb joined #git
21:07 mSSM I have tried to partially stash the added lines in that file without stashing the deleted lines, but I get complains about the patch not applying.
21:07 mSSM complaints*
21:08 xaa__ joined #git
21:08 kadoban mSSM: You can probably use 'checkout -p', look up what it does though, and make a !backup first probably just in case
21:08 gitinfo mSSM: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
21:10 bronson joined #git
21:10 guest___ joined #git
21:11 howitdo joined #git
21:12 umbSublime joined #git
21:16 howitdo joined #git
21:17 refried_ joined #git
21:19 mSSM kadoban: Fantastic, I think checkout -p did what I wanted it to.
21:19 mSSM Bit wonky, because I need to select what I want to discard when issuing `e'. :-)
21:22 kadoban Ya, when it's a contiguous block, git would have no idea how you want to split it up.
21:22 cdown joined #git
21:24 cdown_ joined #git
21:24 ELFrederich joined #git
21:25 ELFrederich in a project with submodules is there a way I can make sure all the submodules are checked out at the proper commit but be on a local 'master' branch rather then detached?
21:25 HoierM joined #git
21:25 tnecniv joined #git
21:27 Rodya_ joined #git
21:29 jstimm joined #git
21:29 e14 joined #git
21:30 jaguarmagenta joined #git
21:31 umbSublime joined #git
21:31 umbSublime joined #git
21:33 Vinnie_win_u joined #git
21:33 garethdaine joined #git
21:33 Synthead joined #git
21:33 cyan__ joined #git
21:37 johnmilton joined #git
21:37 kfoonamalik joined #git
21:38 jstimm joined #git
21:38 ELFrederich git submodule foreach 'git fetch --all --prune'
21:38 ELFrederich whoops... wrong paste
21:39 ELFrederich This is what I do now... totally hacky, I'm sure there is a better way.  git submodule update && git submodule foreach 'git push -f . HEAD:master; git checkout master'
21:40 oskarkv joined #git
21:41 silicong joined #git
21:44 disi joined #git
21:46 ikonia joined #git
21:48 ikonia I'm trying to understand why my local git repo is missing a tag when the remote master has been updated to contain new tags. The wordpress git repo https://github.com/WordPress/WordPress/tree/4.7 now has a tag for 4.7, however if I do a "git tag" on my local repo (on master) I only see 4.6.1
21:48 ikonia I can't see a situation where the tags would not show on my local repo
21:48 star_prone joined #git
21:49 jeffreylevesque joined #git
21:49 ikonia certainly appreciate any insight as to why I'd not see the new tag locally
21:49 synthroid joined #git
21:50 d0nn1e joined #git
21:51 Gsham joined #git
21:51 vishal joined #git
21:56 venmx joined #git
22:00 shgysk8zer0 joined #git
22:00 guest___ joined #git
22:00 mentazoom joined #git
22:02 anuxivm joined #git
22:02 preaction did you pull the remote's tags?
22:02 sofly joined #git
22:03 prg318 joined #git
22:03 sofly so if I have a repo and want to merge all upstream commits back to mine but as a single commit, do I want to do a rebase?
22:03 ikonia yeah, I've just figured out what went on
22:03 ikonia a fetch --tags pulled the new tags
22:03 synthroi_ joined #git
22:03 ikonia however if I then checkout tags/new-tag it moves it onto a deteched branch
22:03 sofly so i have 2 commits now and I want a third one that's just one commit merging upstream. trying to do this via CLI and not a PR
22:03 ikonia that doesn't seem right ?
22:04 ikonia shouldn't my current working local repo just be updated to the new tag
22:04 prg318 Let's say I have release branch 1.x and release branch 2.x .. Then, I created branch "foobar" from release 2.x and merged it back into 2.x .. Is there any way in git for me to merge "foobar" back to release 1.x branch?
22:04 emg joined #git
22:05 shgysk8zer0 left #git
22:06 ams__ joined #git
22:06 Vinnie_win joined #git
22:06 sofly git merge --squash upstream/master works... classic simple answer. love git :)
22:07 tchan joined #git
22:07 WaReZ joined #git
22:07 ikonia never mind again, figured out, need to clean my local repo, sorry
22:08 blackwind_123 joined #git
22:09 mischat joined #git
22:10 mSSM left #git
22:11 bronson joined #git
22:12 jimi_sanchez joined #git
22:14 jimi joined #git
22:15 e14 joined #git
22:16 jimi joined #git
22:17 nettoweb joined #git
22:18 railssmith joined #git
22:21 mindriot101 joined #git
22:21 bronson joined #git
22:23 mindriot101 left #git
22:24 _ADN_ joined #git
22:24 bronson joined #git
22:24 sunri5e joined #git
22:27 sea-gull_ joined #git
22:27 jimi_sanchez joined #git
22:28 aidalgol joined #git
22:30 synthroid joined #git
22:31 Noldorin joined #git
22:31 sbeller ELFrederich: lookup git push --recurse-submodules
22:34 Rodya_ joined #git
22:35 nettoweb1 joined #git
22:37 bronson joined #git
22:39 xaa__ joined #git
22:42 lb1c prg318 sure.
22:42 glebihan joined #git
22:42 lb1c prg318 like any other branch ... git checkout release 1.x && git merge foobar
22:43 scarabx_ left #git
22:47 emg joined #git
22:51 nettoweb joined #git
22:56 nettoweb joined #git
23:00 texasmynsted what is the issue with trying to rebase after adding a subtree?
23:01 fmeerkoetter joined #git
23:01 nwkj86 joined #git
23:02 kyan joined #git
23:06 venmx joined #git
23:08 chardan joined #git
23:10 vdv joined #git
23:11 sdothum joined #git
23:15 nicksloan joined #git
23:16 star_prone joined #git
23:20 jccn joined #git
23:20 dsdeiz joined #git
23:20 dsdeiz joined #git
23:21 Awesomecase joined #git
23:22 fmcgeough joined #git
23:24 dendazen joined #git
23:24 davimore_ joined #git
23:26 prg318 lb1c: awesome - that's what i was thinking but wanted to double check.. much appreciated!
23:28 thierryp joined #git
23:28 holgersson joined #git
23:31 brent__ joined #git
23:31 jaguarmagenta joined #git
23:33 Derderderd joined #git
23:34 bronson joined #git
23:44 tmsmith joined #git
23:52 runlevl4 joined #git
23:53 nwkj86 joined #git
23:53 Spec-Chum joined #git
23:54 GavinMagnus left #git
23:54 thiago joined #git
23:54 Anja joined #git
23:59 rubyonrailed joined #git

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