Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-24

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

All times shown according to UTC.

Time Nick Message
00:01 bremner !ignore untracked
00:01 gitinfo [!ignore_dir] Git doesn't track directories, so you can't ignore them. If you want them ignored, ignore the files in the directory. Matching a directory in .gitignore means you ignore all files in that directory
00:01 bremner err. not that.
00:01 tgies joined #git
00:02 Ryiya_ joined #git
00:07 Random832 git doesn't track directories?
00:08 ISmithers joined #git
00:08 synchronous joined #git
00:09 alex1a joined #git
00:09 bremner that is correct
00:11 romerocesar joined #git
00:11 tgies joined #git
00:11 romerocesar joined #git
00:13 cdown joined #git
00:16 noyb joined #git
00:16 tgies joined #git
00:18 dreiss joined #git
00:19 |ifei5g00d joined #git
00:20 jaafar joined #git
00:21 Spacew00t joined #git
00:21 tgies joined #git
00:24 mizu_no_oto joined #git
00:26 tgies joined #git
00:27 kaldoran joined #git
00:29 truetuna joined #git
00:31 CEnnis91 joined #git
00:33 afuentes joined #git
00:35 sharkz- joined #git
00:36 martinbjeldbak joined #git
00:36 tgies joined #git
00:38 rivarun joined #git
00:38 mizu_no_oto joined #git
00:41 tgies joined #git
00:41 jack_ joined #git
00:42 ilmari_ joined #git
00:42 imMute^ joined #git
00:42 dsop_ joined #git
00:42 styx__ joined #git
00:42 robogoat_ joined #git
00:42 bambams_ joined #git
00:42 roue_ joined #git
00:42 tvl joined #git
00:42 catsup_ joined #git
00:42 tonyj_ joined #git
00:42 maxb_ joined #git
00:42 runlevl4_ joined #git
00:42 jephsf_ joined #git
00:42 Seveas_ joined #git
00:42 ghoti_ joined #git
00:42 Marbug_ joined #git
00:42 angseus_ joined #git
00:42 mikap joined #git
00:42 lmat_ joined #git
00:42 Mathiasdm joined #git
00:42 sunny256 joined #git
00:42 Soliton_ joined #git
00:43 pothepanda joined #git
00:43 rxo_ joined #git
00:43 RickyB98 joined #git
00:43 RickyB98 joined #git
00:43 ftoulemon joined #git
00:43 gravitron_ joined #git
00:44 grawity joined #git
00:44 SJr joined #git
00:45 sagerdearia joined #git
00:45 thiago joined #git
00:46 bocaneri joined #git
00:46 cdown_ joined #git
00:46 tgies joined #git
00:47 scarcry joined #git
00:47 BinGOs joined #git
00:48 pokalyis joined #git
00:49 dreiss joined #git
00:49 BlessJah joined #git
00:50 gigq_ joined #git
00:50 cdown_ joined #git
00:50 SJrX joined #git
00:50 fstd_ joined #git
00:50 tristanp_ joined #git
00:51 CalimeroTeknik_ joined #git
00:51 tjone270_ joined #git
00:51 ghoti joined #git
00:51 tgies joined #git
00:52 hypera1r joined #git
00:52 gravitron joined #git
00:52 ekinmur joined #git
00:52 Bizkit joined #git
00:52 Orphis_ joined #git
00:52 mchl_nix_ joined #git
00:52 Werring` joined #git
00:52 Bizkit joined #git
00:52 ghostlight joined #git
00:53 hwoarang_ joined #git
00:53 Stummi joined #git
00:53 montyboy joined #git
00:53 disi joined #git
00:53 Sigma joined #git
00:54 dsantiago joined #git
00:54 Mir4g3 joined #git
00:54 howitdo joined #git
00:55 zivester joined #git
00:55 thiago joined #git
00:56 harish joined #git
00:56 monoxane joined #git
00:56 irqq joined #git
01:01 tgies joined #git
01:01 durham joined #git
01:03 topi`_ joined #git
01:04 dreiss joined #git
01:04 kenansulayman joined #git
01:04 wagle_ joined #git
01:05 omegak_ joined #git
01:05 cdown_ joined #git
01:05 aboccia joined #git
01:05 thiago joined #git
01:06 irqq joined #git
01:06 romerocesar_ joined #git
01:06 dmtucker joined #git
01:06 tgies_ joined #git
01:06 jeffreylevesque joined #git
01:07 nellicus_ joined #git
01:08 d^sh joined #git
01:09 JamesBaxter joined #git
01:11 converge joined #git
01:11 converge joined #git
01:11 tgies joined #git
01:16 tgies joined #git
01:18 peepsalot joined #git
01:18 runlevl4 joined #git
01:18 finalbeta joined #git
01:19 ekinmur joined #git
01:19 mns joined #git
01:19 diogenese joined #git
01:26 tgies joined #git
01:27 lightstalker joined #git
01:28 thiago joined #git
01:29 smithbone_ joined #git
01:30 synthmea1 joined #git
01:30 Grum joined #git
01:31 dreiss joined #git
01:31 mutex_ joined #git
01:31 suy_ joined #git
01:31 holdsworth_ joined #git
01:31 rewt`` joined #git
01:31 danmackay_ joined #git
01:31 tgies joined #git
01:31 nephyrin` joined #git
01:32 daemoen_ joined #git
01:32 h264 joined #git
01:32 h264 joined #git
01:32 wwalker joined #git
01:33 cxreg joined #git
01:33 nopf joined #git
01:33 kanzure joined #git
01:33 Pieter_ joined #git
01:33 Vauff joined #git
01:33 likewhoa joined #git
01:33 Kuukunen joined #git
01:33 cizra joined #git
01:33 gkatsev joined #git
01:33 reda joined #git
01:33 Levex joined #git
01:33 lu_zero joined #git
01:33 iveqy_ joined #git
01:33 boz_v1 joined #git
01:33 meLon joined #git
01:33 DistantStar joined #git
01:33 ec\ joined #git
01:34 leTali joined #git
01:34 systmkor joined #git
01:34 vmiklos joined #git
01:36 Kronuz joined #git
01:36 cworth joined #git
01:36 tgies joined #git
01:36 cmn joined #git
01:36 Cerise joined #git
01:36 Cerise joined #git
01:36 SirCmpwn joined #git
01:36 rideh joined #git
01:36 weylin joined #git
01:36 ManiacTwister joined #git
01:36 DonRichie joined #git
01:37 spriz joined #git
01:37 Timvde joined #git
01:37 ariver joined #git
01:37 hiroki joined #git
01:37 hiroki joined #git
01:37 simon816 joined #git
01:37 BrianBlaze420 joined #git
01:37 WebDawg joined #git
01:37 jokajak joined #git
01:37 AlgorithmWizard joined #git
01:37 XVar joined #git
01:37 cafuser0b joined #git
01:37 Dyonisos joined #git
01:37 ThiefMaster joined #git
01:37 Sc0rpius joined #git
01:37 nkhoit joined #git
01:37 on1x joined #git
01:37 woodruffw joined #git
01:37 ozymandias_ joined #git
01:37 yonatankoren joined #git
01:37 woodruffw joined #git
01:37 MapMan joined #git
01:38 varesa joined #git
01:38 sparetire joined #git
01:38 fugiman joined #git
01:38 jgornick joined #git
01:38 Vadtec joined #git
01:38 BeerSerc joined #git
01:38 romerocesar joined #git
01:38 abax joined #git
01:38 bttf joined #git
01:38 hoylemd joined #git
01:38 varesa joined #git
01:38 HelloShitty joined #git
01:39 Ankhers joined #git
01:46 liberpater joined #git
01:46 markmarkmark joined #git
01:46 malide joined #git
01:46 mlq joined #git
01:46 indieross joined #git
01:46 roflin joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
01:50 ghostlight joined #git
01:50 jaeckel joined #git
01:50 star_prone joined #git
01:51 tgies joined #git
01:52 tomzx joined #git
01:52 mizu_no_oto joined #git
01:53 liuzhen joined #git
01:55 pks joined #git
01:56 tgies joined #git
01:59 bruce_lee joined #git
01:59 bruce_lee joined #git
01:59 danslo joined #git
01:59 harish joined #git
01:59 romerocesar joined #git
02:01 Boniche joined #git
02:04 bl0w3d_0ut joined #git
02:04 ochorocho__ joined #git
02:05 truetuna joined #git
02:06 tgies joined #git
02:10 Rodya_ joined #git
02:10 EmeraldExplorer joined #git
02:11 tgies joined #git
02:13 nettoweb joined #git
02:14 archaic joined #git
02:14 andlabs joined #git
02:15 noyb joined #git
02:16 SwiftMatt joined #git
02:16 tgies joined #git
02:18 Kaisyu joined #git
02:20 romerocesar joined #git
02:21 hexagoxel_ joined #git
02:21 tgies joined #git
02:26 hexagoxel joined #git
02:29 harish joined #git
02:30 BinaryBench joined #git
02:30 iamthad joined #git
02:31 tgies joined #git
02:31 iamthad_ joined #git
02:32 boombatower joined #git
02:33 kanzure joined #git
02:33 whomp joined #git
02:36 tgies joined #git
02:38 Rodya_ joined #git
02:41 romerocesar joined #git
02:41 tgies joined #git
02:43 chachasmooth joined #git
02:45 lagothrix joined #git
02:46 tgies joined #git
02:47 PioneerAxon joined #git
02:47 arescorpio joined #git
02:48 lb1c joined #git
02:50 xall joined #git
02:50 jost_ joined #git
02:51 star_prone joined #git
02:54 xall_ joined #git
02:55 EmeraldExplorer joined #git
02:55 sagerdearia joined #git
02:56 tgies joined #git
02:59 Fissure joined #git
02:59 danslo joined #git
03:01 tgies joined #git
03:01 romerocesar joined #git
03:03 e14 joined #git
03:03 sagerdearia joined #git
03:05 aavrug joined #git
03:06 tgies joined #git
03:07 e14_ joined #git
03:08 lolmac joined #git
03:09 noyb joined #git
03:09 zamabe joined #git
03:16 Vortex34 joined #git
03:16 navidr joined #git
03:16 tgies joined #git
03:16 mangolisk_ joined #git
03:17 al-damiri joined #git
03:18 truetuna joined #git
03:19 _28_ria joined #git
03:20 buddyq joined #git
03:21 tgies joined #git
03:22 romerocesar joined #git
03:23 perrier-jouet joined #git
03:23 aidalgol joined #git
03:24 SwiftMatt joined #git
03:27 kdeal joined #git
03:28 jazz_vibes joined #git
03:28 pokalyis joined #git
03:34 robotroll joined #git
03:35 mangolisk__ joined #git
03:36 tgies joined #git
03:36 Rampages joined #git
03:40 noyb joined #git
03:41 tgies joined #git
03:43 romerocesar joined #git
03:48 ahr3n joined #git
03:52 star_prone joined #git
03:52 Shock_ joined #git
03:52 lindenle joined #git
03:53 pwnz0r joined #git
03:56 al-damiri joined #git
03:56 tgies joined #git
03:58 pwnz0r joined #git
04:01 tgies joined #git
04:03 andlabs left #git
04:04 romerocesar joined #git
04:05 rchavik joined #git
04:06 tgies joined #git
04:13 al-damiri joined #git
04:14 xall_ joined #git
04:15 basiclaser joined #git
04:15 xcesariox joined #git
04:16 tgies joined #git
04:21 xameada_ joined #git
04:22 Andrew_K joined #git
04:23 mar77i_ joined #git
04:25 romerocesar joined #git
04:25 howdoi joined #git
04:26 tgies joined #git
04:31 tgies joined #git
04:31 overlord_tm joined #git
04:32 Cabanossi joined #git
04:37 mrpackethead joined #git
04:39 tristanp joined #git
04:39 howdoi joined #git
04:39 basiclaser joined #git
04:40 sunri5e joined #git
04:41 daey_ joined #git
04:41 tgies joined #git
04:42 buddyq i do git status and it says wp-content/
04:42 buddyq why?
04:42 buddyq wordpress obviously...
04:43 brokensyntax joined #git
04:45 romerocesar joined #git
04:46 tgies joined #git
04:47 ShapeShifter499 joined #git
04:48 Limes_ joined #git
04:49 ShapeShifter499 joined #git
04:49 brillenfux joined #git
04:54 joki joined #git
04:55 durham joined #git
04:56 tgies joined #git
04:56 ayjay_t joined #git
04:57 subhojit777 joined #git
04:57 durham joined #git
05:06 romerocesar joined #git
05:09 PioneerAxon joined #git
05:10 xall_ joined #git
05:11 jozwior joined #git
05:11 tgies joined #git
05:11 t4nk220 joined #git
05:14 sagerdearia joined #git
05:14 star_prone joined #git
05:16 ShapeShifter499 joined #git
05:17 tgies joined #git
05:17 phaleth joined #git
05:18 Dohplay joined #git
05:20 mehola joined #git
05:21 ShapeShifter499 joined #git
05:22 dan2k3k4 joined #git
05:23 bmahe joined #git
05:23 netj joined #git
05:26 tgies joined #git
05:27 romerocesar joined #git
05:29 jozwior joined #git
05:31 tgies joined #git
05:35 dryrun joined #git
05:36 diogenese joined #git
05:37 romerocesar joined #git
05:40 pokalyis joined #git
05:42 diogenese joined #git
05:45 Phylock joined #git
05:46 tgies joined #git
05:49 LucaTM joined #git
05:50 ThomasLocke joined #git
05:50 ThomasLocke joined #git
05:51 tgies joined #git
05:56 corpsicle is there a way to only see number of commits differing between two branches?
05:56 tgies joined #git
05:57 Raging_Hog joined #git
05:57 emPi joined #git
05:58 phroa corpsicle: I think you want "git cherry branch1 branch2" (man git-cherry)
05:58 gitinfo corpsicle: the git-cherry manpage is available at http://jk.gs/git-cherry.html
05:58 corpsicle ah
05:58 corpsicle cool, thanks
05:59 pwnz0r joined #git
06:00 corpsicle close
06:00 corpsicle i just want the number of commits, not the actual hashes =)
06:00 corpsicle i could calculate it myself of course
06:00 phroa | wc -l :P
06:01 phroa zzz
06:01 lordjancso joined #git
06:01 tgies joined #git
06:02 corpsicle yea =)
06:02 zeroed joined #git
06:02 zeroed joined #git
06:03 phanimahesh joined #git
06:04 LucaTM joined #git
06:04 Jameser joined #git
06:06 dodobrain joined #git
06:06 freimatz joined #git
06:07 romerocesar joined #git
06:10 cizra left #git
06:11 tgies joined #git
06:12 liuzhen joined #git
06:12 nevodka joined #git
06:13 alcohol joined #git
06:13 nevodka left #git
06:14 rscata joined #git
06:15 shubhnik joined #git
06:16 synthmeat joined #git
06:16 titankiller joined #git
06:16 tgies joined #git
06:16 dreiss joined #git
06:16 sonvh joined #git
06:17 txdv joined #git
06:19 GT4066 joined #git
06:20 JeroenT joined #git
06:21 tgies joined #git
06:22 solrize joined #git
06:23 star_prone joined #git
06:26 algun joined #git
06:26 chele joined #git
06:26 star_prone joined #git
06:28 romerocesar joined #git
06:29 patric joined #git
06:30 JeroenT joined #git
06:30 elect joined #git
06:31 algun How do I get the last file revision, rather than contents of the file at the last branch(es) revision?
06:31 JeroenT_ joined #git
06:32 jozwior joined #git
06:33 apxm joined #git
06:33 harleyyyyymayes joined #git
06:33 Knirch algun: the last commit that touched the specified file? or the sha1 for the file as it looks right now?
06:33 algun its contents
06:35 Knirch algun: http://7fa1fd48006e9121.paste.se/ this is something I use for a build system
06:36 finalbeta joined #git
06:36 tgies joined #git
06:36 Knirch (off topic, now I realize that I can get rid of the {} in that function)
06:37 corsibu joined #git
06:37 Knirch (oh, those excess {} comes from how declare spits it out, nm)
06:37 algun Knirch: whose hash is %H?
06:37 whomp joined #git
06:38 Knirch algun: that's just something I needed for my build system, where I needed to know if the dir had changed, what you're after is in the else
06:38 algun am I though?
06:38 algun Don’t I need the hash of the second-to-last commit to pass to git show ?
06:38 Knirch unclear, the second part sounds like what you were asking for
06:38 algun ls?
06:39 apxm joined #git
06:40 shubhnik joined #git
06:40 haavard joined #git
06:40 corpsicle im gonna ask again if anyone knows anything other than cherry that gives me the commits that differ between two branches. i would like to get something similar to "Your branch is ahead of 'origin/release' by 2 commits." like i get when i merge
06:41 Knirch algun: the function I pasted will give you the blobs sha1 of the specified file, or the commit hash for a directory
06:41 corpsicle when i do cherry between the branches i dont get the same results =/
06:41 Knirch algun: maybe I misunderstood your question
06:41 tgies joined #git
06:41 leeN joined #git
06:41 xall_ joined #git
06:42 haavard I have converted an SVN repository to a Git one with svn2git. There were some hurdles with a branch that has whitespace in its name, where I had to manually rename some refs in the process. Now that the process completed, I'm getting an error in gc.log:  fatal: unable to parse object: refs/remotes/svn/branch with whitespace, error: failed to run prune
06:42 haavard What do I have to do to recover?
06:42 lb corpsicle dont really get what you mean by 'cherry between the branches' but the diff beweteen 2 identifiers (branches) can be calculated with git log. man gitrevisions. e.g. git log featurebranch ^master
06:42 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
06:42 fees joined #git
06:44 haavard Running git gc in the foreground tells me "fatal: bad object <branch>, error: failed to run repack"
06:44 algun Knirch: I think I need this: git show "$(git log --skip=1 --max-count=1 --pretty="%H" $file):./$file”
06:44 JeroenT joined #git
06:46 tgies joined #git
06:47 cyan__ joined #git
06:47 Knirch algun: right you wanted the previous version of the file, missed that part
06:47 algun i misspoke anyway
06:48 algun and your code helped so all is good, thanks
06:48 Knirch \o/
06:48 Knirch nice
06:49 romerocesar joined #git
06:49 corpsicle lb: well if i do git cherry branch1 branch2 i get a list of all commits that differ
06:49 sonvh joined #git
06:50 corpsicle lb: but i would want it to just tell me the number of commits like the example above
06:50 corpsicle i dont see how git log does that?
06:50 corpsicle but i might be missing something
06:50 solrize joined #git
06:50 solrize joined #git
06:51 titankiller joined #git
06:51 dsdeiz joined #git
06:51 dsdeiz joined #git
06:53 qt-x joined #git
06:53 zulutango joined #git
06:54 navidr joined #git
06:54 phanimahesh joined #git
06:54 diogenese joined #git
06:56 tgies joined #git
06:57 Sceorem joined #git
06:57 lb corpsicle output of git log can be manipulated with the --format parameter. a git log --oneline | wc - l pretty much does what you want... there is no neat 'git givemeaniceoutput' command, so you have to script it (which pretty mich is the oneliner mentioned...)
06:58 CtrlC joined #git
06:58 Macaveli joined #git
06:59 CtrlC I have two repositories in bitbucket. How can I group them into a third repository?
06:59 lindenle joined #git
07:00 lb CtrlC !subtree
07:00 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-To​ols-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
07:00 CtrlC Thank you.
07:00 lb !submodule
07:00 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
07:00 xall_ joined #git
07:00 lb CtrlC more than 1 option
07:00 CtrlC Seems projects can do that for me too.
07:01 CtrlC Not a repo but groups them together.
07:01 lb CtrlC yes projects can namespace a bunch of repos ....
07:01 tgies joined #git
07:02 zamabe Can you specify that you want a specific part of the subtree's tree?
07:02 zamabe remote:plugins/ inserted at ./plugins/ ?
07:03 raphink joined #git
07:06 tgies joined #git
07:07 cyan__ joined #git
07:08 JeroenT_ joined #git
07:08 danslo joined #git
07:08 JeroenT_ joined #git
07:09 umpc joined #git
07:09 cdown joined #git
07:09 xall joined #git
07:10 romerocesar joined #git
07:11 kdeal joined #git
07:13 Darcidride joined #git
07:13 ISmithers joined #git
07:13 PioneerAxon joined #git
07:14 qpdb joined #git
07:14 Bizkit joined #git
07:15 NERV-X27 joined #git
07:16 kimonorouge joined #git
07:16 tgies joined #git
07:17 nilg joined #git
07:19 sea-gull joined #git
07:21 tgies joined #git
07:22 jrm joined #git
07:23 inflames joined #git
07:25 apotry joined #git
07:25 parrotriver joined #git
07:25 xall_ joined #git
07:26 sagerdearia joined #git
07:26 tgies joined #git
07:27 Balliad joined #git
07:28 Alienpruts joined #git
07:29 brk_ joined #git
07:30 sLite joined #git
07:30 romerocesar joined #git
07:31 tgies joined #git
07:31 finalbeta joined #git
07:33 danslo joined #git
07:35 CtrlC I've set up socks config for git using git config https.proxy 'socks5://127.0.0.1:9000' but it doesn't seem to work still. I also tried setting GIT_PROXY_COMMAND to the same adress but no luck. Any idea how to fix or at least try to debug it?
07:36 CtrlC I'm using linux if that helps.
07:36 corpsicle lb: git rev-list --count gave me what i wanted, and then i just compared the numbers from teh branches
07:38 ignarps joined #git
07:39 romerocesar joined #git
07:40 GavinMagnus joined #git
07:41 tgies joined #git
07:46 danslo_ joined #git
07:46 tgies joined #git
07:48 CtrlC I tried changing it to connect through privoxy but now it says: Failed to connect to 127.0.0.1 port 8118: Connection refused
07:49 ahmedelgabri joined #git
07:51 tgies joined #git
07:52 mikecmpbll joined #git
07:53 grayjoc joined #git
07:53 ismither1 joined #git
07:53 xall joined #git
07:55 heftig the object types git knows are blob, tree, commit and tag?
07:56 dsdeiz joined #git
07:56 tgies joined #git
07:57 osse yes
08:00 lb corpsicle glad you figured a way out :)
08:00 pwnz0r joined #git
08:00 GavinMagnus joined #git
08:01 JeroenT joined #git
08:01 jmibanez joined #git
08:01 tgies joined #git
08:05 cyphase joined #git
08:06 kurkale6ka joined #git
08:06 kimonorouge joined #git
08:06 tgies joined #git
08:06 lss8 joined #git
08:09 inflames joined #git
08:09 inflames joined #git
08:12 tgies joined #git
08:12 achadwick joined #git
08:13 mrpackethead joined #git
08:14 afuentes joined #git
08:15 tvw joined #git
08:15 kimonorouge joined #git
08:16 dan2k3k4 joined #git
08:17 tgies joined #git
08:18 lss8 joined #git
08:19 halbomin joined #git
08:22 tgies joined #git
08:22 romerocesar joined #git
08:24 overlord_tm joined #git
08:26 qis left #git
08:26 Vinnie_win_p joined #git
08:27 tgies joined #git
08:27 marcogmonteiro joined #git
08:28 madduck joined #git
08:29 jmibanez` joined #git
08:29 djb-irc joined #git
08:30 brk_ joined #git
08:31 aswen joined #git
08:32 Xethron joined #git
08:32 tgies joined #git
08:34 TomyWork joined #git
08:34 kba I'm doing a `git pull` and it says "Already up-to-date." but `git rev-parse HEAD` isn't the newest commit
08:34 kba What's happening and how do I fix it?
08:36 tobiasvl kba: what does git status say?
08:37 kba On branch master, Your branch is ahead of 'origin/master' by 2 commits.
08:37 tgies joined #git
08:37 kba Oh
08:37 tobiasvl then you are up to date, you have everything origin has (and a little more)
08:38 kba how do I delete those commits? They're a mistake
08:38 tobiasvl kba: !revert
08:38 gitinfo kba: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
08:38 bernardio joined #git
08:38 tobiasvl kba: you probably want option e) although be aware that you will lose those two commits. if that's what you want, just do "git reset --hard origin/master"
08:38 skunkz joined #git
08:39 LukasT joined #git
08:39 jmibanez joined #git
08:39 LukasT Hi, it is possible somehow finding out which branch was the first one that contained specific commit?
08:39 kba ah, that worked. `git reset --hard` (without origin/master) didn't get me to the proper commit either
08:39 kba thanks!
08:39 ToBeCloud joined #git
08:39 LukasT git branch --contains commt-sha1 lists all branches that contain the commit :-/
08:40 tobiasvl kba: just "git reset --hard" only resets to HEAD, ie. throws away uncommited changes
08:40 Rodya_ joined #git
08:40 kba Ah ok
08:40 kba that makes sense
08:41 lamont joined #git
08:45 xaa joined #git
08:46 tgies joined #git
08:49 djb-irc joined #git
08:51 tgies joined #git
08:52 jozwior joined #git
08:52 _noblegas joined #git
08:53 JeroenT joined #git
08:54 systemovich joined #git
08:54 chll_ joined #git
08:54 yanope joined #git
08:56 tgies joined #git
08:57 zapb_ joined #git
08:57 PaulePanter joined #git
08:58 corpsicle so i solved a lot of merge conflicts, pushed the result and now everyone who pulls it gets the same conflicts ...
08:59 corpsicle did i do something wrong or is this just how it works
08:59 corpsicle solution i guess would be for everyone to delete their local repos and clone a new one
09:00 musicmatze[m] joined #git
09:00 robattil1 joined #git
09:03 finalbeta joined #git
09:04 jfr are there still conflict markers in the code?
09:05 Serpent7776 joined #git
09:07 corpsicle if you go a git reset --hard origin/branch then its fine
09:07 corpsicle so i guess no?
09:07 jfr If you look at the commit you pushed, do you see something like "<<<<<<<"
09:08 corpsicle its about 300 commits
09:08 corpsicle and i went through all of them and solved them
09:08 corpsicle and the merge wouldnt go through if i missed some right?
09:09 Serpent7776 joined #git
09:10 lmatteis joined #git
09:10 jfr Someone else here can certainly say for sure, I can't. My understanding is that you can add a file as a solution even if you haven't solved the conflict
09:10 jfr git log -S"<<<<<<<"
09:10 lmatteis guys
09:10 jfr Tells you if there are a commit containing a conflict marker
09:10 lmatteis is it normal that a `git rebase master` from another branch results in changes to the commit hashes?
09:11 Rampages joined #git
09:11 vlt lmatteis: On your other branch yes.
09:11 tgies joined #git
09:11 jfr rebase rewrites history, so yes. they aren't the same commits anymore
09:11 lmatteis ok
09:12 lmatteis but after the `git rebase master` was done now i get "have diverged,...and have 48 and 8 different commits each, respectively."
09:12 lmatteis i'm afraid to push -f as i don't want to screw up my history
09:12 lmatteis is there a way to see the commits that are actually different from master?
09:13 lmatteis like what does that 48 mean
09:14 codfection joined #git
09:14 selckin joined #git
09:14 finalbeta joined #git
09:15 osse lmatteis: the rebased branch has changed hashes, so already the rebased branch has 8 (I presume) commits the other one doesn't, and the other one has 8 this doesn't. Additionally since you rebased on master your branch now has more commits in its history. I guess there were 40 new commits to master since the last rebase (or if this is the first rebase, since when you created it)
09:15 bdeferme joined #git
09:16 romerocesar joined #git
09:16 vlt lmatteis: In general try to not rebase branches you have already pushed somewhere. Or know what you’re doing.
09:16 tgies joined #git
09:19 ferr joined #git
09:19 lmatteis osse: i didn't rebase *on* master. i'm on branch `foo` and i did `git rebase master`
09:19 notebox joined #git
09:19 sammyo joined #git
09:19 lmatteis well whatever the terminology is
09:20 harleyyyyymayes left #git
09:20 osse lmatteis: exactly, the terminology is that you rebased on master
09:21 lmatteis but i'm on foo
09:21 osse lmatteis: you were on foo and did something so that foo's new base is master. you rebased it. foo is now based on master. you rebased on master
09:21 lmatteis ok
09:21 lmatteis i just don't get that 48
09:21 tgies joined #git
09:22 Chaser joined #git
09:23 lmatteis osse: is there a way to see, locally, what GitHub shows you when you create a pull request and compare master with your branch - it shows you the commits that it will merge
09:23 osse lmatteis: http://sprunge.us/hNJX
09:23 DonaldTrump joined #git
09:23 osse lmatteis: git log master..feature
09:24 osse lmatteis: that diagram shows the situation, except instead of 4 and 8 you have 8 and 40
09:24 osse 408 i mean
09:24 DonaldTrump i'm trying to resolve a conflict, but remotely on a terminal. is there a cli merge tool i can use?
09:24 osse shit
09:24 lmatteis ok so that command (git log master..feature) shows 8 commits. what's the 48 for?
09:24 DonaldTrump usually i do it locally on my ide
09:25 lmatteis ok
09:25 lmatteis let me see
09:25 osse lmatteis: that's git log origin/feature..feature
09:25 osse DonaldTrump: vimdiff for example
09:25 lmatteis osse: you're saying that the 48 comes from `git log origin/feature..feature` ?
09:25 osse yes
09:25 DonaldTrump vimdiff? awesome osse
09:25 lmatteis osse: you're right
09:26 lmatteis osse: is it so many because the rebase changed all the hashes?
09:26 osse no
09:26 osse lmatteis: try git log origin/feature..master. That's 40 right?
09:26 osse DonaldTrump: correct
09:26 tgies joined #git
09:27 DonaldTrump osse: just seems to open my file for normally editing?
09:27 DonaldTrump i was hoping for the split screen vibe
09:27 osse DonaldTrump: git mergetool -t vimdiff
09:28 lmatteis osse: indeed it's 40
09:29 DonaldTrump osse: THAT's what i was looking for! Thanks!
09:29 DonaldTrump of course now i need to figure out how the hell to use it lol
09:29 osse DonaldTrump: git config merge.tool vimdiff; git mergetool (no further args needed)
09:29 xall joined #git
09:30 serycjon joined #git
09:30 ahr3n joined #git
09:31 lmatteis osse: thanks i think i get it :.
09:31 osse lmatteis: 40 + 8 = 48. the original 8 commits have changed, and are now on top of 40 new commits.
09:31 lmatteis osse: is it ok if i just rely on the git lg origin/master..HEAD command to see whether my push -f will cause any problems?
09:31 tgies joined #git
09:31 tobiasvl lmatteis: it will cause problems regardless: !rewrite
09:31 gitinfo lmatteis: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
09:32 serycjon joined #git
09:32 lmatteis it's a company standard i can't change it
09:32 luke_penn joined #git
09:33 Viddax joined #git
09:34 serycjon joined #git
09:35 GavinMagnus left #git
09:35 serycjon joined #git
09:36 sagerdearia joined #git
09:36 tgies joined #git
09:37 tobiasvl what is a company standard that you can't change
09:37 serycjon joined #git
09:39 lmatteis rebasing and forcing the change history into the branch?
09:39 serycjon joined #git
09:41 tobiasvl sure, but the issue is that you had already pushed that branched
09:42 tgies joined #git
09:44 tobiasvl do you have any company policy on force pushing feature branches?
09:44 lmatteis yep
09:44 tobiasvl which is
09:46 xall_ joined #git
09:46 LukasT left #git
09:47 tgies joined #git
09:48 DonaldTrump left #git
09:48 Endarked joined #git
09:50 k200 joined #git
09:51 k200 hi
09:51 k200 i have upstream and origin. upsteram has dev branch. i dont have it locally. now i want to switch to it. if i do git checkout upstream/dev it becomes detached head
09:51 k200 how to switch now?
09:52 tgies joined #git
09:52 canton7 k200, !local_branch_from_remote
09:52 gitinfo k200: The following commands are all equivalent, assuming <branch> doesn't yet exist: 'git checkout -b <branch> <remote>/<branch>', 'git checkout -t <remote>/<branch>', 'git checkout <branch>'. The latter invokes some magic.
09:53 jozwior joined #git
09:54 k200 canton7: thanks.
09:54 xall_ joined #git
09:55 k200 canton7: for each operation i want list if currently my branch is upsteram or origin?
09:55 canton7 k200, what do you mean, "for each operation"?
09:57 tgies joined #git
09:57 romerocesar joined #git
09:59 k200 canton7: any git operation. whatever git tells me, it should show upstream or origin in front of that information.
09:59 canton7 k200, that's not how it works
09:59 canton7 k200, you're not working on "the branch dev from upstream". You created a new *local* branch called 'dev', based on 'dev' from 'upstream'. You can then choose to push that branch back to 'upstream', or you can choose to push it somewhere else
10:01 Steele joined #git
10:01 k200 ok
10:01 canton7 there is a bit of config stored in .git/config which says "when I have 'dev' checked out and run 'git pull' without any arguments, then merge in upstream/dev, and for some values of push.default when I run 'git push', push to origin/dev"
10:01 canton7 but that's all
10:02 mrpackethead joined #git
10:02 tgies joined #git
10:02 ronny hi
10:03 ronny i just messed up and accidentialyl rebased my master branch onto a featues branch, is there a easy way to undo that action?
10:03 lindenle joined #git
10:03 [twistii] joined #git
10:04 mischat joined #git
10:04 gaia joined #git
10:04 mischat joined #git
10:05 [twistii] if i want to, say, develop a project that consists of three logical parts - client, server, and shared, where both client and server depend on things in shared such as network data structures, what would be the correct git idiom to organize these projects into repositories ? should they all go into one, as subfolders ? or should they be 'git submodules' ? from what i read about submodules it seems like those are more apropriate for
10:05 ronny actually, i can just do a git checkout upstream/master -b master
10:05 Gonzo89 joined #git
10:06 corsibu joined #git
10:06 osse lmatteis: Is this your personal branch only you are working on? Or is it even origin you're pushing to? This affects whether it's OK to force push or not.
10:06 emPi joined #git
10:07 tgies joined #git
10:08 Alienpruts joined #git
10:08 nettoweb joined #git
10:08 lmatteis it's a personal branch, and it's on origin
10:08 lmatteis osse:
10:09 irqq joined #git
10:09 aax joined #git
10:09 tobiasvl lmatteis: if your company has a policy that it's OK to force push "personal" branches, then you can probably go right ahead. only you know how you people consider that operation
10:10 xaa__ joined #git
10:15 kedare joined #git
10:16 gaia hi. git add --patch allows me to create separate commits for changes in one single file. But is there also something that would allow me to stash away parts of my changes? So that i can test each partial change without having the rest in the way?
10:16 tgies joined #git
10:16 fuchstronaut joined #git
10:17 jeffreylevesque joined #git
10:17 mindfart joined #git
10:17 selckin you stash only staged parts, but i forgot the option
10:18 selckin *you can
10:18 gaia staged parts meens i have added them but not committed ?
10:18 selckin yes
10:18 gaia ah.
10:18 gaia that might be a way to do it.
10:18 gaia looking
10:18 romerocesar joined #git
10:20 hackal joined #git
10:21 tgies joined #git
10:22 gaia heh
10:22 gaia git stash --patch ...
10:23 gaia selckin: i must have been blind to not have seen that before :)
10:24 rnsanchez joined #git
10:25 phanimahesh joined #git
10:27 tgies joined #git
10:28 drmt joined #git
10:30 pluszak joined #git
10:31 shaggycat joined #git
10:33 dan2k3k4 joined #git
10:36 eihabarabia joined #git
10:36 sunri5e joined #git
10:37 NERV-X27 joined #git
10:37 JeroenT_ joined #git
10:39 romerocesar joined #git
10:39 dsdeiz joined #git
10:40 sonvh joined #git
10:41 sunri5e joined #git
10:41 kimonorouge joined #git
10:41 tgies joined #git
10:45 dsdeiz joined #git
10:46 tgies joined #git
10:48 sonvh joined #git
10:49 nd joined #git
10:49 corpsicle goes git make any assumptions as to which side is preferred in a merge?
10:49 selckin no
10:50 corpsicle im having a terrible time atm trying to sort out a massive merge bork
10:50 corpsicle at least one file is definitely from the "wrong" side
10:50 selckin yell at the person that resolved the conflict
10:50 corpsicle it was me ;_;
10:51 corpsicle but im pretty sure i chose the correct side every time
10:51 corpsicle but im only human :(
10:51 tgies joined #git
10:53 ISmithers joined #git
10:54 corsibu joined #git
10:55 jbitdrop joined #git
10:57 tgies joined #git
10:57 hecliunyx joined #git
10:58 white_gecko joined #git
10:58 mischat joined #git
10:58 davimore_ joined #git
10:59 white_gecko Is there any scientific publication about the architecture and the logical model of Git?
11:01 howitdo joined #git
11:02 tgies joined #git
11:03 hexhaxtron joined #git
11:03 hexhaxtron left #git
11:04 osse !bottomup
11:04 gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/​pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
11:04 brokensyntax joined #git
11:04 osse Not sure if it qualifies as scientific
11:04 MapMan joined #git
11:06 dviola joined #git
11:06 brk__ joined #git
11:06 white_gecko @osse: ok thanks
11:06 nedbat white_gecko: are you looking for a really good explanation, or something with the authority to use in other science papers?
11:07 tgies joined #git
11:07 shubhnik joined #git
11:07 ieee joined #git
11:07 white_gecko nedbat: the later :-)
11:07 white_gecko resp. the second option
11:07 Xethron joined #git
11:07 JeroenT joined #git
11:07 brokensyntax joined #git
11:08 PCatinean joined #git
11:08 nedbat white_gecko: just curious, what is your paper about?
11:08 white_gecko versioning rdf data in git
11:08 white_gecko https://svn.aksw.org/papers/2​016/Semantics_Quit/public.pdf
11:09 bremner love the hostname ;)
11:09 white_gecko :-D
11:10 white_gecko still easy for collaboratively working on the papers in a big working group
11:10 white_gecko and it is grown like that
11:10 PaulePanter joined #git
11:10 finalbeta joined #git
11:11 phanimahesh joined #git
11:11 white_gecko The title is “Distributed Collaboration on RDF Datasets Using Git: Towards the Quit Store”
11:11 mizu_no_oto joined #git
11:12 sammyo joined #git
11:12 tgies joined #git
11:12 Cavallari joined #git
11:14 white_gecko and another question, what are good values for gc.autoPackLimit?
11:15 white_gecko with a good trade-off between time it needs for repacking and gain in freed storage spaced
11:16 altendky joined #git
11:16 King_Hual joined #git
11:16 King_Hual joined #git
11:18 mischat joined #git
11:19 romerocesar joined #git
11:23 barteks2x joined #git
11:24 osse my guess is the default
11:24 rahtgaz joined #git
11:25 qt-x joined #git
11:26 tgies joined #git
11:31 altendky joined #git
11:31 tgies joined #git
11:35 mizu_no_oto joined #git
11:35 nuck joined #git
11:36 tgies joined #git
11:37 white_gecko osse: how do I see the default?
11:37 white_gecko "git config --list | grep gc" says nothing in a random repo
11:39 osse man git-config
11:39 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
11:40 ciscoo joined #git
11:42 kurkale6ka joined #git
11:45 al-damiri joined #git
11:45 ISmithers joined #git
11:46 white_gecko osse: you say --local, --system and --global?
11:46 gaia left #git
11:46 tgies joined #git
11:46 gynter joined #git
11:47 jimi_ joined #git
11:47 gynter Kind of dejavu, but when rebasing on master then local is master and remote is active branch correct?
11:48 gynter nvm, yes, correct
11:50 ash_workz joined #git
11:50 osse white_gecko: I don't understand the question
11:51 tgies joined #git
11:54 JeroenT joined #git
11:55 johnmilton joined #git
11:56 tgies joined #git
11:57 finalbeta joined #git
11:57 johnmilton joined #git
12:01 dsdeiz joined #git
12:01 dsdeiz joined #git
12:01 noom joined #git
12:01 noom hey guys, does someone use gitless here ?
12:01 tgies joined #git
12:02 dendazen joined #git
12:03 shorty joined #git
12:03 _ikke_ I don't
12:03 shorty Been searching online docs / help sites. Cannot find answer. Have repo that frequently has new files added. Other, unique repos, that were generated from base using GitHub classroom look like base-1, base-2, base-3, base-4, etc. Other people edit files that already existed at duplication time. Want changes in base to be merged into those repos, either when base pushes or they pull. Any guidance?
12:04 white_gecko osse: I wanted to ask, how I can see the default values for the gc and tried "git config --list" which didn't show me any gc values, but you pointed me to the man pages, which didn't seem to help
12:05 osse white_gecko: my man page says it's 50
12:07 white_gecko osse: ok, sorry, now I get it … thank you
12:11 osse de (nada|rien)
12:11 tgies joined #git
12:12 Viddax On the production server, is there a way to make to ignore .htaccess? It won't let me do git pull because it say I need to commit to or stash them.
12:13 jknetl joined #git
12:14 gusnan joined #git
12:14 gusnan joined #git
12:16 osse !deploy
12:16 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
12:16 osse Viddax: why is .htaccess changed ?
12:16 Murii joined #git
12:16 tgies joined #git
12:17 romerocesar joined #git
12:19 mischat joined #git
12:20 Viddax osse because cPanel added php7 version in the .htaccess
12:20 sagerdearia joined #git
12:20 osse is it needed?
12:21 tgies joined #git
12:24 Vampire0 joined #git
12:26 eizua joined #git
12:26 tgies joined #git
12:27 eizua joined #git
12:28 qpdb joined #git
12:29 eizua joined #git
12:29 leehambley joined #git
12:30 eizua joined #git
12:31 hackal joined #git
12:31 sdothum joined #git
12:31 tgies joined #git
12:33 hackal Hi, I have a branch and basically what happened was that is that ALL files have changed mode "old mode 100644 new mode 100755" is there a way to undo this?
12:34 danslo joined #git
12:35 brk joined #git
12:35 moo joined #git
12:35 tobiasvl chmod?
12:36 gynter reset?
12:36 lmat joined #git
12:36 synthmea1 joined #git
12:36 tgies joined #git
12:37 jimi_ joined #git
12:37 jargan joined #git
12:37 gynter s/reset/revert/
12:37 corsibu joined #git
12:37 rewt`` joined #git
12:38 berndj-blackout joined #git
12:38 kurkale6ka joined #git
12:38 ISmithers joined #git
12:39 neersighted joined #git
12:39 rbr joined #git
12:39 kfunk_ joined #git
12:39 daey_ joined #git
12:39 corpsicl1 joined #git
12:39 eroussel joined #git
12:39 Mapianka joined #git
12:39 JuliusN_ joined #git
12:39 colona joined #git
12:39 ffualo_ joined #git
12:39 nothingm1ch joined #git
12:40 jephsf joined #git
12:40 kugel_ joined #git
12:40 kugel_ joined #git
12:40 jeffreylevesque joined #git
12:40 lrvick1 joined #git
12:40 tokkee_ joined #git
12:40 absence_ joined #git
12:40 rawtaz_ joined #git
12:40 mikap joined #git
12:40 Roconda_ joined #git
12:40 adamm_ joined #git
12:40 thomas1 joined #git
12:40 moritz_ joined #git
12:40 vedharish joined #git
12:40 deltab_ joined #git
12:40 mikap joined #git
12:40 des_cons1lado joined #git
12:40 bejeb_ joined #git
12:40 sleezd_ joined #git
12:40 Xethron joined #git
12:41 tier2villain_ joined #git
12:41 cmn_ joined #git
12:41 sysanthrope_ joined #git
12:42 pitastrudl_ joined #git
12:42 tgies joined #git
12:42 tcsc_ joined #git
12:43 DeltaHeavy joined #git
12:43 dwmw2_go` joined #git
12:43 cjbrambo_ joined #git
12:43 mniip_ joined #git
12:43 ajpiano_ joined #git
12:43 RiPer_ joined #git
12:43 Algorith- joined #git
12:43 themayor joined #git
12:43 DonRichie2 joined #git
12:43 ahf_ joined #git
12:43 Virox_ joined #git
12:43 Peuc2 joined #git
12:43 jerrcs_ joined #git
12:43 AlHafoudh_ joined #git
12:43 grift_ joined #git
12:43 Lorcatar_ joined #git
12:43 Ankhers_ joined #git
12:43 Groscheri joined #git
12:43 jor_ joined #git
12:43 mattcen_ joined #git
12:44 DelphicOkami_ joined #git
12:44 plouescat joined #git
12:44 brendyyn joined #git
12:44 Ravana- joined #git
12:44 as_g5pw joined #git
12:44 chrisml` joined #git
12:44 tHEMtZ joined #git
12:44 lus_ joined #git
12:44 BlackMaria_netsp joined #git
12:44 __name__ joined #git
12:45 lb hackal multiple OS involved?
12:45 Afforess_ joined #git
12:45 DonRichie joined #git
12:45 blahdodo joined #git
12:46 j416 joined #git
12:46 TheOrangeOne joined #git
12:46 esc joined #git
12:46 esc joined #git
12:46 lqi joined #git
12:47 lqi how to play git worktree with submodules? thanks
12:47 TheMoonMaster_ joined #git
12:47 ruskie joined #git
12:47 johnnyfive_ joined #git
12:47 habbasi joined #git
12:47 ManiacTwister joined #git
12:48 gynter left #git
12:48 ghostlight joined #git
12:48 jknetl joined #git
12:50 crater2150 joined #git
12:50 buddyq joined #git
12:50 reizuki joined #git
12:50 Vampire0 joined #git
12:51 ilogger2 joined #git
12:51 niax joined #git
12:51 Phylock joined #git
12:51 Shock_ joined #git
12:51 joseph_arnstein_ joined #git
12:51 harish joined #git
12:51 tgies joined #git
12:51 obiwahn joined #git
12:52 markmarkmark joined #git
12:52 fiete joined #git
12:52 Surfer2010 joined #git
12:52 SpeakerToMeat joined #git
12:52 dwigton joined #git
12:52 Raed joined #git
12:53 romerocesar joined #git
12:55 devster31 joined #git
12:56 eindoofus joined #git
12:56 tgies joined #git
12:56 corsibu joined #git
12:56 LucaTM joined #git
12:56 andres joined #git
12:57 tapout joined #git
12:57 corsibu joined #git
12:57 Kurolox joined #git
12:58 Kurolox Hello!
12:58 gitinfo Kurolox: 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.
12:58 johnmilton joined #git
12:58 LucaTM joined #git
12:59 Kurolox Well, I have what I think that it's a really stupid question. I'm pretty new to git and github. I've made a pull request for a project and they've told me that my pull request have a conflict and I have to sync the fork and resend my pull request. How do you exactly sync a fork?
12:59 e14 joined #git
12:59 Kurolox Also, since I guess that there will be a file conflict when I sync, will I lose my changes that I was trying to pull?
13:00 canton7 Kurolox, !pull_upstream
13:00 gitinfo Kurolox: To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
13:00 canton7 when you get a conflict, it's up to you to fix it. You won't lose your work
13:00 canton7 !eekaconflict
13:00 gitinfo Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
13:01 Jameser joined #git
13:01 elect joined #git
13:01 tgies joined #git
13:03 cdg joined #git
13:04 cdg joined #git
13:04 Kurolox Oh, that's really handy. Thank you guys. Is there any way to make git tell me where's exactly the conflict? When I merge I just get a "Merge conflict in file", but I'd like to know in which lines.
13:05 canton7 Kurolox, open the file in an editor
13:05 canton7 search for ">>>>>" and "<<<<<"
13:05 JeroenT_ joined #git
13:05 canton7 they mark the conflict
13:05 Kurolox oh, ok
13:05 canton7 it's up to you to make the file look as you want it to look
13:05 canton7 the links gitinfo gave you just above all explain this in detail - I'd recommend reading them
13:05 lindenle joined #git
13:05 Kurolox I'll save them and check them later. Thanks again.
13:06 liuzhen joined #git
13:06 jozwior joined #git
13:06 tvw joined #git
13:08 plos joined #git
13:08 zivester joined #git
13:09 HoierM joined #git
13:12 mure joined #git
13:13 plos joined #git
13:15 bgerber joined #git
13:16 Kurolox Uh, I'm not sure about how to fix the conflict. I've checked out that link you gave me and while I understand the conflict markdown, I don't see how both of them are conflicting in any way. Both of them should be in the code.
13:16 JeroenT joined #git
13:16 CEnnis91 joined #git
13:16 Kurolox I don't know if this helps to explain what I mean. http://i.imgur.com/oD0F10F.png
13:16 tgies joined #git
13:17 Kurolox I don't want to remove ES or US. Both of them should be in the code. I can't see where is the conflict exactly.
13:17 JamesBaxter joined #git
13:17 ekinmur joined #git
13:20 ytti joined #git
13:21 tgies joined #git
13:21 ytti rugged is ruby bindings to libgit2, how in libgit2 should i create commit, but only if commit will actually change data
13:22 harish joined #git
13:22 ytti what I'm doing now appears to create bogus inodes, when ever I'm creating data, which I later determine to be non-unique and then I skip actual commit
13:22 ytti the bogus inodes can be cleareed by GC, but perhaps I should avoid them in the first place
13:22 ytti code is here: https://github.com/ytti/oxidized/blob/​master/lib/oxidized/output/git.rb#L182
13:23 ytti i believe lines 183, 187 and/or 189 are responsible for the useless inodes i need to GC
13:24 BlackMaria joined #git
13:26 tgies joined #git
13:27 Darcidride joined #git
13:28 lykinsbd joined #git
13:29 interrobangd joined #git
13:29 lb Kurolox you edit the file how you would like to see it after your merge.
13:30 Electrometro joined #git
13:30 lykinsbd joined #git
13:31 lb Kurolox if you want to have both versions in your final file, then simply remove the conflict markers ('<<<<', '======', '>>>>>') and make sure the leftover is valid code ;)
13:31 tgies joined #git
13:32 Cavallari1 joined #git
13:32 lb Kurolox the conflict was, that your code has added ES and upstream added US at the same location in the code. so you have to tell git, wether your merged result should contain None,ES,US or Both
13:33 sangy joined #git
13:34 Kurolox Oh. So leaving both is an option? I assumed that it wasn't because if I could then it wouldn't be a conflict in the first place
13:34 Kurolox since I was something small I just removed ES, merged and then added it manually and pulled
13:34 tobiasvl git can't tell if leaving both is an option
13:34 tobiasvl it needs human intervention
13:35 tobiasvl for that matter, lb can't tell either
13:35 nd_ joined #git
13:35 plos joined #git
13:36 lykinsbd joined #git
13:36 tgies joined #git
13:38 mrpackethead joined #git
13:38 danemacmillan joined #git
13:39 t4nk082 joined #git
13:39 User458764 joined #git
13:39 pokalyis joined #git
13:40 dryrun118 joined #git
13:40 User458764 joined #git
13:40 lykinsbd joined #git
13:41 dryrun357 joined #git
13:41 leehambley joined #git
13:43 toothe my connection is odd right now, and I can't seem to connect to gitlab.
13:43 toothe Is there a way to force a socks5 proxy?
13:44 romerocesar joined #git
13:45 boombatower joined #git
13:46 tgies joined #git
13:47 griffindy joined #git
13:47 plos joined #git
13:48 plos joined #git
13:49 anonymuse joined #git
13:49 spykins joined #git
13:50 rnsanchez_ joined #git
13:51 tgies joined #git
13:53 spykins Hello everyone, can someone please help me? I am facing an issue with git. When I check into a remote branch and I check git branch, It doesn’t highlight the branch I am currently checked into. If I try to push to the remote branch, I get an error. If I try to git checkout the_branch, it tells me I am currently in the branch but the branch is not highlighted in (git branch). I always resolve this by checking out to another branch, checking back the branch. Whe
13:53 spykins try this step multiple times, I get git branch to highlight the branch, and then I can push.
13:53 spykins Can anyone guide me on what I am doing wrong?
13:55 selckin what does git status say then
13:57 spykins You are on the branch origin/
13:57 spykins nothing to commit
13:58 geoid_ joined #git
13:58 spykins selckin: I just checked into the local version of the branch
14:00 spykins I fetch branch from origin
14:00 pluszak how do I run git bisect to find when something was added to project? I tried git bisect run !(grep -R 'foo') but it seems it didn't get the !
14:00 hexa- pluszak: if you know the place where it was added you could use `git blame <file>`
14:01 Andrew_K joined #git
14:01 e14 joined #git
14:01 spykins_ joined #git
14:01 pluszak hexa-: well, no. I wanted to find where it was added to the project as it was then copied all over the place (ended up with driving it manually)
14:01 tgies joined #git
14:04 selckin parent of the last commit with git log -S foo maybe
14:04 malcon joined #git
14:05 umpc joined #git
14:06 ciscoo_ joined #git
14:06 Dougie187 joined #git
14:06 tgies joined #git
14:08 tristanp joined #git
14:09 shinnya joined #git
14:10 ShekharReddy joined #git
14:11 balor joined #git
14:11 balor Does git have support for s3 or do I have to use fuse (or another mechanism)?
14:12 tgies joined #git
14:12 User458764 joined #git
14:14 corsibu_ joined #git
14:14 selckin it does not
14:14 mischat joined #git
14:15 AaronMT joined #git
14:15 finalbeta joined #git
14:15 ^7heo < balor> Does git have support for s3
14:15 ^7heo This is wrong on so many levels.
14:15 ^7heo I can't even.
14:15 danslo_ joined #git
14:17 jacaballero joined #git
14:18 kpease joined #git
14:18 IrishPrime joined #git
14:18 IrishPrime joined #git
14:18 kpease_ joined #git
14:18 selckin cloud all the things
14:19 sdothum joined #git
14:19 madewokherd joined #git
14:19 selckin http://docs.aws.amazon.com/codecommit/latest​/userguide/welcome.html#welcome-how-it-works
14:20 romerocesar joined #git
14:21 cdown_ joined #git
14:21 balor selckin, Thanks.  I think that's what I was looking for (even if I phrased it quite poorly).
14:21 davidosomething joined #git
14:21 tgies joined #git
14:23 shaggycat joined #git
14:24 jottr joined #git
14:25 guampa joined #git
14:25 kpease joined #git
14:25 ajf- joined #git
14:26 dzijeka joined #git
14:26 fuchstronaut joined #git
14:26 dendazen joined #git
14:26 GavinMagnus joined #git
14:26 tgies joined #git
14:27 aarobc joined #git
14:28 ResidentBiscuit joined #git
14:28 garzer joined #git
14:28 eivarv joined #git
14:29 ResidentBiscuit joined #git
14:29 star_prone joined #git
14:29 CheckDavid joined #git
14:30 drmt joined #git
14:30 averagedan left #git
14:30 sagerdearia joined #git
14:33 sonvh joined #git
14:33 spykins joined #git
14:34 pdgwien joined #git
14:35 Noldorin joined #git
14:36 tgies joined #git
14:37 SwiftMatt joined #git
14:38 GT4066 joined #git
14:38 barteks2x joined #git
14:39 geoid joined #git
14:39 LocusAsaf joined #git
14:40 User458764 joined #git
14:41 ejb joined #git
14:41 mischat_ joined #git
14:42 r00twrh joined #git
14:42 mischat_ joined #git
14:43 flaguy48 joined #git
14:43 LocusAsaf Lets say I create feature B, which is branched from A.  At this time of branch, A has hash X1 as shown in git show-ref.  Let's say following, someone pushes a commit A on origin giving it hash X2. On my local show-ref will continue to show X1 until which time I pull origin A. Is it possible to do a show-ref so it will show the hash of A that B is aware of?
14:44 afuentes joined #git
14:44 geoid___ joined #git
14:44 LocusAsaf I'm assuming if I pull down the repo asking for just Branch B, it would show X1 with a show-ref?
14:45 grawity B being 'someone'?
14:45 LocusAsaf B being the branch off A
14:45 LocusAsaf but yes
14:45 saml joined #git
14:45 grawity generally you can `git fetch` or `git remote update` which will just update the remote-tracking branches
14:46 grawity i.e. the "origin/A", "origin/B" ones
14:46 LocusAsaf I'm not communicating the question well.  Let me rephrase
14:46 tgies joined #git
14:48 LocusAsaf I'd like to find out a way of finding the commit hash of the HEAD of A from branch B's perspective even if further commits were pushed to A.  Or in other words, branch B has not merged A into it after the branching, that's what I mean from B's perspective
14:49 LocusAsaf does that make more sense?
14:50 madewokherd I'm not sure, you might mean git merge-base
14:51 madewokherd the merge base is the latest commit that's shared in 2 commits' histories
14:51 grawity no idea what you mean by "the HEAD of A from branch B's perspective"
14:52 grawity things that come to mind are
14:52 tgies joined #git
14:52 grawity a) git merge-base
14:52 grawity b) git merge-base --fork-point
14:52 grawity c) git log B..A
14:52 grawity also, s/HEAD/head/
14:52 LocusAsaf let me read up on merge-base
14:52 LocusAsaf whats s/HEAD/head ?
14:53 titankiller joined #git
14:53 grawity "branches don't have HEADs, they only have heads"
14:53 grawity upper-case HEAD has a different meaning (the currently checked out commit)
14:53 cyphase joined #git
14:54 LocusAsaf okay so I guess head
14:54 grawity but either way
14:55 grawity the branch head is the *latest* commit in that branch
14:55 grawity it doesn't change based on another branch's perspective
14:55 grawity if you meant something like the *base* commit, `git merge-base` would help you find that
14:56 LocusAsaf actually I'm thinking more about this and I see my folly
14:56 LocusAsaf let me check out what merge-base does though
14:57 troulouliou_div2 joined #git
14:57 tgies joined #git
14:57 grawity with --fork-point it'll try to find the oldest base, otherwise it'll try to find the most recent one
14:57 sssilver joined #git
14:57 grawity (the difference becomes apparent if you merge a branch, then merge it again, then again...)
14:58 kpease joined #git
14:59 JeroenT_ joined #git
15:00 mischat joined #git
15:00 syncrr joined #git
15:02 jstimm joined #git
15:02 mischat__ joined #git
15:03 syncrr if i want to make sure that i never commit on top of a history that contains unsigned commits, what's the best way of doing that? a pre-commit hook?
15:04 toothe left #git
15:05 dreiss joined #git
15:06 tgies joined #git
15:06 dan2k3k4 joined #git
15:08 btyne79 joined #git
15:08 jbeeze_ joined #git
15:09 kimonorouge joined #git
15:11 tgies joined #git
15:12 dviola joined #git
15:12 Impaloo joined #git
15:14 subhojit777 joined #git
15:14 phanimahesh yep, but it can be expensive.
15:14 sssilver joined #git
15:14 texasmynsted left #git
15:15 Es0teric joined #git
15:15 phanimahesh you can short-circuit it by including a marker in your signed commits, and stopping the scan of tree when you see one of your own commits with the marker, signed
15:15 le_melomane joined #git
15:15 syncrr phanimahesh: understood. yeah, i'll probably need something like that if the histories get large.
15:17 ajf- joined #git
15:21 tgies joined #git
15:23 LionsMane joined #git
15:24 kpease joined #git
15:25 tyreld joined #git
15:26 mrpackethead joined #git
15:27 zivester joined #git
15:27 fuchstronaut joined #git
15:31 romerocesar joined #git
15:32 tgies joined #git
15:32 barajasfab joined #git
15:35 littleforest joined #git
15:36 ahmedelgabri joined #git
15:37 tgies joined #git
15:37 dviola joined #git
15:38 stomplee joined #git
15:38 pks joined #git
15:40 cerkauskas joined #git
15:41 ericho joined #git
15:41 James123 joined #git
15:41 cerkauskas Hello. I have created branch from master. Now master has some commits. How do I change main commit, that I created branch from?
15:41 Darren_ joined #git
15:42 tgies joined #git
15:42 James123 I want to exclude all .foo files in all directories. In .gitignore, *.foo doesn't seem to work? Am I missing something?
15:42 sagerdearia joined #git
15:43 nedbat James123: *.foo will work, but it won't ignore .foo files you already committed
15:43 nedbat cerkauskas: you want to rebase your commits
15:44 James123 nedbat: Hmm, that was the problem! Can I do anything if I want from now on to ignore .foo files that I have already committed?
15:45 perlpilot James123: why do you want to ignore committed files?
15:45 James123 perlpilot, I made a mistake, and I commited files that I don't really care :/
15:46 perlpilot James123: so, you could "git rm" those files ?
15:46 cdown joined #git
15:47 tgies joined #git
15:47 ochorocho__ joined #git
15:47 James123 perlpilot, something like that but in multiple directories. More like find . -name "*.foo" -exec rm etc.
15:48 ribasushi joined #git
15:51 theCole joined #git
15:53 ochorocho__1 joined #git
15:55 pks joined #git
15:55 e14 joined #git
15:56 tgies joined #git
15:56 sssilver joined #git
15:57 NeverDie joined #git
15:58 pks joined #git
15:59 oskarkv joined #git
15:59 navidr joined #git
16:00 vuoto joined #git
16:00 svm_invictvs joined #git
16:00 kpease joined #git
16:01 tgies joined #git
16:02 lindenle joined #git
16:03 a_thakur joined #git
16:03 alfism joined #git
16:03 einnjo joined #git
16:04 cyan__ joined #git
16:05 cdown joined #git
16:05 jstimm joined #git
16:05 hariel joined #git
16:05 dviola joined #git
16:07 cdg joined #git
16:07 romerocesar joined #git
16:08 dan2k3k4 joined #git
16:10 Xethron joined #git
16:11 sonvh joined #git
16:11 robotroll joined #git
16:14 adamm joined #git
16:15 sssilver joined #git
16:16 qpdb joined #git
16:19 nitric joined #git
16:19 Iunyu5 joined #git
16:20 blackwind_123 joined #git
16:21 lrvick1 left #git
16:21 ash_workz joined #git
16:21 overlord_tm joined #git
16:21 bongjovi joined #git
16:21 blackwind_123 joined #git
16:21 tgies joined #git
16:22 kpease joined #git
16:22 grayjoc joined #git
16:26 dsantiago joined #git
16:26 tgies joined #git
16:27 testuser_ joined #git
16:27 dviola joined #git
16:28 fuchstronaut joined #git
16:28 sagerdearia joined #git
16:29 testuser_ hi, it is possible to store changes the the file (lets call it aaa.txt) only locally, then stash them in the current local git only; BUT: when the file is modified again, I want those changes merged/pushed to the remote repository, while keeping the previous stash local; therefore, I basically want to edit the SAME FILE but push only one editted commit of the file, while keep the other private (not propagated to the remote); and ideas?
16:29 vishal joined #git
16:30 sagerdearia joined #git
16:31 a_thakur_ joined #git
16:31 rivarun joined #git
16:31 durham joined #git
16:31 tgies joined #git
16:32 mischat joined #git
16:33 moritz_ left #git
16:33 moritz joined #git
16:33 sonvh joined #git
16:34 jfran joined #git
16:34 pks joined #git
16:35 nedbat testuser_: you can add only some of the changed chunks, so that only they will be committed
16:36 kimonorouge joined #git
16:36 testuser_ nedbat, how can I do that; I want to keep editing the file without copy-pasting... ?
16:36 nedbat testuser_: git add -p
16:37 nedbat testuser_: if you're going to be doing this for a very long time, you might want to organize your files so that the public edits and the private edits are in different files
16:37 tgies joined #git
16:39 testuser_ nedbat, the problem is that this is a visual studio project file, where different developers have different preferences in it (like post-build commands), which is why it must be in the same file - I'm not sure it supports any include/require which would make multiple files possible ... I'll take a look at the git add -p
16:39 pwnz0r joined #git
16:40 mikecmpbll joined #git
16:41 dviola joined #git
16:41 crayon joined #git
16:42 tgies joined #git
16:42 crayon joined #git
16:42 crayon joined #git
16:43 testuser_ nedbat, other than that, let's say I'm working on the same project, but have two remote repositories, where each of them should get their own version of source code (let's also specify that all different changes are in separate files): what would be the best way to keep the local source properly separated. I guess we would work on three branches, where the first one is 'develop' (where the develoment takes place), the second is
16:43 testuser_ 'master1' (where one version of source is) and the other is 'master2' (where the other version of source code is); the problem is that then we would still need a way to specify that some files only go into master1, while others into master2; this means that when doing "git status" in either of the branched, the branch should only track some files (I guess a .gitignore for each branch would solve this). Is there any better way of doing
16:43 testuser_ this?
16:43 diego4 joined #git
16:43 romerocesar joined #git
16:43 diego4 joined #git
16:44 ferr joined #git
16:44 UTAN_dev joined #git
16:44 xaa__ joined #git
16:45 nedbat testuser_: first, i'm surprised that different developers want different post-build steps. might be easier to keep a number of build targets (or whatever), one for each developer. Or just get them to agree on the build steps. This sounds really fragile
16:46 svm_invictvs joined #git
16:47 testuser_ nedbat, they're working around the globe and each has their own version of the environment, which means they're basically running xcopy commands to their own shared folders to make the development easier to pick up from other machines in the network.
16:47 nedbat testuser_: for the multi-repo set up, i would not try to make branches do this.  It sounds like you want a common repo, and client1 and client2 repos.
16:47 tgies joined #git
16:47 nedbat testuser_: can't you keep the differences among the developers in environment variables?
16:48 nedbat testuser_: someone is going to accidentally check in their private lines from the project file, and it's going to be chaotic
16:49 testuser_ nedbat, yes that would work, also the .vcxproj.user file (https://stackoverflow.com/questions/​13015265/vcxproj-in-source-control): I just though there might be a good way to do this with git.
16:49 NeverDie joined #git
16:49 jimi_ joined #git
16:49 testuser_ nedbat, so what you're basically saying is that we should have a common repository where all the development code does (let's say into the master branch), then the client1/client2 repositories just merge the changes from the common repo?
16:49 sagerdearia joined #git
16:50 nedbat testuser_: if by "merge the changes" you mean some kind of git operation, no.  I mean that the client repos should use the common repo as a library.
16:51 nedbat testuser_: git isn't for everything. It's good for representing the history of changes to code.
16:52 testuser_ nedbat, the problem is that the project we're working on is a library, but different clients need different code, but only for some source files, while the others are common to all of them ...
16:52 tgies joined #git
16:53 nedbat testuser_: i can't recommend a complete solution. I just wouldn't try to cram it all into git.
16:53 nedbat testuser_: what about ifdef's?
16:53 kadoban joined #git
16:53 tvw joined #git
16:53 romerocesar joined #git
16:54 nedbat testuser_: you can even produce versions of the code with the ifdefs applied: http://stackoverflow.com/a/22738955/14343
16:54 testuser_ nedbat, that wouldn't work, since source code is distributed to clients and we don't want to keep such things in the code, since they would otherwise see the code of other clients as well...
16:54 nedbat testuser_: you can even produce versions of the code with the ifdefs applied: http://stackoverflow.com/a/22738955/14343
16:55 anonymuse joined #git
16:55 manuel joined #git
16:55 subhojit777 joined #git
16:56 umpc joined #git
16:57 testuser_ nedbat, another issue about what you suggested is that we have a bunch of other #ifdef/#else statements in the code, which mainly check if the code is x86/x64 (and some others as well), which must stay in; therefore we're looking to separate the code on a higher layer, on the source control layer (if possible).
16:57 tgies joined #git
16:57 nedbat testuser_: you should read about the tool mentioned in that stack overflow answer.
16:57 ojdo joined #git
16:58 nedbat testuser_: http://dotat.at/prog/unifdef/ *selectively* remove C preprocessor conditionals
16:59 nidr0x joined #git
17:00 vuoto joined #git
17:00 GavinMagnus left #git
17:01 SteffanW joined #git
17:01 testuser_ nedbat, I see, so I can select some macros and unselect those, while leaving the rest alone; can this be somehow integrated into the git itself, so that I would be able to select what gets pushed to the remote endpoint with git; I guess the git would run the tool to get the 'current' version of the source code, which would then be "git add"/"git commit" to the remote repo?
17:01 nedbat testuser_: again, this is trying to make git do too much.
17:01 umpc joined #git
17:02 dan2k3k4 joined #git
17:02 nedbat git should be where your source code is. If you need to "build" the code you ship to your client, you can do that outside of git
17:02 tgies joined #git
17:02 Darcidride joined #git
17:02 nanga joined #git
17:03 nanga joined #git
17:03 whomp joined #git
17:03 testuser_ nedbat, we need to push the code to clients, which is why I wanted to have a git solution, so we don't have to run a separate tool in order to build the actual source that gets pushed to clients ... but I guess we'll have to have a common repo which gets all the development code on which this tool will be run and the contents piped into two other repositories. which is the actual code that will be pushed to clients.
17:04 kimonorouge joined #git
17:04 nedbat testuser_: why do you need to use git to deliver the code to the client?
17:05 testuser_ nedbat, we're develivering a source code to them, so they can do whatever they want with it, but we have two clients at the moment which require separate code and we want to push two different versions of the code (while still keeping and developing on the common code); the clients is who actually builds and deploys the code to others.
17:05 Groscheri joined #git
17:06 nedbat testuser_: right. So email a tarbal to each client. Why does it have to be delivered with git?
17:06 nedbat *tarball
17:07 testuser_ we have git already set up and they're also using git on their own end, which is why they want it in this form; to ease the things they do on their end I guess
17:07 testuser_ nedbat, and nobody sends tarballs with code in emails to be frank :)
17:08 stomplee joined #git
17:08 nedbat testuser_: ok, i've probably helped all I can (if I even have!).  I encourage you not to try to make git do everything.
17:08 raijin joined #git
17:09 testuser_ nedbat, thank you for your help, I'll google some more if there's a git plugin that does what I want; otherwise we'll use this solution. You've been very helpful, so I thank you!
17:09 nedbat testuser_: ok! :)
17:09 testuser_ nedbat, I've been warned, I know :)
17:10 ahmedelgabri joined #git
17:10 testuser_ nedbat, I won't push it though - if there isn't anything existing, we won't build our own plugin to push this the way we want :)
17:11 fuchstronaut joined #git
17:11 BSaboia joined #git
17:12 romerocesar joined #git
17:12 kyan joined #git
17:14 subhojit_ joined #git
17:14 mrpackethead joined #git
17:14 notebox joined #git
17:15 fees joined #git
17:15 nettoweb joined #git
17:15 geoid___ joined #git
17:16 Limes_ joined #git
17:16 tgies joined #git
17:17 wizardedit joined #git
17:17 eroussel joined #git
17:18 mar77i derp. I'm lost with git pull: fatal: Could not read from remote repository.
17:19 m0viefreak joined #git
17:19 cagedwisdom joined #git
17:19 mischat_ joined #git
17:20 mischat_ joined #git
17:21 tgies joined #git
17:21 mar77i how can I debug this? -v seems not to add anything useful
17:22 Squarism joined #git
17:23 mar77i hmm. it says, welcome, anonymous.
17:23 Squarism is "git flow" (a named workflow for git) what most people actually use?
17:23 Squarism is it embraced or just a moronic curiousity
17:24 cdown joined #git
17:24 gho5t joined #git
17:25 cerkauskas joined #git
17:26 tobiasvl !gitflow
17:26 gitinfo The description of the gitflow branch workflow model is at http://nvie.com/posts/a-succ​essful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for other workflow suggestions/references
17:26 tobiasvl not a mornoic curiousity
17:26 tgies joined #git
17:27 jnewt joined #git
17:27 overlordtm joined #git
17:28 anonymuse joined #git
17:28 kpease joined #git
17:29 tobiasvl moronic
17:29 VorpalHex joined #git
17:30 VorpalHex Methodology question - I have a bunch of repos (~198) that each contain a file from a template. I need to apply a small fix to the file in each template. What is the best way to approach this? Shell script?
17:31 Squarism tobiasvl, thanks
17:31 tgies joined #git
17:32 AaronMT joined #git
17:32 _ikke_ VorpalHex: shell script seems best to me
17:33 overlord_tm joined #git
17:33 Squarism VorpalHex, some programming language - shell script, sure, if you want the worst possible programming language =D
17:34 mischat joined #git
17:34 VorpalHex but this is definitely a scripting task, there aren't any clever tools?
17:34 svm_invictvs joined #git
17:35 jstimm joined #git
17:35 Squarism i would be suprised if someone done such a tool. Sounds to nischy
17:35 Squarism too
17:35 dreiss joined #git
17:35 mischat joined #git
17:36 msonntag joined #git
17:36 ^7heo Squarism: of all the spelling mistakes you did, I am flabbergasted that you chose to correct "to -> too"
17:37 tgies joined #git
17:37 ojacobson I mean, you could mechanise something out of patch(1), probably?
17:37 ojacobson but, yeah, that's a bit too niche
17:38 kpease joined #git
17:38 Squarism ^7heo, surprised...?
17:39 Squarism ^7heo, what else?
17:40 ^7heo Squarism: nespresso.
17:40 dwigton left #git
17:40 kimonorouge joined #git
17:41 Squarism Not flabbergasted?
17:42 synthmeat joined #git
17:42 tgies joined #git
17:42 pasky joined #git
17:43 Learath2 joined #git
17:45 overlord_tm joined #git
17:45 synthmeat joined #git
17:45 jason237 joined #git
17:47 tgies joined #git
17:48 Sasazuka joined #git
17:49 cso joined #git
17:50 _cyril_ joined #git
17:52 ResidentBiscuit joined #git
17:52 satifant joined #git
17:53 irqq joined #git
17:54 TomyLobo joined #git
17:55 kimonorouge joined #git
17:55 johnmilton joined #git
17:55 kpease joined #git
17:56 johnmilton joined #git
17:57 tgies joined #git
17:59 brokensyntax joined #git
17:59 eindoofus_ joined #git
18:00 kulelu88 joined #git
18:00 VorpalHex left #git
18:03 User458764 joined #git
18:04 spykins joined #git
18:07 tgies joined #git
18:09 jason237 joined #git
18:10 sdothum joined #git
18:11 sssilver joined #git
18:12 tgies joined #git
18:12 fuchstronaut joined #git
18:14 stomplee joined #git
18:15 Orion3k joined #git
18:16 GavinMagnus joined #git
18:16 cdown joined #git
18:17 tgies joined #git
18:17 sonvh joined #git
18:18 BPL joined #git
18:18 BPL Hi everyone
18:19 BPL I've installed # pip install --user git-up on windows, I don't have it available when i run git up, what could i be missing?
18:19 syncrr left #git
18:19 spykins joined #git
18:20 darkeva02 joined #git
18:20 gho5t_ joined #git
18:22 tgies joined #git
18:25 brokensyntax joined #git
18:26 nedbat BPL: not sure why, but have you read the reasons the original is unmaintained? https://github.com/aanand/git-up/
18:27 tgies joined #git
18:27 nedbat (also, the ALTHOUGH section of that readme is good)
18:27 kpease joined #git
18:28 BPL nedbat: Not really, I only wanted to pull all my local branches without too much effort and I've landed at that pip package :) , any other recomendation will be well received
18:28 nedbat BPL: read that github link.
18:28 romerocesar joined #git
18:28 sammyo joined #git
18:29 cdown joined #git
18:30 BPL nedbat: I see, well... I guess I'll continue following my newbie method then. Sourcetree fetching automatically all branches and then I just checkout one by one all my local branches and pull
18:30 nedbat BPL: what version of git are you using?
18:31 BPL nedbat: I've updated sourcetree to use 2.8.1.windows.1
18:31 mibr0 joined #git
18:32 tgies joined #git
18:32 Nikitaw99 joined #git
18:36 kpease joined #git
18:37 tgies joined #git
18:37 NeverDie joined #git
18:40 rahtgaz joined #git
18:44 staafl joined #git
18:45 sssilver joined #git
18:45 buddyq joined #git
18:46 gho5t joined #git
18:46 tgies joined #git
18:48 apotry joined #git
18:50 romerocesar joined #git
18:51 raphink joined #git
18:51 raphink joined #git
18:53 madduck joined #git
18:53 Dougie187 joined #git
18:55 Bizkit joined #git
18:56 aard_ joined #git
18:56 Rodya_ joined #git
18:57 tgies joined #git
18:59 jottr joined #git
18:59 eindoofus_ joined #git
18:59 tyreld joined #git
18:59 sunri5e joined #git
18:59 Flare joined #git
19:00 sagerdearia joined #git
19:00 f3r70rr35f joined #git
19:01 white_gecko joined #git
19:02 umpc joined #git
19:02 white_gecko left #git
19:02 mrpackethead joined #git
19:02 kevwil joined #git
19:03 garzer joined #git
19:04 BPL nedbat: I've updated to git version 2.10.1.windows.1
19:04 dodobrain joined #git
19:06 dodobrain joined #git
19:07 tgies joined #git
19:08 jack_ joined #git
19:11 romerocesar joined #git
19:12 tgies joined #git
19:13 fuchstronaut joined #git
19:13 romerocesar joined #git
19:13 EmeraldExplorer joined #git
19:13 jasondockers joined #git
19:13 anonymuse joined #git
19:14 jasondockers how should I handle updating a repository to reflect new file names where the files were renamed without using `git mv`?
19:15 BSaboia joined #git
19:15 bremner it doesn't matter
19:15 bremner !rename
19:15 gitinfo git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also public-inbox.org/git/Pine.L​NX.4.58.0504150753440.7211@ppc970.osdl.org and `diff.renames = true`  in man git-config
19:15 jasondockers oh, good. thanks! that's what I did: 'rm --cached; add;'
19:15 finalbeta joined #git
19:16 manuel joined #git
19:17 tgies joined #git
19:18 alex1a joined #git
19:22 apxm joined #git
19:22 jottr joined #git
19:22 tgies joined #git
19:22 titankiller joined #git
19:22 sunri5e joined #git
19:22 tyreld joined #git
19:22 KnownSyntax joined #git
19:22 KnownSyntax joined #git
19:26 nwkj86 joined #git
19:27 tgies joined #git
19:28 McKraken_zzzzz joined #git
19:29 fuchstronaut joined #git
19:30 durham_ joined #git
19:30 sbeller woohoo someone updated gitinfo to point at the new public inbox of the mail archive!
19:31 sbeller though it may be cooler if it was using a shorting link, I dunno?
19:32 tgies joined #git
19:33 Nikitaw99 left #git
19:33 _cyril_ joined #git
19:37 tgies joined #git
19:37 kimonorouge joined #git
19:37 geoid_ joined #git
19:38 manuel joined #git
19:38 littleforest joined #git
19:41 xall_ joined #git
19:41 manuel joined #git
19:42 romerocesar joined #git
19:42 lindenle joined #git
19:43 Vampire0 Yep, I updated the trigger sbeller :-)
19:43 Dougie187 joined #git
19:45 Balliad joined #git
19:47 raphink joined #git
19:52 tgies joined #git
19:54 akanksha__ joined #git
19:55 kimonorouge joined #git
19:55 jimi_ joined #git
19:55 Faylite joined #git
19:56 theskillwithin joined #git
19:57 tgies joined #git
19:59 dan2k3k4 joined #git
20:01 DistantStar joined #git
20:02 tgies joined #git
20:02 sea-gull joined #git
20:03 durham joined #git
20:03 sssilve__ joined #git
20:03 hahuang65 joined #git
20:04 cdg joined #git
20:07 tgies joined #git
20:07 NeverDie joined #git
20:11 eivarv joined #git
20:11 mischat joined #git
20:11 aidalgol joined #git
20:11 thomas1 joined #git
20:12 mischat joined #git
20:12 tgies joined #git
20:13 mischat joined #git
20:13 mischat joined #git
20:14 mischat joined #git
20:14 kulelu88 joined #git
20:15 mellernoia joined #git
20:15 Lor_ joined #git
20:16 jimmyeatworld joined #git
20:16 davidfetter_ge joined #git
20:17 davidfetter_ge hi
20:17 gitinfo davidfetter_ge: 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.
20:17 tgies joined #git
20:18 davidfetter_ge so i used to be using a proxy for git, and i thought i'd removed it by commenting out that section in my ~/.ssh/config , that being where it was set up
20:18 Severin42_ joined #git
20:18 ahr3n joined #git
20:18 davidfetter_ge but git fetch is still apparently trying to use it.  where might such a thing have been cached that ack won't find?
20:19 mischat joined #git
20:22 tgies joined #git
20:22 cdown joined #git
20:22 markgrady joined #git
20:23 romerocesar joined #git
20:23 netcarver joined #git
20:23 GavinMagnus left #git
20:25 raphink joined #git
20:25 raphink joined #git
20:25 Kulrak joined #git
20:25 Kulrak joined #git
20:27 moritz davidfetter_ge: you can check whether GIT_SSH or GIT_SSH_COMMAND are set, and contain some mischief
20:28 moritz davidfetter_ge: or if it's a HTTP(S)-URL, the HTTP_PROXY env variable
20:28 * davidfetter_ge checks
20:28 Dougie187 joined #git
20:28 Severin42_ joined #git
20:28 Mapianka left #git
20:29 slavanap joined #git
20:29 davidfetter_ge the only environment variable matching either of those things is $SSH_AUTH_SOCK
20:29 slavanap Hello. How to list all commits that add submodule / delete submodule or changes submodule hash?
20:30 jstimm joined #git
20:31 boombatower_ joined #git
20:32 tgies joined #git
20:36 sssilver joined #git
20:36 fuchstronaut joined #git
20:37 tgies joined #git
20:37 mischat joined #git
20:42 tgies joined #git
20:44 deltab slavanap: git log path/to/submod
20:44 deltab (I would expect)
20:44 slavanap deltab, and if I want to get that list for all submodules that present in the history? because I deleted some and added new ones.
20:45 deltab maybe git log with --grep
20:46 juutiju joined #git
20:46 syg_ joined #git
20:46 geoid___ joined #git
20:47 tgies joined #git
20:47 slavanap deltab, how to grep on gitlink objects?
20:48 deltab don't know, sorry
20:48 slavanap no prob if you don't know. I currently rewriting some history with submodules. Will investigate soon.
20:50 mrpackethead joined #git
20:51 nilg joined #git
20:52 tgies joined #git
20:52 cyan__ joined #git
20:53 vuoto joined #git
20:54 elisa87 joined #git
20:55 elisa87 how can I view the source-code from the commit 68eec95 of faster-rcnn git repo on github gui?
20:55 theCole joined #git
20:55 jccn joined #git
20:57 tgies joined #git
21:00 gho5t_ joined #git
21:01 _ikke_ github:bgirshick:py-faster-rcnn:68eec95
21:01 protn joined #git
21:01 _ikke_ https://github.com/rbgirshick/​py-faster-rcnn/commit/68eec95
21:01 protn hi
21:01 gitinfo protn: 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.
21:01 yaki29 joined #git
21:02 protn when I git clone can I tell git to stop creating two dirs?
21:02 protn say when I clone vqmod I get vqmod and inside vqmod with dirs and files
21:02 protn :D
21:02 _ikke_ protn: only when the current directory is empty
21:03 protn _ikke_: can you explain more?
21:03 protn say target dir is not empty
21:03 protn whats the wise thing to do?
21:03 _ikke_ Just let it create another dir
21:04 protn and how can I avoid it?
21:04 protn no way?
21:04 WaReZ joined #git
21:04 romerocesar joined #git
21:05 protn ok then whats the best sanest way to move all files 1 level up?
21:05 Rodya_ joined #git
21:06 gho5t_ left #git
21:07 tgies joined #git
21:07 gho5t joined #git
21:07 purple_walrus joined #git
21:08 dsdeiz joined #git
21:08 dsdeiz joined #git
21:08 purple_walrus Is there a way to unpack all git pack files in the objects directory, and instruct git to not pack anything in the future for that repository?
21:08 protn _ikke_:
21:08 protn then best is tell git not to make 2x dirs!
21:08 protn :D
21:08 protn :D
21:09 nedbat purple_walrus: why would you want to do that?
21:09 purple_walrus nedbat: I want to make a read-only symlink-tree checkout of a git repository; symlinking straight to the object directory files would be ideal so I can make it of an arbitrary branch/tag without having a working copy of every branch/tag somewhere
21:10 purple_walrus nedbat: The repository is 99% large object files anyway, so the packing is not going to help
21:10 sagerdearia joined #git
21:10 kimonorouge joined #git
21:12 tgies joined #git
21:12 purple_walrus nedbat: Did you have any suggestions?
21:12 nilg joined #git
21:13 peepsalot joined #git
21:13 nedbat purple_walrus: sorry, i don't know how to do that.
21:13 deltab there's git unpack-objects
21:13 mischat joined #git
21:15 purple_walrus deltab: Thanks, that helps a little. I could write something that ran that on pack files once per fetch and then remove the pack files (is removing them done via a command or do I just start nuking stuff?)
21:15 Noldorin joined #git
21:15 purple_walrus (And is there a way to ask git to not create more packfiles? Is setting auto gc to 0 good enough?)
21:15 purple_walrus Probably not if a fetch pulls down a new pack file right?
21:16 deltab I don't know, sorry
21:16 Dohplay joined #git
21:17 tgies joined #git
21:19 anjen joined #git
21:22 overlord_tm joined #git
21:23 cso joined #git
21:27 tgies joined #git
21:28 kevwil joined #git
21:31 Severin42_ joined #git
21:32 tgies joined #git
21:37 tgies joined #git
21:37 daey why should i not put my whole system into a git repo + echo \* > .gitignore. then add single important config files via git add -f configfile?
21:37 fuchstronaut joined #git
21:37 daey it looks like a good idea, but feels terribly bad at the  same time :D
21:38 Guest37442 left #git
21:38 daey on a new system i would then simply git init; git pull; and be up and running again
21:38 ariver joined #git
21:40 jason237 joined #git
21:42 tgies joined #git
21:43 geoid___ joined #git
21:45 romerocesar joined #git
21:45 vlt daey: owners, groups, permissions maybe
21:46 WaReZ joined #git
21:46 daey vlt: right good point. totally forgot about that :(
21:48 kyan joined #git
21:50 mikecmpbll joined #git
21:52 tgies joined #git
21:54 WayToDoor joined #git
21:57 tgies joined #git
21:57 jasom joined #git
21:58 e14 joined #git
21:59 jasom Why am I getting conflicts with cherry-pick --strategy=recursive --strategy-option=ours
22:00 xall joined #git
22:01 daey i take it file permissions stay intact but the user/usergroup depend on the user who pulls/clones?
22:02 tgies joined #git
22:03 nedbat daey: it would be very inconvenient if when I pulled from your repo, the files were owned by you.
22:03 daey yes
22:05 blackwind_123 joined #git
22:06 kpease joined #git
22:07 tgies joined #git
22:09 theskillwithin joined #git
22:09 kpease joined #git
22:09 justanotheruser joined #git
22:09 King_Hual joined #git
22:10 deltab git only tracks whether a file is executable, no other permissions
22:10 pokalyis joined #git
22:11 deltab there are tools that can write permissions etc. to a file, which you can check in
22:11 cdown joined #git
22:12 tgies joined #git
22:15 _cyril_ joined #git
22:16 ISmithers joined #git
22:17 tgies joined #git
22:19 ISmithers joined #git
22:21 zacts joined #git
22:22 tgies joined #git
22:22 blackwind_123 joined #git
22:25 raijin joined #git
22:25 zacts joined #git
22:27 tgies joined #git
22:27 zacts joined #git
22:29 johnmilton joined #git
22:29 shinnya joined #git
22:31 xall joined #git
22:34 mentoc joined #git
22:35 mentoc joined #git
22:35 mentoc Is it possible to revert a reverted commit?
22:35 disi mentoc: sure
22:35 dryrun811 joined #git
22:36 FroMaster joined #git
22:37 protn i want to talk crap
22:37 protn is it lovely?
22:37 emg joined #git
22:38 mrpackethead joined #git
22:40 hello joined #git
22:40 jeffreylevesque joined #git
22:41 mentoc left #git
22:41 Derperperd joined #git
22:42 tgies joined #git
22:42 theCole joined #git
22:42 romerocesar joined #git
22:42 barq joined #git
22:43 geoid___ joined #git
22:43 FroMaster joined #git
22:44 Bizkit joined #git
22:46 NeverDie joined #git
22:47 tgies joined #git
22:49 Guest71239 joined #git
22:51 mischat joined #git
22:57 tgies joined #git
22:59 rkazak joined #git
22:59 apxm joined #git
23:02 tgies joined #git
23:03 sdothum joined #git
23:04 midnightmagic joined #git
23:06 Rodya_ joined #git
23:06 evie_hammond joined #git
23:06 cyan__ joined #git
23:07 tgies joined #git
23:08 blackwind_123 joined #git
23:08 parliament joined #git
23:11 e14 joined #git
23:11 rivarun_ joined #git
23:12 wizonesolutions joined #git
23:12 tgies joined #git
23:15 ToeSnacks joined #git
23:16 alfism joined #git
23:17 aendrew joined #git
23:17 bbhoss joined #git
23:18 romerocesar joined #git
23:19 kwmiebach__ joined #git
23:20 sagerdearia joined #git
23:20 drbean joined #git
23:21 zivester joined #git
23:22 jstimm joined #git
23:23 buddyq joined #git
23:23 nebg joined #git
23:23 MatthewAllan93 joined #git
23:24 rkazak joined #git
23:24 midnightmagic joined #git
23:25 rcn joined #git
23:25 i7c joined #git
23:26 buddyq joined #git
23:27 tgies joined #git
23:27 uzzer122423 joined #git
23:28 uzzer122423 left #git
23:29 e14 joined #git
23:29 dsdeiz joined #git
23:30 diogenese joined #git
23:31 e14 joined #git
23:31 uzzer122423 joined #git
23:31 uzzer122423 left #git
23:31 e14_ joined #git
23:32 tgies joined #git
23:32 Derperperd joined #git
23:33 Spacew00t joined #git
23:39 knitt1 joined #git
23:39 vmiklos_ joined #git
23:42 uzzer122423 joined #git
23:42 uzzer122423 hello
23:42 gitinfo uzzer122423: 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:42 DeltaHeavy joined #git
23:42 mizu_no_oto joined #git
23:43 uzzer122423 I am wondering how to resolve tricky situation. I had serious of features on depends on another, as a result I got something like a->b->c->d. Now I got feedback on each and got a->a1  b->b1 c->c1 d->d1  .... I cannot merger a1 to b because of no-ff, how can end up with a->a1->b->b1->c->c1->d->d1?
23:43 uzzer122423 series
23:43 tgies joined #git
23:43 e14__ joined #git
23:43 daynaskully joined #git
23:43 jast joined #git
23:43 Stummi_ joined #git
23:43 Random832 uzzer122423: rebase
23:43 uzzer122423 is it fine that branches are pushed to remote already?
23:43 Random832 not reallhy
23:43 Random832 but there's no other way around it but turning off no-ff
23:43 uzzer122423 how would looks like? 4 rebase for each branch
23:43 Random832 go to b and rebase on a, then go to c and rebase on b, etc
23:43 rivarun joined #git
23:43 Random832 why do you use no-ff anyway
23:43 uzzer122423 how can I avoid that situation in feature when I have set of dependant features?
23:43 tgies joined #git
23:43 Random832 what do you mean avoid that situation
23:43 uzzer122423 avoid that series rebase after fixes applied to each branch
23:43 whitby joined #git
23:43 dcpc0071 joined #git
23:43 Random832 ...just do the merge? you're the one who has decided you "cannot merge to b because of no-ff"
23:47 ilbot3 joined #git
23:47 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
23:47 dsdeiz joined #git
23:47 echosystm then i added some files to it, resulting in an 800mb tar file, then replaced that in th repo
23:47 echosystm the resulting repo size is 2gb
23:47 echosystm wtf?
23:48 echosystm i would have thought the repo would be 1gb at most
23:48 echosystm i was hoping the repo would actually be 800mb - i wanted to test if it would actually just store the differential
23:48 akkad joined #git
23:48 atomi joined #git
23:48 jasom echosystm: did you do a repack?
23:49 echosystm nope
23:49 echosystm whats that
23:49 raijin joined #git
23:50 ionelmc joined #git
23:50 jasom echosystm: git doesn't store deltas on every commit; it periodically will collect all commits since last time it did so into a pack; you can call "git gc" to manually make it do so
23:50 EmeraldExplorer joined #git
23:51 Bengi joined #git
23:51 echosystm ok just did that
23:51 echosystm its still 2gb lol
23:51 moei joined #git
23:51 echosystm what the hell is the extra gigabyte coming from?
23:51 [diecast] joined #git
23:51 echosystm it should be only 1gb of data
23:51 mischat joined #git
23:51 techntoke__ joined #git
23:51 addshore joined #git
23:52 harleypig joined #git
23:52 tgies joined #git
23:52 jasom echosystm: probably both the checked out copy and the object in the store
23:52 echosystm ah
23:52 echosystm that makes sense
23:52 worstadmin joined #git
23:52 aeae64ff8df64d2a joined #git
23:52 lebster joined #git
23:52 kireevco joined #git
23:52 johtso joined #git
23:52 jasom echosystm: just try "git repack"
23:52 WillMoogle joined #git
23:52 ec joined #git
23:53 huhlig joined #git
23:53 eshlox joined #git
23:53 cstrahan joined #git
23:53 kutenai_ joined #git
23:53 Anupkumar joined #git
23:53 DuncanT joined #git
23:53 davisonio joined #git
23:53 pizzaops joined #git
23:53 amaged__ joined #git
23:53 da5id joined #git
23:53 echosystm hah
23:53 pfg_ joined #git
23:54 echosystm i dleted the tar file
23:54 lucasem joined #git
23:54 elijah joined #git
23:54 echosystm then did git checkout file.tar
23:54 echosystm and it just crashes
23:54 MLM joined #git
23:54 noahsussman joined #git
23:54 echosystm man, git lfs is the future :D
23:54 unholycrab joined #git
23:54 prosody joined #git
23:54 romerocesar joined #git
23:55 barq joined #git
23:55 bremner !git-lfs
23:55 boxrick1_ joined #git
23:55 fahadash joined #git
23:55 * bremner glares at gitinfo
23:55 ulkesh joined #git
23:55 milkshoes joined #git
23:55 jasom echosystm: I regularly run git on large repositories, so not sure what problems you are seeing.  Perhaps you're using a 32-bit version of git?
23:55 cloudcell_ joined #git
23:55 joseph_arnstein_ joined #git
23:55 Whisket joined #git
23:55 bremner he's using git lfs, which is basically a github thing
23:55 ggherdov joined #git
23:56 jasom bremner: I thought he *wasn't* using git lfs
23:56 rfv joined #git
23:56 Lewix joined #git
23:56 * jasom is confused now
23:56 echosystm git lfs is meant to store binaries more efficiently, or something
23:56 echosystm so i thought i would try it
23:56 yoyoyo_____ joined #git
23:56 stealthii joined #git
23:56 ruskie joined #git
23:56 suchkultur joined #git
23:56 janx joined #git
23:56 _28_ria joined #git
23:57 cory___ joined #git
23:57 felowe joined #git
23:57 tgies joined #git
23:57 e14 joined #git
23:57 henriquev joined #git
23:58 wizonesolutions joined #git
23:58 al-damiri joined #git
23:58 jasom echosystm: I believe it stores binaries outside the repository, and stores complete copies of each revision.  Also I think you need to tell it which files to track (by extension)
23:58 joco42 joined #git
23:58 angular_mike_ joined #git
23:59 echosystm does git store diffs by default?
23:59 sunri5e joined #git
23:59 Iacobus_ joined #git
23:59 zeller joined #git
23:59 echosystm without lfs enabled, the repo size is 500mb smaller

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