Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-01

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

All times shown according to UTC.

Time Nick Message
00:01 dtrott_ joined #git
00:03 SeaK joined #git
00:03 netj joined #git
00:04 rbern joined #git
00:06 kyan_ joined #git
00:07 vassagus joined #git
00:14 aidalgol joined #git
00:18 thiago joined #git
00:21 sssilver joined #git
00:22 arescorpio joined #git
00:22 aidalgol joined #git
00:25 ahr3n joined #git
00:27 aidalgol joined #git
00:28 dodobrain joined #git
00:29 refried_ joined #git
00:29 mingrammer joined #git
00:30 aidalgol joined #git
00:31 SwiftMatt joined #git
00:33 raijin joined #git
00:33 danslo_ joined #git
00:33 SyndicateDon__ joined #git
00:33 aidalgol joined #git
00:34 anttim joined #git
00:34 e14 joined #git
00:36 e14 joined #git
00:38 zivester joined #git
00:40 duderonomy joined #git
00:40 diogenese joined #git
00:41 mellernoia joined #git
00:41 Ardethian\work joined #git
00:43 jnewt joined #git
00:44 A5101 joined #git
00:49 mingrammer joined #git
00:51 Gsham joined #git
00:53 sssilver joined #git
00:55 boombatower joined #git
00:57 cagomez joined #git
00:58 PioneerAxon joined #git
00:59 cagedwisdom joined #git
01:01 dmto joined #git
01:02 ochorocho__ joined #git
01:04 PioneerAxon joined #git
01:07 mycyber joined #git
01:15 chigang_ joined #git
01:17 SwiftMatt joined #git
01:17 nurey joined #git
01:19 Karpuragauram joined #git
01:21 realz joined #git
01:21 rchavik joined #git
01:22 ayjay joined #git
01:23 vrishab joined #git
01:24 durham_ joined #git
01:26 ahr3n joined #git
01:27 ahr3n joined #git
01:31 romerocesar joined #git
01:34 danslo_ joined #git
01:36 jnewt_ joined #git
01:38 romerocesar joined #git
01:38 Guest4280 joined #git
01:40 jaggz joined #git
01:40 jaggz if I did a git init .  in my ~/bin dir
01:40 jaggz how do I make that into a bare repo so I can push to it from other computers?
01:40 jaggz (it's my set of standard scripts and stuff that I use on my systems.. instead of cp'ing things around I'd like to use git)
01:41 pks joined #git
01:42 raijin joined #git
01:46 jaguarmagenta joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
01:49 compeman joined #git
01:52 Dougie187 joined #git
01:53 d^sh joined #git
01:53 Vampire0_ joined #git
01:53 mehola joined #git
01:54 cagedwisdom left #git
01:56 moop joined #git
01:58 thiago joined #git
01:58 dpower joined #git
02:02 ekinmur joined #git
02:03 ruby_ joined #git
02:04 dmto joined #git
02:07 sssilver joined #git
02:07 chachasmooth joined #git
02:08 cqi joined #git
02:09 vassagus joined #git
02:12 Shentino joined #git
02:12 fugiman joined #git
02:13 PioneerAxon joined #git
02:13 sssilver joined #git
02:13 Aces_Charles joined #git
02:18 sssilver joined #git
02:18 Gsham joined #git
02:19 hexagoxel joined #git
02:23 hosttor joined #git
02:24 ome joined #git
02:28 sssilver joined #git
02:30 kyan joined #git
02:33 sssilver joined #git
02:33 sarbs joined #git
02:34 fstd_ joined #git
02:34 duderonomy joined #git
02:34 danslo_ joined #git
02:35 Goplat joined #git
02:37 rgrinberg joined #git
02:39 Wilbur left #git
02:39 sssilver joined #git
02:41 ngladitz joined #git
02:41 ngladitz joined #git
02:41 arescorpio joined #git
02:42 orville left #git
02:45 lagothri1 joined #git
02:45 dmto joined #git
02:49 sssilver joined #git
02:50 dmto joined #git
02:51 raijin joined #git
02:52 CaneToad joined #git
02:52 mizu_no_oto joined #git
02:53 mingrammer joined #git
02:54 dzho jaggz: if I recall correctly you just need to do  git init --bare
02:54 ahr3n joined #git
02:54 dzho alternately, you can push and pull from a non-bare repo just fine from elsewhere so long as you don't have the branches to which you push and pull checked out
02:55 dzho so you could just do "git checkout -b mytotallybogusbranch" and then push and pull to master all day and all night
02:55 dzho a little messy but
02:55 * dzho shrugs
02:56 ruby_ joined #git
02:57 ExodiaPK joined #git
03:00 nurey joined #git
03:04 dmto joined #git
03:04 ochorocho__ joined #git
03:06 SeaK joined #git
03:07 durham joined #git
03:08 DJ_Spies joined #git
03:08 durham joined #git
03:09 vassagus joined #git
03:10 e14_ joined #git
03:10 clemf joined #git
03:23 dodobrain joined #git
03:24 ExodiaPK joined #git
03:25 EduardoMartins joined #git
03:26 watabou joined #git
03:29 Dougie187 left #git
03:32 sssilver joined #git
03:32 rkazak joined #git
03:34 inflames joined #git
03:35 Mobutils joined #git
03:35 danslo_ joined #git
03:35 Gfurst joined #git
03:36 ratiotile__ joined #git
03:37 Gfurst hey guys, is there a git option to always show "less" like when it does when the text bigger than the console window?
03:38 pijiu2 joined #git
03:38 Mobutils_ joined #git
03:38 ratiotile my git fetch is so slow. how can I troubleshoot it? it takes 2m13s!
03:38 sssilver joined #git
03:39 ratiotile I restarted earlier and it was fast for a while, now its slow again
03:39 mehola joined #git
03:39 gfixler joined #git
03:40 ratiotile and its not the repo, since on another machine it is fast
03:40 Oog joined #git
03:42 sssilver joined #git
03:43 jaguarmagenta joined #git
03:48 spinningarrow I'm trying to use pprof to profile an HTTP server I wrote in go, which is basically a couple of middleware functions. However the heap profile shown by pprof shows only the init functions of various packages. How do I see the heap allocations for the actual middleware that I wrote?
03:52 mangolisk joined #git
03:52 sssilver joined #git
03:53 spinningarrow Oh gosh. Wrong channel ><
03:56 sssilver joined #git
03:57 somaReverse joined #git
03:57 somaReverse Hello.
03:58 somaReverse How can I do git push with squashed commits while still keep these commits locally?
03:58 watabou joined #git
04:00 thecomedian joined #git
04:01 spinningarrow somaReverse: you mean keep the squashed commits locally or the unsquashed commits?
04:02 a_thakur joined #git
04:03 daey_ joined #git
04:03 polyzen joined #git
04:06 snowkidind joined #git
04:07 a_thakur joined #git
04:10 vassagus joined #git
04:11 fakenerd joined #git
04:14 sssilver joined #git
04:14 justan0theruser joined #git
04:17 dmto joined #git
04:18 Cabanossi joined #git
04:20 aavrug joined #git
04:21 mycyber joined #git
04:23 SwiftMatt joined #git
04:24 dmto joined #git
04:25 sssilver joined #git
04:25 biotim joined #git
04:27 diogenese joined #git
04:30 sssilver joined #git
04:31 diogenese joined #git
04:33 phanimahesh joined #git
04:34 romerocesar joined #git
04:35 sssilver joined #git
04:35 romerocesar joined #git
04:36 smithbone_ joined #git
04:36 ghoti_ joined #git
04:38 sangy joined #git
04:38 thekrynn joined #git
04:38 CalimeroTeknik joined #git
04:39 fspy joined #git
04:39 dmto joined #git
04:39 Raed|Laptop joined #git
04:39 evanwang joined #git
04:40 imdsm_ joined #git
04:40 vcoinminer joined #git
04:40 bcardarella joined #git
04:40 aboccia joined #git
04:40 [diecast] joined #git
04:40 Lowell joined #git
04:40 ELLIOTTCABLE joined #git
04:40 sebhoss joined #git
04:40 pizzaops joined #git
04:40 FritzLakritz joined #git
04:40 DannyFritz joined #git
04:40 subhojit777 joined #git
04:41 davisonio joined #git
04:41 timwis joined #git
04:41 elijah joined #git
04:41 martin_g joined #git
04:41 mingrammer joined #git
04:41 iamdevnul joined #git
04:41 jleclanche joined #git
04:42 elmcrest joined #git
04:42 henriquev joined #git
04:42 nkhoit joined #git
04:43 sparetire joined #git
04:43 twisted` joined #git
04:44 CEnnis91 joined #git
04:45 mangolisk_ joined #git
04:46 sssilver joined #git
04:46 McKraken_zzzzz joined #git
04:48 davidstrauss joined #git
04:51 PCatinean joined #git
04:52 dmto joined #git
04:52 sadmac joined #git
04:54 ResidentBiscuit joined #git
04:54 vuoto joined #git
04:54 justanotheruser joined #git
04:54 chigang_ joined #git
04:56 anttim joined #git
04:56 govg joined #git
04:57 dmto joined #git
04:58 mmlb joined #git
04:59 phanimahesh joined #git
05:01 a_thakur joined #git
05:01 grawity create a new branch to hold the original commits, then rebase/squash in the first branch
05:03 ealvarez__ joined #git
05:03 mroth joined #git
05:04 tfnico joined #git
05:05 sssilver joined #git
05:06 tobie joined #git
05:06 kutenai joined #git
05:06 DarkMukke joined #git
05:06 _joes_ joined #git
05:06 imanc joined #git
05:06 dunk joined #git
05:06 sfan786_ joined #git
05:06 worstadmin joined #git
05:06 mingrammer joined #git
05:06 cmosguy joined #git
05:06 ionelmc joined #git
05:06 johtso joined #git
05:07 diogenese joined #git
05:07 zeller joined #git
05:08 thm left #git
05:08 sssilver joined #git
05:09 phanimahesh joined #git
05:11 LUMIA930 joined #git
05:11 vassagus joined #git
05:13 mmlb joined #git
05:14 trig-ger joined #git
05:14 flupke joined #git
05:14 jjardon joined #git
05:14 GameGamer43 joined #git
05:15 contracode joined #git
05:15 harleypig joined #git
05:15 parliament joined #git
05:15 jaguarmagenta joined #git
05:15 elsevero joined #git
05:15 spr0tsuki joined #git
05:15 Andrew_K joined #git
05:16 nickstenn joined #git
05:16 diogenese joined #git
05:17 prosody joined #git
05:22 stuh84 joined #git
05:24 jleclanche joined #git
05:26 dreiss joined #git
05:31 sigjuice is "git cherry-pick <commit-id>" equivalent to "git show <commit-id> | patch" ?
05:31 grawity no
05:32 grawity it also copies the commit author information and the commit message
05:33 Mobutils joined #git
05:35 dmto joined #git
05:36 sigjuice how about if we ignore author info and commit message? i.e. "git cherry-pick -n <commit-id>"
05:37 danslo_ joined #git
05:37 ryanp joined #git
05:39 trelane joined #git
05:39 trelane joined #git
05:40 bongjovi joined #git
05:42 sigjuice I just care about the content
05:42 Kicer86 joined #git
05:43 satya4ever joined #git
05:44 runlevl4 joined #git
05:46 Raging_Hog joined #git
05:49 dmto joined #git
05:51 ratiotile joined #git
05:53 ResidentBiscuit joined #git
05:53 preaction joined #git
05:53 kyan joined #git
05:53 dreiss joined #git
05:57 mariuscc joined #git
05:57 constant joined #git
05:57 jknetl joined #git
05:57 hahuang61 joined #git
05:59 mns joined #git
06:00 mingrammer joined #git
06:01 dmto joined #git
06:05 bocaneri joined #git
06:06 a_thakur joined #git
06:06 ochorocho__ joined #git
06:07 dimi1947 joined #git
06:12 kus joined #git
06:13 iskander_work joined #git
06:15 rscata joined #git
06:16 cqi joined #git
06:17 qt-x joined #git
06:19 PaulCape_ joined #git
06:19 M-ou-se_ joined #git
06:19 JeroenT joined #git
06:19 runlevl4 joined #git
06:20 mozzarel1 joined #git
06:20 adante_ joined #git
06:20 avtobiff joined #git
06:20 thecomedian_ joined #git
06:21 neunon_ joined #git
06:21 timthowtdi_ joined #git
06:21 IndigoTiger_ joined #git
06:21 Ankhers_ joined #git
06:21 nights joined #git
06:21 kugel_ joined #git
06:21 kugel_ joined #git
06:21 lmatteis_ joined #git
06:21 andres joined #git
06:22 quite joined #git
06:22 Phlogistique joined #git
06:22 fugiman joined #git
06:22 nebg joined #git
06:22 rideh joined #git
06:22 g5pw joined #git
06:22 slayerjain joined #git
06:22 spaceone joined #git
06:23 kfunk joined #git
06:24 jor joined #git
06:24 zacts joined #git
06:27 M-shine joined #git
06:27 elect joined #git
06:28 roxtrongo joined #git
06:28 cdown joined #git
06:28 curvv_ joined #git
06:30 star_prone joined #git
06:30 tvw joined #git
06:32 dede joined #git
06:34 star_prone joined #git
06:34 somaReverse grawity: Thanks. How can I automate this process?
06:35 sigjuice somaReverse you can automate this with a shell script that is one or two lines long
06:37 afuentes joined #git
06:37 Sceorem joined #git
06:37 danslo joined #git
06:38 jaggz dzho, do git init --bare while within my "git init" repo?
06:38 jaggz I don't have anything I care about checked out
06:39 jaggz uhm.. I mean.. comitted
06:43 danslo joined #git
06:47 elsevero joined #git
06:48 jceb joined #git
06:49 jaggz I'm canceling a search for drivers online
06:49 jaguarmagenta joined #git
06:50 jaggz for some reason they don't have that happen instantaneously.. so I'm waiting, now over a minute I think, for that window to go away
06:50 jaggz I'm really bothered by so much crap in this os
06:51 ResidentBiscuit joined #git
06:51 jaggz sorry.. and we just found out some other bad news in life so I don't really have the time to mess with her computer, but she has to use it
06:51 eduardas_m joined #git
06:52 diogenese joined #git
06:52 thiago joined #git
06:52 i7c jaggz, you can copy/move the .git in a repository and use it as bare. You just have to change an option: git config --local core.bare true
06:53 i7c Other than that there is nothing different between a bare and the .git in a non-bare repo.
06:54 jaggz oh i'm in the wrong channel.. that other stuff was about windows issues
06:54 rvaldes_ joined #git
06:54 _ikke_ jaggz: Was quite clear that it was not about git :P
06:55 jknetl joined #git
06:55 i7c #git is never the wrong channel! :/
06:55 somaReverse hmm
06:55 somaReverse I still feel a bit confused
06:55 thomas_25 joined #git
06:56 somaReverse How can I do git push with squashed commits while still keep these unsquashed commits locally? and how can I do incremental commits while amend my patch with git amend?
06:57 i7c First one is simple.
06:57 i7c If you squash commits, git does not throw away the originals.
06:57 i7c So just put a name (branch/tag) on them and you'll have them.
06:58 i7c git branch original_stuff && git rebase -i HEAD~9001 and squash everything real good.
06:58 i7c And I have no idea what incremental commits are.
06:59 somaReverse i7c: if I want to amend some issues, which branch shall I be? original_stuff?
07:01 i7c somaReverse, well I'd just make another commit on original_stuff, cherry-pick it to the squashed version and squash again probably. But I'm not sure if it makes a lot of sense to amend squashed commits over and over again.
07:01 i7c You'd change the history everytime.
07:01 i7c !rewrite
07:01 gitinfo 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
07:01 _ng joined #git
07:02 yuhlw_ joined #git
07:03 submitnine joined #git
07:09 Darcidride__ joined #git
07:10 thiago_ joined #git
07:12 ratiotile joined #git
07:12 TomyWork joined #git
07:12 vassagus joined #git
07:13 omegak joined #git
07:16 somaReverse i7c: But I have to push an amend commit to gerrit in order to make a clean patch.
07:17 somaReverse I would never push an amend commit to master.
07:19 cbarbieri joined #git
07:21 cydrobolt joined #git
07:21 mingrammer joined #git
07:21 cydrobolt joined #git
07:21 phanimah1sh joined #git
07:22 caffeinatedcode joined #git
07:22 caffeinatedcode joined #git
07:22 ix007 joined #git
07:22 timthowtdi joined #git
07:23 boshhead joined #git
07:23 romerocesar joined #git
07:23 xaa joined #git
07:23 thesquib joined #git
07:23 ldlework joined #git
07:24 dreiss joined #git
07:24 maqr joined #git
07:25 ldlework joined #git
07:25 bttf joined #git
07:25 JeroenT joined #git
07:25 Sigma joined #git
07:25 Aaeriele joined #git
07:26 dsantiago joined #git
07:28 thiago joined #git
07:29 i7c Yup, makes sense.
07:30 kba left #git
07:30 quetz joined #git
07:30 jaggz i7c, move the .git?
07:31 jaggz move it where?
07:31 jaggz oh
07:31 i7c There where you wanna have the bare repo
07:31 i7c mv derp/.git derp.git
07:31 jaggz is it still named .git?
07:31 i7c for example
07:31 jaggz oh
07:31 jaggz interesting
07:31 jaggz cool :)
07:31 jaggz so bare means "without the files"
07:31 i7c By convention the bare repos usually are named with .git in the end.
07:31 i7c jaggz, exactly.
07:31 jaggz wasn't sure for the past few years what that meant :)
07:31 i7c Without working tree.
07:32 jaggz ('course, I deal with it only rarely)
07:32 DieguezZ joined #git
07:32 j416 iirc you'll have to flip a config key also to make it bare
07:33 j416 git config core.bare true
07:33 Silenced_v2 joined #git
07:33 Silenced_v2 joined #git
07:33 i7c Yup
07:33 i7c I mentioned that. :)
07:33 jaggz "You just have to change an option: git config --local core.bare true"
07:33 j416 ah, didn't scroll high enough
07:33 j416 apologies
07:33 jaggz so mv it then that
07:33 jaggz not accepted
07:34 j416 D:
07:35 jaggz X)
07:38 Lunatrius joined #git
07:38 Anupkumar joined #git
07:38 rvaldes joined #git
07:41 eijk joined #git
07:41 thiago joined #git
07:41 eijk_ joined #git
07:43 m1dnight1 joined #git
07:44 encod3 joined #git
07:47 ahmedelgabri joined #git
07:47 Balliad joined #git
07:48 jceb joined #git
07:48 star_prone joined #git
07:49 m1dnight1 joined #git
07:50 ShapeShifter499 joined #git
07:50 ResidentBiscuit joined #git
07:50 ThomasLocke joined #git
07:51 atomicb0mb joined #git
07:52 garethdaine joined #git
07:54 ferr joined #git
07:55 filcab joined #git
07:57 nbdy joined #git
08:00 Erjiin joined #git
08:01 rjack2_ joined #git
08:02 marcogmonteiro joined #git
08:03 cfjk joined #git
08:04 Juzzika joined #git
08:07 kurkale6ka joined #git
08:07 eijk_ joined #git
08:07 ochorocho__ joined #git
08:09 chll_ joined #git
08:10 g105b joined #git
08:12 jaggz left #git
08:13 vassagus joined #git
08:13 Erjiin left #git
08:14 bongjovi joined #git
08:15 a_thakur joined #git
08:22 tomog999 joined #git
08:23 maxorator joined #git
08:23 poz3idon joined #git
08:25 ShapeShifter499 joined #git
08:25 nikivi joined #git
08:28 beepbeep_ joined #git
08:30 infra-red joined #git
08:31 thomas_25 joined #git
08:31 lss8 joined #git
08:35 cyan__ joined #git
08:37 jceb joined #git
08:38 jimi_ joined #git
08:39 Lunatrius` joined #git
08:39 JeroenT joined #git
08:40 star_prone joined #git
08:42 mar77i joined #git
08:43 JeroenT_ joined #git
08:45 beepbeep_ left #git
08:45 JeroenT__ joined #git
08:45 anonymuse joined #git
08:45 Ezzy joined #git
08:47 eijk joined #git
08:47 irco joined #git
08:48 _pingu joined #git
08:51 _pingu just did git pull --rebase origin master. Than I make a mistake. did git rebase --skip 3 times and finished the rebase. How can I get back these 2 commits?
08:52 _pingu corrected typos: just did git pull --rebase origin master. Than I made a mistake. did git rebase --skip 3 times and finished the rebase. How can I get back these 3 commits?
08:52 selckin !reflog
08:52 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
08:52 rwb1 joined #git
08:53 sharkz- joined #git
08:53 adamm_ joined #git
08:53 tureba_ joined #git
08:53 daey_ joined #git
08:54 daey_ joined #git
08:54 hwoarang_ joined #git
08:54 linuxmint joined #git
08:54 ruben-ikmaak joined #git
08:55 kenansulayman joined #git
08:55 tilpner_ joined #git
08:57 Neico joined #git
08:58 cust_ joined #git
08:59 chimeracoder joined #git
08:59 SirCmpwn joined #git
08:59 themill joined #git
08:59 Dev0n joined #git
08:59 ngladitz joined #git
08:59 ngladitz joined #git
08:59 mniip joined #git
08:59 Ankhers joined #git
08:59 miklcct joined #git
08:59 phroa joined #git
09:00 g5pw joined #git
09:00 spb joined #git
09:00 eduardas_m joined #git
09:00 go1111111 joined #git
09:00 GavinMagnus joined #git
09:00 rscata joined #git
09:00 JeroenT joined #git
09:00 satya4ever joined #git
09:00 Hko joined #git
09:00 ahmedelgabri joined #git
09:00 nellicus_ joined #git
09:00 tomog999 joined #git
09:01 rossome joined #git
09:01 p1k joined #git
09:01 adamm joined #git
09:01 Afforess joined #git
09:01 oxsyn joined #git
09:03 irqq joined #git
09:03 flopsec joined #git
09:03 lss8 joined #git
09:03 irco joined #git
09:03 mehola joined #git
09:03 KnightsOfNi joined #git
09:03 traxo-xx joined #git
09:03 SpeakerToMeat joined #git
09:03 kaldoran joined #git
09:03 tristanp joined #git
09:03 shurnormal joined #git
09:03 AndreSomers joined #git
09:03 snits_ joined #git
09:03 LHL_Jordan joined #git
09:03 deltab joined #git
09:03 invisbl joined #git
09:03 chid joined #git
09:03 Vgr joined #git
09:03 BeerSerc joined #git
09:03 mrkake joined #git
09:03 siprbaum joined #git
09:03 mwleeds joined #git
09:03 gruetzkopf joined #git
09:03 SebastianFlyte joined #git
09:03 styler2go joined #git
09:03 johnnyfive joined #git
09:03 jesk joined #git
09:03 EgS joined #git
09:03 jast joined #git
09:03 Ekho joined #git
09:03 krabat joined #git
09:03 bond joined #git
09:03 gnoirzox joined #git
09:03 Soliton joined #git
09:03 Derega joined #git
09:03 forgot joined #git
09:03 flopsec joined #git
09:03 Rikairchy joined #git
09:03 lss8 joined #git
09:04 ExeciN joined #git
09:04 ggherdov joined #git
09:04 SpeakerToMeat joined #git
09:04 lucz joined #git
09:05 JackMc joined #git
09:05 d1b joined #git
09:06 anderss_ joined #git
09:06 abra0 joined #git
09:06 Muzer joined #git
09:06 lvns joined #git
09:06 lolmac joined #git
09:07 johnnyfive joined #git
09:07 GavinMagnus left #git
09:09 star_prone joined #git
09:09 ggherdov joined #git
09:10 King_Hual joined #git
09:10 courrier joined #git
09:10 Silenced_v2 joined #git
09:10 govg joined #git
09:11 Silenced_v2 joined #git
09:11 MikeChernev joined #git
09:11 ToBeFree joined #git
09:12 infra-red joined #git
09:13 _pingu selckin: thanks. worked
09:13 _pingu :-)
09:14 vassagus joined #git
09:15 curvv_ left #git
09:18 nikivi joined #git
09:18 phroa joined #git
09:19 miklcct joined #git
09:20 qpdb joined #git
09:20 iron_houzi joined #git
09:22 iron_houzi If I have a branch with only two commits, how do I join these two commits into one? I've tried doing `git rebase -i HEAD~1`, but this will not let me choose squash, and pick will not change anything ..
09:23 al-damiri joined #git
09:24 anderss_ joined #git
09:25 moritz iron_houzi: git rebase -i --root HEAD~2
09:26 iron_houzi moritz: Thanks!
09:26 moritz iron_houzi: likely without HEAD~2 even
09:26 moritz root starts from the, well, root
09:26 moritz :-)
09:28 ochorocho__ joined #git
09:30 cdown joined #git
09:34 cyan__ joined #git
09:39 Lomex joined #git
09:40 ahmedelgabri joined #git
09:41 JeroenT joined #git
09:43 ujo joined #git
09:48 JeroenT joined #git
09:49 ronskisika joined #git
09:55 JeroenT joined #git
10:00 mingrammer joined #git
10:00 mingrammer joined #git
10:02 joegreen88 joined #git
10:03 nikivi joined #git
10:05 CheckDavid joined #git
10:05 nikivi joined #git
10:05 vrishab joined #git
10:11 elementalest joined #git
10:12 cdown joined #git
10:13 a3Dman joined #git
10:13 noteness joined #git
10:15 dmto joined #git
10:20 rbr joined #git
10:21 Munt joined #git
10:24 ShapeShifter499 joined #git
10:27 Raging_Hog joined #git
10:29 raijin joined #git
10:29 Vortex34 joined #git
10:30 rahtgaz joined #git
10:32 star_prone joined #git
10:42 ahr3n joined #git
10:43 JeroenT joined #git
10:47 atomicb0mb joined #git
10:49 jceb joined #git
10:49 ronskisika joined #git
10:51 jaguarmagenta joined #git
10:55 Raging_Hog joined #git
10:58 BlackMaria joined #git
10:58 danslo joined #git
11:02 Munt joined #git
11:05 tvw joined #git
11:06 star_prone joined #git
11:06 Lomex joined #git
11:07 dodobrain joined #git
11:07 kba joined #git
11:07 heftig joined #git
11:08 kba I have a branch issue-2 with a commit. Now I want to merge that branch onto master (apply the commit in issue-2). How do I do that? When I do `git checkout issue-2`, it says "Branch issue-2 set up to track remote branch issue-2 from origin. Switched to a new branch 'issue-2'"
11:08 kba But issue-2 is not a new branch. It's in my repository.
11:10 Joost it's a new branch locally, though
11:10 kba Hm, okay, never mind. I tried http://stackoverflow.com/a/5602109/453331 now (again) and it worked
11:10 kba Joost: Ah, I see
11:10 Joost by checking it out, you're creating it locally
11:10 kba So how would I have done it?
11:11 kba How would I check it out from the remote repo+
11:11 rnsanchez joined #git
11:11 Joost I would've probably done what you did
11:11 Joost git checkout the branch, git checkout back to master, git merge the branch
11:11 Munt joined #git
11:11 Joost although git fetch --all would've prevented the branch switch
11:12 kba How would I checkout the remote branch then?
11:12 Joost or.. that might even be default behaviour of git pull
11:12 Joost kba: you cannot check out a remote branch
11:12 Joost you check out a local copy that tracks a remote branch
11:12 kba Oh, so when it said "Switching to a new branch 'issue-2'", it meant that it copied the remote branch and made a new branch locally called issue-2?
11:13 Gurkenglas joined #git
11:14 ljc joined #git
11:14 Joost yeah
11:14 Joost where 'copied' means 'created a pointer to a commit'
11:14 Joost ah, you could have also done `git merge origin/issue-2`, of course
11:15 Joost to merge the remote issue-2 branch into your local master branch
11:15 Joost (assuming it's at origin/)
11:15 Joost then you would not have needed to create a local branch issue-a
11:15 Joost issue-2*
11:15 Joost maybe `git branch -a` sheds some light on the situation
11:15 vassagus joined #git
11:18 BigDru joined #git
11:19 bernardio joined #git
11:19 somaReverse joined #git
11:19 jceb joined #git
11:19 ojdo joined #git
11:20 a_thakur joined #git
11:22 Raed|Mobile joined #git
11:26 mingrammer joined #git
11:26 sdothum joined #git
11:29 ochorocho__ joined #git
11:30 a_thakur joined #git
11:30 JeroenT joined #git
11:33 dsdeiz joined #git
11:33 elichai2 joined #git
11:33 elichai2 hey
11:34 elichai2 how do I see the diffrence in a specific file between 2 comments?
11:34 elichai2 (or between now and an old comment)
11:34 tobiasvl elichai2: man git diff
11:34 gitinfo elichai2: the git-diff manpage is available at http://jk.gs/git-diff.html
11:34 tobiasvl git diff $COMMIT1 $COMMIT2 -- $FILE
11:36 ImNotQ009 joined #git
11:36 ImNotQ009 Hello. Is there a way to cherry-pick a commit that's been amended?
11:36 ImNotQ009 Without causing conflicts with the previous version of that commit
11:36 elichai2 tobiasvl, I tried that, but this is what I get:
11:36 elichai2 diff --git a/doublespend.py b/doublespend.py
11:36 elichai2 old mode 100755
11:36 elichai2 new mode 100644
11:37 grawity that's the only difference then
11:37 grawity somebody did chmod -x it
11:38 elichai2 grawity, but what this difference means?
11:38 elichai2 permissions?
11:38 _ikke_ git only tracks the executable bi
11:38 _ikke_ bit
11:38 tobiasvl permissions, yes
11:39 tobiasvl someone removed the permission to execute it
11:39 tobiasvl permissionS
11:39 _ikke_ Or added it if the diff was reversed
11:39 tobiasvl oh yeah dang
11:41 i7c ImNotQ009, mhm? You want to cherry-pick again after you amended it and which had been cherry-picked before?
11:41 ImNotQ009 Yes
11:42 i7c You can do that sure. But git won't automatically amend the previously cherry-picked commit, if that’s what you want.
11:42 i7c You can do it manually tho.
11:44 bernardio joined #git
11:45 ImNotQ009 i7c: thing is, I really only want the changes to be merged with my local branch :P
11:45 ImNotQ009 Without doing actual mergin, as it breaks things
11:46 mingrammer joined #git
11:46 i7c How does it break things?
11:46 kba Joost: Okay, thanks a bunch for the explanation! :)
11:46 govg joined #git
11:46 ImNotQ009 i7c: when I merge to my branch I'm unable to push to the remote repo, as it prevents me from uploading merged changes
11:47 i7c Oh lord.
11:47 ImNotQ009 I work with Gerrit
11:48 moop joined #git
11:49 tobiasvl surely with gerrit you're only unable to push a merge to the remote if you have already pushed there?
11:49 Lomex joined #git
11:49 tobiasvl you need to rebase on the correct gerrit branch
11:49 tobiasvl otherwise nothing is a fast forward
11:49 tobiasvl (or something… been a while since I used gerrit)
11:50 eijk joined #git
11:50 lmatteis_ joined #git
11:53 alexsystemf___ joined #git
11:56 subhojit777 joined #git
11:57 ImNotQ009 Anyway, nevermind. I figured that I don't have to do that
11:57 Jellyg00se joined #git
11:58 dpower joined #git
11:58 ewet joined #git
11:58 JeroenT joined #git
11:59 hacker_named_4_c joined #git
11:59 rchavik joined #git
12:02 Sceorem joined #git
12:03 rgrinberg joined #git
12:05 andlabs joined #git
12:06 rgrinberg joined #git
12:06 inflames joined #git
12:07 pro_metedor joined #git
12:11 lamont joined #git
12:13 d0nn1e joined #git
12:15 tlaxkit joined #git
12:18 darkbit joined #git
12:18 zeroed joined #git
12:19 dermoth_ joined #git
12:20 Lomex joined #git
12:23 sagittarian|2 joined #git
12:24 synthroid joined #git
12:28 BigDru Question: if i have /build specified in my .gitignore and i use git add -A, will my file in /build be staged?
12:29 BigDru Does -A ignore the ignored files?
12:29 _ikke_ no
12:29 _ikke_ only -f does
12:29 ahmed_elgabri joined #git
12:29 JeroenT joined #git
12:30 ash_workz joined #git
12:30 BigDru Thank you
12:32 elichai2 left #git
12:34 antipsychiatry joined #git
12:34 bruce_lee joined #git
12:35 holodoc joined #git
12:39 thiago joined #git
12:39 andlabs joined #git
12:39 eijk joined #git
12:40 anderss__ joined #git
12:40 daniel_rose joined #git
12:41 Gamecubic joined #git
12:41 bejeb joined #git
12:42 ToBeCloud joined #git
12:42 alcohol _ikke_: you so funneh
12:43 bejeb If I do git clone --mirror <remote uri> <local mirror path>, and then git clone --reference <local mirror path> <remote uri> <local working repo path>. When I do pushes/pulls/fetches in my local working repo, does the mirror also update? I.e. do my requests go via my mirror and update it, or do I also need to do git remote update on the local mirror?
12:43 jeffreylevesque joined #git
12:44 JanC_ joined #git
12:47 BigDru If i have a project that has the /build folder staged and added to the repo from the start. from the master branch two other branches have split off and therefore are also tracking files in /build. If i want to add /build to .gitignore and remove them from tracking with rm --cached in the entire repo, do i need to do it on every branch or is there an easier way to do it?
12:48 _ikke_ alcohol: why me funneh?
12:49 subhojit777 joined #git
12:49 alcohol _ikke_: maybe i read it wrong, but i saw him asking if -A ignores ignored files, and you said no, -f does (but pretty sure -A ignores them and -f forces them to be added) :x
12:51 bremner -f ignores the fact that they are ignored
12:52 jaguarmagenta joined #git
12:52 _ikke_ right, that's how I meant it
12:52 BigDru I assumed the no was to the first question.
12:53 anderss__ joined #git
12:53 BigDru No they will not be staged
12:53 star_prone joined #git
12:54 Lomex joined #git
12:55 a_thakur_ joined #git
12:56 ShekharReddy joined #git
12:58 anderss__ joined #git
12:59 bejeb basically I'm was intending on using git clone --mirror to provide a local repo to help with network performance, but reading --reference (and therefore --shared) on https://git-scm.com/docs/git-clone, I'm not sure it seems to be a smart idea.
13:00 zivester joined #git
13:00 pro_metedor joined #git
13:02 _ngz_ngzz joined #git
13:02 * bejeb thinks maybe I should just get a better network connection to the gitlab server
13:02 bagnz0r joined #git
13:02 bagnz0r Hi guys
13:02 gitinfo bagnz0r: 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.
13:03 bagnz0r So I just potentially lost 6 hours worth of commits because branches
13:03 danslo joined #git
13:03 bagnz0r I had a local branch, set up one on bitbucket, did a pull on master
13:03 bagnz0r And all changes from my branch are gone
13:03 bagnz0r Back to what they were on master
13:03 bagnz0r What do I do?
13:03 tobiasvl "because branches"
13:03 tobiasvl bagnz0r: !repro
13:03 gitinfo bagnz0r: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
13:04 bejeb bagnz0r: define "gone"
13:04 jimi_ joined #git
13:04 _ikke_ bagnz0r: first, it's very unlikely they're gone
13:04 bagnz0r http://hastebin.com/toxehucoku.coffee
13:04 bejeb more likely you just can't see them
13:04 kappter joined #git
13:04 jaafar joined #git
13:05 _ikke_ bagnz0r: what branch(es) do you think are gone
13:05 fees joined #git
13:05 bagnz0r all changes from statistics
13:05 bagnz0r It was a local branch to begin with
13:06 zeroed joined #git
13:06 zeroed joined #git
13:06 tobiasvl doesn't look like it
13:06 tobiasvl you pulled it down
13:06 _ikke_ (fetched it)
13:06 tobiasvl you fetched it down
13:06 bagnz0r It was, then created the same thing in bitbucket, fetched
13:06 bagnz0r And all changes in it are gonsky
13:06 tobiasvl and checked it out, and then it says "Switched to a new branch 'statistics'
13:07 bagnz0r http://hastebin.com/afadejanuq.vbs
13:07 bagnz0r Last commit in the branch
13:07 tobiasvl statisitics
13:07 bagnz0r Before fetch
13:07 tobiasvl not statistics
13:07 * bagnz0r facepalms
13:07 tobiasvl :)
13:07 bagnz0r I am an idiot
13:07 bagnz0r Thanks
13:08 tobiasvl hehe, np
13:08 dodobrain joined #git
13:08 tobiasvl "git branch" would have been a good thing to check maybe
13:10 jstein_ joined #git
13:11 ExoUNX joined #git
13:11 CEnnis91 joined #git
13:13 danslo joined #git
13:15 zeroed joined #git
13:17 ekinmur joined #git
13:17 kyan joined #git
13:18 bejeb hmmm, so I think I get this ... git clone --mirror is a point in time snapshot of a repo. Using it as a reference is great soon after that point in time, but the more that is done in terms of pushes (especially force-with-lease) pushes to the remote the more the mirror gets out of sync, and the less use it is as a reference for future clones of the remote. Is that about right?
13:19 cdg joined #git
13:19 Raging_Hog joined #git
13:19 bejeb by the same token, if a branch was deleted from the remote, and then git remote update is done on the mirror, then the local repo may suddenly have dangling objects ... that sounds nasty
13:20 shaggycat joined #git
13:20 hue joined #git
13:20 leeN joined #git
13:22 raijin joined #git
13:22 mozzarel1 joined #git
13:23 nurey joined #git
13:23 cjohnson If I git push --force, does that only push the current branch?
13:23 cjohnson I think maybe it's based on a config setting? anybody know which?
13:24 jast cjohnson: depends on your push.default setting. in git 2.x, yes, only the current branch by default.
13:24 cjohnson matching
13:24 Noldorin joined #git
13:24 jast in that case it potentially pushes multiple branches
13:24 cjohnson What should I use to not do that
13:25 jast you could use the 2.x default, 'simple'
13:25 jast or you can manually tell git what to push: git push -f origin mybranch
13:25 cjohnson simple = current branch always, matching = any branch that is set up with remote tracking, basically?
13:26 Vgr_ joined #git
13:27 cjohnson So I switched to simple, is there now a command that would push all matching?
13:27 cjohnson or would I have to use the inline config override to get that
13:27 sangy joined #git
13:28 bejeb can't you use the refspec : for that? I tend to stick to being explicit so can't recall.
13:28 cjohnson Occasionally I change several branches and don't remember ot push between each
13:28 thiago right, if you're going to force, be explicit what you're forcing
13:29 cjohnson yeah for sure there that's why I'd rather the config be simple
13:29 cjohnson but still be able to occasionally non-force push all my branches that have local commits to push
13:29 thiago what config?
13:29 cjohnson push.default
13:29 cjohnson so git push --force   now only does current, but is there a way to say git push --all ?
13:29 cjohnson or something like that
13:30 cjohnson yep --all is it
13:30 cjohnson cool, perfect
13:30 ochorocho__ joined #git
13:30 cjohnson thanks rubber duck
13:32 tref joined #git
13:32 sentriz joined #git
13:37 star_prone joined #git
13:37 raijin joined #git
13:38 Seveas quack.
13:39 rnsanchez_ joined #git
13:39 griffindy joined #git
13:39 Guest69 joined #git
13:40 AaronMT joined #git
13:40 Silenced joined #git
13:40 Silenced joined #git
13:40 dendazen joined #git
13:41 zorph joined #git
13:41 AaronMT joined #git
13:41 Dougie187 joined #git
13:41 zorph left #git
13:43 t0by joined #git
13:44 jceb joined #git
13:45 jjardon left #git
13:45 xsallowed joined #git
13:46 caffeinatedcode joined #git
13:46 caffeinatedcode joined #git
13:48 Gsham joined #git
13:48 lmat When I  git clone or git fetch or anything, it uses a weird port in the 24 thousands.
13:49 lmat No port is specified in .git/config, nor in ~/.ssh/config.
13:49 lmat Oh yeah, I'm using cygwin.  Is there any way to set (and more importantly, unset!) a default SSH port for git?
13:49 lmat Hmm, I should see if my ssh client does the sam ething.
13:49 _ikke_ What protocol?
13:49 _ikke_ git remote -v show
13:49 lmat _ikke_: ssh
13:49 lmat _ikke_: Right, no port shown there.
13:49 bremner port on which end of the connection, client or server?
13:49 moritz lmat: typically the default ports come from /etc/services
13:49 Lomex joined #git
13:50 lmat bremner: I don't care which port the client uses to make the connection.
13:50 _ikke_ lmat: Isn't that the process itself that decides the port?
13:50 _ikke_ moritz: *
13:50 _ikke_ moritz: /etc/services is iirc just for descriptions
13:51 lmat services seems to be the IANA table of known ports :-)    anyway,  ssh  22/tcp    as expected.
13:51 canton7 lmat, "it uses are weird port in the 24 thousands" <-- are you sure you're not looking at the client port by accident?
13:51 canton7 if you clone a repo over ssh and don't specify a port, it will always use 22. Likewise http/https and 80/443
13:51 atomicb0mb joined #git
13:51 lmat canton7: Positive. Let me get the error for you.
13:51 lmat canton7: no!! It's not! :-)
13:52 lmat canton7: give me an example url to clone?
13:52 moritz _ikke_: not really. In some APIs you can use a port name, and it resolves the port for you through /etc/services
13:52 canton7 git@github.com:canton7/RestEase.git
13:52 lmat git fetch --all;   Fetching upstream     ssh: connect to host github.com port 23493: Connection timed out
13:52 _ikke_ Right
13:52 canton7 is it always 23493?
13:53 lmat canton7: it says "Cloning into 'RestEase'..." and is now waiting for the TCP timeout because it's waiting on the wrong port.
13:53 lmat canton7: yes!
13:53 canton7 what happens if you ssh -vvv git@github.com ?
13:53 canton7 or clone git://github.com/canton7/RestEase.git ?
13:53 lmat canton7: I use that port sometimes for a server to which I connect betimes.  Okay, it came back with the same error when trying to clone your repo.
13:53 VladGh joined #git
13:53 lmat canton7: That worked!   git://github....
13:54 canton7 and the ssh command?
13:54 lmat no good, same error.
13:54 sssilver joined #git
13:54 lmat It seems my ssh is busted.
13:54 dmto joined #git
13:54 lmat I have a server that doesn't listen on 22, but it does listen on 23493. I did   ssh that_server; and it connected right away.
13:54 canton7 it does look like ssh and only ssh
13:54 lmat creepy
13:54 lmat yes yes
13:54 lmat now fix it ;-)
13:54 canton7 nothing in .ssh/config ?
13:55 lmat canton7: file doesn't exist.
13:55 lmat OH WAIT!
13:55 * bremner waits
13:55 lmat ssh -vvv  shows "Reading configuration data /etc/ssh_config" looking
13:55 lmat THERE IT IS!
13:55 lmat Port 23493
13:55 bremner wack
13:55 canton7 :)
13:55 lmat I meant to change the ssh*D* configuration to listen on that port.
13:55 * lmat is whacked
13:56 * bremner cleans the footgun and puts it back on the rack for the next user
13:56 lmat I love GNU/Linux..... do you know what a nightmare this would have been to diagnose and fix in Microsoft Windows? Click, Click, Click, click, nope, not that setting.  Click, Click, Cl...
13:57 noidea joined #git
13:57 noidea joined #git
13:57 lmat crap.  "/etc/ssh_config E212: Can't open file for writing"
13:57 lmat on to #cygwin...
13:57 nettoweb joined #git
13:57 tobiasvl to be fair powershell isn't too bad
13:57 tobiasvl not that I'm not happy I work with linux though
13:57 bremner now you can have both ;)
13:57 canton7 lmat, your user doesn't have permission to edit that file
13:57 tobiasvl lmat: sudo?
13:58 tobiasvl lmat: :help E212
13:58 tabrez joined #git
13:58 drizztbsd joined #git
13:58 lmat tobiasvl: That's right. I used it before I used bash. Between Powershell and Bash, honestly I probably prefer powershell. But using powershell requires using all those stupid cmdlets with all the stupid Microsoft commands which are terrible. It also means using that *awful* *broken* terminal window Microsoft puts out.
13:58 lmat tobiasvl: I'm using cygwin.
13:58 bagnz0r Who needs powershell https://dl.dropboxusercontent.com/u/16012251/Screenshot%202016-09-01%2015.58.10.png
13:58 * canton7 is happily using git bash for all of his bash needs
13:58 tobiasvl bagnz0r: I think you misspelled the branch name in that terminal, missing an "i"
13:59 anderss__ joined #git
13:59 bagnz0r Yess I know
13:59 tobiasvl bagnz0r: just yanking your chain ;)
13:59 lmat canton7: I was using git bash and decided to stick with it, until I noted that I need tmux ^_^  It looks like it's hard or impossible to install tmux there, so I installed cygwin instead.
13:59 canton7 yeah, agreed installing stuff is annoying
13:59 lmat "statistics" looks fine to me ;-) (English first language here ^_^)
13:59 tobiasvl lmat: ah, OK. http://stackoverflow.com/questions/4090301/root-user-sudo-equivalent-in-cygwin
14:00 canton7 I really need to play with the native bash stuff that came in the anniversary update
14:00 lmat tobiasvl: Thanks for the link. I was going to go edit it in notepad or something ^_^
14:01 sssilver joined #git
14:03 lmat tobiasvl: cygstart --action=runas vim /etc/ssh_config;  works, but it opened in the crappy Microsoft Windows broken Terminal window.
14:03 VagabondAzulien joined #git
14:03 lmat tobiasvl: Good enough...  I#<esc>:wq ^_^
14:04 EY__ joined #git
14:05 _ngz_ngzz joined #git
14:07 cyan__ joined #git
14:07 _ng joined #git
14:08 DolphinDream joined #git
14:08 _ng joined #git
14:10 t2mkn joined #git
14:12 l4v2 joined #git
14:14 ResidentBiscuit joined #git
14:16 rahtgaz joined #git
14:17 JeroenT joined #git
14:18 constant joined #git
14:20 kpease joined #git
14:20 nikivi joined #git
14:20 phaleth joined #git
14:21 morenoh149 joined #git
14:21 sssilver joined #git
14:21 dreiss joined #git
14:23 Vivekananda joined #git
14:24 sssilver joined #git
14:25 purope joined #git
14:26 purope Hi, how do I use git archive in order to download a specific file and to output that file into a specific directory?
14:26 rscata joined #git
14:26 osse you can't
14:27 purope Are you sure about that?
14:27 osse git archive is mostly meant to work on a local repo.
14:27 osse few hosting solutions enable remote use of git archive
14:27 purope There's this example here that says otherwise: http://stackoverflow.com/questions/1125476/retrieve-a-single-file-from-a-repository
14:28 crose joined #git
14:28 purope git archive --remote=ssh://host/pathto/repo.git HEAD README.md
14:28 purope Oh, maybe I missed the purpose of git archive
14:28 purope is there another way I can download a single file using git?
14:28 osse if that command works for you then all you need to do is to add  | tar -xf - -C destdir
14:29 purope Will this will the use of git pull to download a newer version?
14:29 osse no
14:30 osse most hosting solutions offer a "raw" link to specific files from specific commits, and with a predictable URL format
14:31 clemf joined #git
14:33 purope True
14:33 purope Github allows that
14:33 purope But this disallows the use of git pulls to do updates
14:33 Seveas if you want git pull to work, do a clone.
14:33 osse so does any solution you can think of except clone
14:33 idmistir joined #git
14:33 idmistir joined #git
14:33 Seveas If you don't want to do a clone, you don't get to use pull.
14:33 jast by the way, 'git archive' allows you to access tree objects, not blob objects directly
14:34 matsaman joined #git
14:34 crelix joined #git
14:34 vuoto joined #git
14:35 Seveas jast: seems to work on blobs too
14:35 Seveas $ git archive HEAD setup.py | tar t
14:35 Seveas setup.py
14:35 jast huh. interesting.
14:35 Seveas yeah, til :)
14:35 osse I've never actually expected jast to say something that is true
14:36 osse purope: with the url you can put "master" in there instead of some specific sha1. then you can simply redownload to update
14:36 matsaman what an insulting thing to say in public =)
14:37 Seveas matsaman: only if it weren't true
14:37 jast osse: I say the occasional true thing you to throw you off
14:37 Vivekananda joined #git
14:37 jast liberally mixed with true but extremely misleading things
14:38 Gsham joined #git
14:38 Guest69 joined #git
14:38 Seveas and the occasional white lie
14:38 osse jast: you're the kind of guy who simplifies 16/64 to 1/4 by striking out the 6'es
14:38 jast speaking of, the other some guy here tried to explain some other guy how branches and HEAD work. his analogy of choice for HEAD was the head of a typewriter.
14:38 matsaman Seveas: no, that just makes it true, not uninsulting, heh
14:38 jast osse: _exactly_
14:39 Seveas matsaman: if the truth insults you, you must be insulted a lot...
14:39 jast reminds me of a statistics 101 lecture for psychologists, speech therapists and such (I had to sit through it because I had psych as a secondary subject)
14:39 jast the girl next to me nudged me and said, hey, don't those numbers on the slide cancel out?
14:40 jast it was something along the lines of 5!/(2!+3!)
14:41 Seveas just ignore the shouty !'s and it all matches.
14:41 jast right-o
14:41 matsaman Seveas: missing the point, to say something that is both true and complimentary in a way that is insulting is insulting for insulting's sake =P
14:41 * matsaman rolls eyes & moves on
14:41 jast who was insulted, by the way?
14:41 cjohnson hahahaha
14:42 matsaman I was, my delicate sensibilities was
14:42 matsaman =)
14:42 matsaman thought that was obvious
14:42 cjohnson Extra butter on mine!
14:42 jast stop confusing me :(
14:42 jast I don't like having to think
14:43 osse as if you've ever known what it feels like to think
14:43 e14 joined #git
14:44 Seveas mmm, butter
14:44 osse One day in the future when something bad happens I need to +o to take care of something and I find that I suddenly can't I'll remember this day and know that I brought it on myself
14:44 thiago joined #git
14:45 vuoto joined #git
14:46 jast :D
14:46 jast boom
14:47 Guest69 left #git
14:47 shinnya joined #git
14:47 VagabondAzulien joined #git
14:47 vuoto joined #git
14:49 BigDru joined #git
14:50 Seveas [16:50] -    NickServ- | (NickServ@services.) Flags      : HideMail, NeverOp, NoOp, NoMemo
14:50 Seveas I can't be opped \o/
14:50 cjohnson NeverOp hahaha
14:50 Seveas (well, by chanserv. other can choose to ignore that)
14:50 vassagus joined #git
14:51 jast false!
14:51 jast :)
14:51 vuoto joined #git
14:51 zacts joined #git
14:52 Seveas hmm, that flag was advertised as such. Bugrit.
14:52 jast the documentation says you can't be added to access lists with that flag
14:52 jast but people can still manually ask chanserv to op you
14:52 _ikke_ Why would you want that? :P
14:52 jast to prove people wrong!
14:52 jaguarmagenta joined #git
14:53 vuoto joined #git
14:53 Seveas people are wrong anyway
14:53 * jast tries if an auto-kick flag can be added for Seveas
14:53 satbyy joined #git
14:53 Seveas only irl
14:53 * cjohnson sticks "Kick me" on Seveas back
14:54 jast that's not so 'auto'
14:54 Seveas tends to work quite well
14:55 Seveas $cow_orker was wearing a shirt with the text "free climb". I interpreted it as an alternative to "free hugs" and climbed him :)
14:56 jast did you see the fine print? it said "free fall"
14:56 _ng joined #git
14:56 xsallowed joined #git
14:56 Seveas more "free kick" :)
14:57 LionsMane joined #git
14:58 ahmed_elgabri joined #git
14:58 lolmac joined #git
14:59 wwalker ok, this worked yesterday. (I know, what changed?  nothing I can figure out).  Simple push from my fork to an upstream I have push rights on.  push fails with "error: src refspec upstream does not match any." - details - https://gist.github.com/wwalker/97a6b23bf9a0c9922d2c2e50ac0cb22d
15:00 wwalker I can rebase against the upstream, I can diff against it, status says I am one commit ahead of it, but push says "bite me"
15:00 ToxicFrog wwalker: you have your arguments backwards
15:01 ToxicFrog It's "git push <remote repo name> <local branch name>:<remote branch name>
15:01 ToxicFrog Try "git push upstream tgops-2396:DEV"
15:01 wwalker DOH
15:01 wwalker cntl-r history isn't helpful when you goofed yesterday.
15:01 wwalker thank you ToxicFrog
15:02 moneylotion joined #git
15:03 Chaser joined #git
15:03 Seveas Anura Toxicus
15:03 griffindy joined #git
15:04 ekinmur joined #git
15:06 abyx joined #git
15:06 neilthereildeil joined #git
15:06 neilthereildeil hi, how can i just get the updated commits from a remote repo without modifying my working tree?
15:06 abyx can feature branches that have been successfully merged into the master branch safely be deleted?
15:07 dmto joined #git
15:07 bremner neilthereildeil: git fetch
15:07 choki joined #git
15:07 neilthereildeil bremner: ok, i did that
15:07 bremner neilthereildeil: see also !remote
15:07 gitinfo neilthereildeil: [!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)
15:07 bremner err. !remote-branch
15:07 bremner sigh.
15:07 NeverDie joined #git
15:07 neilthereildeil but git log --all doesnt show any newer commits
15:07 bremner look at the remote branch, e.g. origin/master
15:08 elect joined #git
15:08 neilthereildeil bremner: how?
15:08 bremner e.g. git log origin/master
15:09 daivyk joined #git
15:09 neilthereildeil no, i dont see the 2 newer commits
15:09 bremner how do you know they exist?
15:10 neilthereildeil i downloaded the zip file into /tmp and git log shows them
15:10 neilthereildeil so then i did get fetch from /tmp to my real code tree
15:10 bremner oh. Then it's probably in FETCH_HEAD, if you didn't define a remote
15:11 neilthereildeil the first time i created this repo, i got it from a different folder
15:11 neilthereildeil how can i view FETCH_HEAD?
15:12 Silenced joined #git
15:12 bremner git log FETCH_HEAD
15:12 Seveas does that show all tips in FETCH_HEAD?
15:12 bremner urg/
15:12 rasto joined #git
15:12 * bremner always defines remotes.
15:12 neilthereildeil yes
15:13 jast cat .git/FETCH_HEAD :)
15:13 neilthereildeil cool, so whats FETCH_HEAD?
15:13 hashpuppy joined #git
15:13 jast well, for remotes you've configured in a repo (e.g. origin), git stores local mirrors of its branches in names like refs/remotes/origin/foo
15:14 Seveas it contains the refs you last fetched
15:14 jast but in some cases, e.g. if no remote config exists, git fetch wouldn't have anywhere to write this information to, so it also always write the tips of each fetched branch into FETCH_HEAD
15:14 timmu joined #git
15:15 waruqi joined #git
15:15 neilthereildeil an origin is where i clone this git repo from, right?
15:16 Seveas 'origin' is the default name of the remote git configures when cloning
15:16 Seveas there's no "an origin", there's "origin", which is "a remote"
15:16 m_antis joined #git
15:16 neilthereildeil whats a remote? is that the location i cloned this git repo from?
15:16 Seveas and .git/FETCH_HEAD can contain refs from multiple remotes (git fetch --all)
15:17 neilthereildeil like when i initially created this repo?
15:17 Seveas a remote is a remote repo. The one you cloned from is one, but you can have more than one
15:18 Seveas e.g. my git.git clone has 6 remotes
15:18 neilthereildeil ok, so if multiplee engineers are working on the same project, i can fetch from multiple trees and have multiple remotes thats im getting data from in my local repo?
15:18 Seveas you can fetch from multiple *repos*
15:18 toydestroyer joined #git
15:19 cjohnson abyx: yes
15:19 cjohnson abyx: git branch --merged to check
15:19 Seveas git branch -d will complain anyway if you want to delete a non-merged branch
15:20 zivester joined #git
15:22 cjohnson yeah but it just feels wrong to check if somebody is alive by trying to kill them
15:22 cjohnson :P
15:23 neilthereildeil i ran git pull before trying git fetch
15:23 neilthereildeil for some reason, i have some WIP commits in git log
15:23 neilthereildeil as if i had stashed changes
15:25 mathstuf joined #git
15:25 danslo neilthereildeil: git pull is basically git fetch followed by a merge, so ... what did you pull?
15:25 vassagus joined #git
15:25 synthroid joined #git
15:25 Seveas neilthereildeil: that can happen if you did pull --rebase and have rebase.autostash set
15:25 neilthereildeil i pulled from a repo that i unzipped that has more updates
15:25 tyreld joined #git
15:25 Silenced joined #git
15:25 Silenced joined #git
15:26 fahadash joined #git
15:26 neilthereildeil ok git stash list shows that i have a WIP stashed
15:26 neilthereildeil i didnt explicitly stash anything
15:27 neilthereildeil the 3 newest log entries in git log are:
15:27 neilthereildeil WIP on master: 0844147
15:27 neilthereildeil index on master: 0844147
15:27 neilthereildeil 0844147bbb33e9b79864db3ee3917f0af4e7c60d
15:29 ahmed_elgabri joined #git
15:29 neilthereildeil but git status still shows all my changes
15:29 neilthereildeil is it safe to delete the stash?
15:29 i7c Well check what’s in there first?
15:30 i7c git stash show
15:30 mathstuf hi, i have a patch which id like to apply on Windows to a file with Windows newline endings; what format should the patch be in? \r\r\n line endings? should i mark it as a binary patch?
15:31 ochorocho__ joined #git
15:31 sssilver joined #git
15:34 dviola joined #git
15:34 sssilver joined #git
15:39 jknetl joined #git
15:40 dreiss joined #git
15:42 bsanford joined #git
15:43 Silenced_v2 joined #git
15:44 BSaboia joined #git
15:44 Silenced_v2 joined #git
15:44 FelixVi joined #git
15:45 ochorocho__ joined #git
15:46 neilthereildeil i7c: how can i delete the 2 most recent stashes that i pasted above?
15:46 mathstuf hmm, --whitespace=fix seems to make it work
15:46 Gsham joined #git
15:46 nettoweb joined #git
15:46 jason237 joined #git
15:49 jumpman joined #git
15:49 Sleepy63 joined #git
15:50 zeroed joined #git
15:51 FelixVi joined #git
15:51 sssilver joined #git
15:53 chrisshattuck joined #git
15:54 subhojit777 joined #git
15:54 sssilver joined #git
15:55 snowkidind joined #git
15:55 FelixVi joined #git
15:57 peepsalot joined #git
15:57 MattMaker joined #git
15:57 hobodave joined #git
15:57 neilthereildeil so another question, since "git log FETCH_HEAD" showed the remote repo's commits, how can i checkout those commits? are they considered part of my repo that i can check out?
15:57 neilthereildeil git log --all doesnt show them
15:58 subhojit_ joined #git
15:59 FelixVi joined #git
15:59 madewokherd joined #git
15:59 e14 joined #git
16:00 zonality joined #git
16:01 subhojit__ joined #git
16:02 ekinmur joined #git
16:05 vassagus joined #git
16:05 moritz neilthereildeil: git checkout FETCH_HEAD
16:06 moritz neilthereildeil: or start a new branch based on it: git checkout -b mynewbranch FETCH_HEAD
16:07 darkbit joined #git
16:07 subhojit_ joined #git
16:10 bejeb if I have a local repo  created with git clone --mirror, and another local repo that uses that as an alternate using git clone --reference. If a branch is deleted in the remote on the server, and then i update the mirror with git remote update, will that break the local working repo?
16:14 _ngz_ngzz joined #git
16:20 Electrometro joined #git
16:20 dodobrain umm.. i was in a detached head state (but on the last commit on master) and then i made 3 commits. how do i get these new commits onto master?
16:21 InfoTest joined #git
16:22 UTAN_dev joined #git
16:22 MaddHatter make a note of your current HEAD SHA (you can get this with "git rev-parse HEAD") then checkout master and merge (--ff-only, if you want) that sha
16:23 MaddHatter that will cause master to have your detached work as well as it's current history. If you want the 3 commits but not whatever detached history preceeded them, then you'll need to cherry-pick or rebase those 3 commits from where they are onto master
16:24 bejeb MaddHatter: couldn't he just git checkout -b new-branch-name first, then merge/rebase/cherry pick from that?
16:24 dodobrain yeah, just found that branch trick
16:24 bejeb that's if dodobrain hasn't already switched to master
16:24 dodobrain thanks guys
16:24 MaddHatter bejeb: yeah, naming it might be better
16:25 dodobrain nah, its ok. i had the last commit id. i simply checkedout master and merged that commitid
16:26 bejeb or ... tag everything, lose nothing (ish)
16:26 dodobrain nah, its was only 3 commits and they were done on top of the latest commit on master
16:27 dodobrain i can;t remember the reason why i checked out the last commit by using its hash in the past
16:27 durham joined #git
16:28 dodobrain simply switching to master actually makes git give the answer as a helpful message: 'warning you are leaving 3 commits behid, ot connected to any of your branches .... git branch <new-branch-name> sha
16:29 dodobrain :)
16:29 bejeb bingo
16:31 BackEndCoder joined #git
16:31 govg joined #git
16:31 BackEndCoder i've been on holiday, and a few  newbies have been touching my repo.. its diverged, but the live site has had some commits added since the branch its using
16:31 BackEndCoder its it possible to go back to commit xyz,  make a branch off  that
16:32 BackEndCoder then wipe the other data so i can start again
16:32 BackEndCoder (but the new created branch will have  all the changes for reference)
16:33 Faylite joined #git
16:33 atomicb0mb joined #git
16:34 MaddHatter BackEndCoder: you can start a branch from anywhere with "git checkout -b branchname SHA1"
16:34 kyan joined #git
16:37 nettoweb joined #git
16:39 makinen joined #git
16:39 tabrez joined #git
16:39 jimi_ joined #git
16:40 makinen I've made modifications to a file but haven't committed yet. How can I revert them?
16:40 jknetl joined #git
16:41 Remram[m] Use `git checkout -- file`
16:43 BackEndCoder thanks
16:43 neilthereildeil is it a bad idea to do development directly in the master branch rather than doing it in a seperate branch and then merging with master?
16:45 mkoskar joined #git
16:45 GavinMagnus joined #git
16:46 romerocesar joined #git
16:46 kpease joined #git
16:48 Vampire0 neilthereildeil, !wf
16:48 Vampire0 neilthereildeil, !workflow
16:48 gitinfo neilthereildeil: Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
16:50 makinen thx
16:52 duderonomy joined #git
16:52 neilthereildeil ok. and another question, what is porcelean in reference to GIT?
16:52 nullie Output format suitable for scripting
16:53 Mobutils joined #git
16:54 Darcidride joined #git
16:56 HedgeWork or suitable to human interaction
16:56 HedgeWork basically "things that are not internal-to-git interfaces"
16:56 neilthereildeil whats an example of porcelean vs non-porcelean?
16:57 preaction plumbing is the non-porcelain. git status --porcelain is an example. git show-ref. git ls-remote.
16:57 HedgeWork neilthereildeil: actually, if you do 'man git' there's a helful list, and they label what is/isn't porcelain :)
16:57 gitinfo neilthereildeil: the git manpage is available at http://jk.gs/git.html
16:57 makinen I'm trying to push a new branch but it fails with the error:  ! [rejected]        develop -> develop (non-fast-forward)
16:58 nullie It's not new
16:58 nullie There's already branch with that name in remote
16:59 terminal_echo joined #git
16:59 Vampire0 neilthereildeil, porcellain is the things you usually use as a user, plumbing is what you tend to use if you do scripting or build porcellain commands
16:59 makinen I can't see it on gitlab
17:00 makinen nullie: oh develop isn't the branch I'm trying to push
17:00 sssilver joined #git
17:00 nullie makinen: your git is configured to push all branches then
17:00 makinen it's the branch which breaks it
17:01 makinen yea probably
17:01 cdown joined #git
17:02 makinen makinen@ThinkPad:~/pointsit/safe/glaucoma$ git pull
17:02 makinen There is no tracking information for the current branch.
17:02 makinen ...
17:02 makinen this is what happens if I try to pull the changes from the remote repo
17:04 makinen If you wish to set tracking information for this branch you can do so with:
17:04 makinen git branch --set-upstream-to=origin/<branch> feature/avausmaksu
17:04 mariuscc joined #git
17:04 makinen this is what it suggests me to do
17:04 anonymuse joined #git
17:06 nullie Do it
17:06 teroshan joined #git
17:07 synthroid joined #git
17:08 makinen what should in place of <branch>?
17:08 makinen "git branch --set-upstream-to=origin/feature/avausmaksu feature/avausmaksu"
17:08 makinen ?
17:09 nitric joined #git
17:09 Faylite joined #git
17:09 UTAN_dev_ joined #git
17:10 subhojit__ joined #git
17:10 nullie Yes
17:10 makinen error: the requested upstream branch 'origin/feature/avausmaksu' does not exist
17:10 makinen makes sense since I haven't it's a new local branch
17:11 GavinMagnus left #git
17:11 makinen makes sense since it's a new local branch*
17:11 nullie Then you have to push first
17:12 SteffanW joined #git
17:12 nullie If you add -u to push it will set upstream too
17:14 makinen http://pastebin.ca/3709227
17:15 nullie git push -u origin feature/avausmaksu
17:15 LaptopBrain joined #git
17:16 makinen works thx :)
17:17 Gsham joined #git
17:18 EvilPenguin joined #git
17:20 joki joined #git
17:20 dreiss joined #git
17:23 pablin_ joined #git
17:24 Sasazuka joined #git
17:24 subhojit__ joined #git
17:29 danslo joined #git
17:29 PioneerAxon joined #git
17:30 lucz joined #git
17:34 zeroed joined #git
17:35 zeroed joined #git
17:36 hahuang65 joined #git
17:36 Groscheri joined #git
17:36 diogenese joined #git
17:40 dreiss joined #git
17:42 lolmac joined #git
17:42 tabrez joined #git
17:42 govg joined #git
17:47 moneylotion joined #git
17:47 spudowiar joined #git
17:50 mingrammer joined #git
17:51 subhojit_ joined #git
17:52 kyan joined #git
17:54 ProbabilityMoon joined #git
17:55 vuoto joined #git
17:55 multi_io joined #git
17:55 dustinm joined #git
17:56 chrisshattuck joined #git
17:58 Balliad joined #git
17:59 pothepanda joined #git
18:05 LeBlaaanc joined #git
18:05 BSAlb joined #git
18:05 blackwind_123 joined #git
18:06 BSAlb joined #git
18:06 BSAlb joined #git
18:06 BSAlb joined #git
18:07 BSAlb joined #git
18:07 LeBlaaanc joined #git
18:07 stompleee joined #git
18:07 BSAlb joined #git
18:10 BrianBlaze420 joined #git
18:11 waht joined #git
18:11 inflames joined #git
18:11 Macaveli joined #git
18:11 toydestroyer joined #git
18:12 ahmed_elgabri joined #git
18:17 m_antis joined #git
18:18 garethdaine joined #git
18:18 stompleee joined #git
18:20 mohabaks joined #git
18:23 dtrott joined #git
18:24 BackEndCoder joined #git
18:24 Guest69 joined #git
18:26 dsantiago joined #git
18:26 f3r70rr35f joined #git
18:26 EvilPenguin joined #git
18:27 neilthereildeil left #git
18:28 MrMojito joined #git
18:31 m_antis joined #git
18:35 manday1 joined #git
18:36 manday1 left #git
18:37 ManDay joined #git
18:37 ManDay I checked out with --depth=1 and someone I can't see any remote branches? I tried git branch -va but it doesnt return what I'd expect
18:37 ManDay there are remote branches but it only lists origin/HEAD and origin/master
18:38 ahmedelgabri joined #git
18:39 vrishab joined #git
18:42 govg joined #git
18:42 tabrez joined #git
18:42 sssilver joined #git
18:42 boombatower joined #git
18:43 NeverDie joined #git
18:44 vassagus joined #git
18:45 mingrammer joined #git
18:45 nicoulaj joined #git
18:46 e14 joined #git
18:46 satbyy joined #git
18:46 actinide joined #git
18:47 m_antis joined #git
18:47 e14 joined #git
18:50 flaguy48 left #git
18:50 morenoh149 joined #git
18:50 Raging_Hog joined #git
18:51 actinide joined #git
18:52 zerox2a joined #git
18:53 sgen joined #git
18:53 nikivi joined #git
18:54 vuoto joined #git
18:54 m_antis joined #git
18:54 jaguarmagenta joined #git
18:54 AnarchyAo joined #git
18:55 cagedwisdom joined #git
18:57 Balliad joined #git
18:58 m_antis joined #git
18:59 anderss__ joined #git
19:00 anderss__ joined #git
19:01 danslo joined #git
19:01 m_antis joined #git
19:02 synthroid joined #git
19:02 boushi joined #git
19:03 Seveas ManDay: checkout knows no --depth=1, so I assume you mean clone --depth=1. If you read the manpage for git-clone, specifically the section for --depth, you should realize why you only see one branch.
19:05 tvw joined #git
19:06 fstd joined #git
19:08 boushi joined #git
19:09 m_antis joined #git
19:10 fstd joined #git
19:11 Surfer2010 joined #git
19:11 shinnya joined #git
19:12 dede joined #git
19:17 romerocesar joined #git
19:17 Cabanossi joined #git
19:20 waht joined #git
19:21 teroshan_ joined #git
19:23 relipse joined #git
19:24 teroshan__ joined #git
19:24 relipse if i want to merge branch foobar i should do git merge --squash foobar right?
19:24 elementalest joined #git
19:24 elementalest joined #git
19:24 nullie why --squash ?
19:24 relipse because there are a ton o commits
19:26 nullie shrug
19:26 relipse you mean it is better to not do --squash?
19:27 thiago joined #git
19:28 hk3380_ joined #git
19:29 robotroll joined #git
19:29 hk3380_ what are some public git projects that have very clean git history (including branches for releases, develop; commit messages; squashes commits; etc)
19:30 toydestroyer joined #git
19:33 musl joined #git
19:34 madewokherd wine's history is very clean, but it's mostly only 2 branches (master and stable) and a single committer (everyone else submits patches through a mailing list)
19:35 e14 joined #git
19:35 nullie linux?
19:35 _ikke_ git.git itself
19:36 _ikke_ though many branches
19:36 _ikke_ but good quality commits
19:36 madewokherd linux is a tangle of merges from what I've heard
19:36 Seveas relipse: --squash loses all history of the branch. If you want that, then by all means use it.
19:37 toydestroyer joined #git
19:38 spriz joined #git
19:40 diogenese joined #git
19:41 marc_v92 joined #git
19:42 byteflame joined #git
19:42 infra-red joined #git
19:45 styx_ joined #git
19:46 ahr3n joined #git
19:48 Mobutils_ joined #git
19:48 lb1c joined #git
19:52 purope joined #git
19:52 andersoldahl joined #git
19:53 al-damiri joined #git
19:53 magikid joined #git
19:53 abyx joined #git
19:53 invisbl joined #git
19:54 nwkj86 joined #git
19:55 cdown joined #git
19:55 actinide joined #git
19:55 IndigoTiger joined #git
19:59 jaggz joined #git
20:00 mingrammer joined #git
20:00 dsantiago joined #git
20:01 purope joined #git
20:01 dodobrain joined #git
20:01 jaggz okay, I went into my .git/ and changed it to a bare repo, then moved .git to /foo/repos/prj.git
20:02 jaggz now I have all my files in ~/bar/ (with no .git in them) .. and without the .git/ folder it doesn't recognize it as a git repo
20:02 nitric joined #git
20:02 jaggz for me to change its origin (or whatever) to point to the bare repo in /foo/repos/prj.git/
20:03 bremner jaggz: what are you trying to accomplish?
20:03 jaggz oh I just mv'ed my prj/ and cloned the original.. yay :)
20:04 jaggz bremner, wanted to convert a git init .   tree to a checked out repo
20:04 jaggz a cloned repo that I could clone and push to from other machines
20:05 bremner well, if you're happy, great. I don't think any of that was needed though, rather "git remote add origin $URL"
20:05 bremner I don't really see how the new clone is better than the old one for pushing and pulling to other machines.
20:06 jaggz I couldn't push to a non-bare repo
20:06 jaggz bremner
20:07 _ikke_ Nor should you
20:07 zumba_addict joined #git
20:08 zumba_addict i want to put all the changes in master that I just git pull'd into my feature branch. This is correct right? git checkout master && git pull && git checkout feature && git merge master
20:08 zumba_addict i found this too, http://stackoverflow.com/questions/16955980/git-merge-master-into-feature-branch
20:08 zumba_addict it says git checkout feature and then git rebase master
20:10 zumba_addict git merge master was successful
20:10 zumba_addict now how do I make all my commits into a single commit? That's what they want
20:10 zumba_addict squash it?
20:12 vassagus joined #git
20:12 byteflame joined #git
20:14 bongjovi joined #git
20:15 m0viefreak joined #git
20:16 _ikke_ Yes, squashing it :-(
20:16 * _ikke_ is annoyed by all those squash all history people
20:18 trelane joined #git
20:18 trelane joined #git
20:21 nitric joined #git
20:21 mattcen joined #git
20:21 boushi joined #git
20:23 iota_pi joined #git
20:24 Munt joined #git
20:25 synthroid joined #git
20:26 courrier joined #git
20:28 sssilver joined #git
20:28 msonntag joined #git
20:30 hahuang61 joined #git
20:30 daynaskully joined #git
20:30 Gurkenglas joined #git
20:31 atomicb0mb joined #git
20:31 ResidentBiscuit joined #git
20:35 MarkusDBX joined #git
20:35 mingrammer joined #git
20:37 PioneerAxon joined #git
20:38 sin3t joined #git
20:40 cyan__ joined #git
20:41 kadoban joined #git
20:41 buzzLightBeer joined #git
20:42 boushi_ joined #git
20:42 buzzLightBeer what’s good practice when you submit a pull request but u realize u made a mistake and need to resubmit?
20:42 osse buzzLightBeer: force push to the PR
20:42 preaction buzzLightBeer: amend the commit and force-push the PR branch
20:43 buzzLightBeer thx
20:43 osse bonus points if  you leave a comment saying you're gonna do that
20:44 buzzLightBeer actually how do i force push to a pr?  lol
20:44 nitrospectide joined #git
20:44 _ikke_ buzzLightBeer: Did you made your change in a branch?
20:45 osse buzzLightBeer: force push to the branch you created the PR from
20:45 nitrospectide What is the best way to resent my working copy to the last commit?
20:45 LeBlaaanc joined #git
20:45 bremner !reset
20:45 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
20:46 nitrospectide bremner: ok. so git reset —hard
20:46 buzzLightBeer i forked someone’s project and i pushed to my fork
20:47 buzzLightBeer and i created the pull request from my fork
20:47 IndigoTiger joined #git
20:48 krs93 joined #git
20:49 vassagus joined #git
20:50 Vivekananda joined #git
20:52 Gsham joined #git
20:55 unbalanced joined #git
20:55 jaguarmagenta joined #git
20:56 vdl joined #git
21:01 Groscheri joined #git
21:02 vassagus joined #git
21:02 BackEndCoder joined #git
21:03 danslo joined #git
21:03 EvilPenguin joined #git
21:04 smakarov_ joined #git
21:04 aidalgol joined #git
21:05 cdg joined #git
21:06 cdg joined #git
21:06 jimi_ joined #git
21:09 ansimation joined #git
21:09 jknetl joined #git
21:10 daynaskully joined #git
21:11 dsdeiz joined #git
21:12 axl_ joined #git
21:14 rgrinberg joined #git
21:17 axl_ joined #git
21:19 cdown joined #git
21:21 IndigoTiger joined #git
21:22 daynaskully joined #git
21:22 sssilver joined #git
21:23 e14 joined #git
21:24 satifant joined #git
21:24 mattcen joined #git
21:24 troulouliou_div2 joined #git
21:25 boushi joined #git
21:25 sssilver joined #git
21:26 LeBlaaan_ joined #git
21:28 jason237 joined #git
21:28 neca joined #git
21:28 krs93 joined #git
21:30 EvilPenguin joined #git
21:32 vassagus joined #git
21:32 fahadash joined #git
21:33 CaptainHeavy joined #git
21:34 daynaskully joined #git
21:34 daynaskully joined #git
21:35 dendazen joined #git
21:37 ahr3n joined #git
21:38 mooru joined #git
21:38 LionsMane joined #git
21:40 skinux joined #git
21:40 skinux Is there a command to make a certain branch the master branch or do I just checkout the master branch and push to it?
21:41 osse skinux: you mean a certain remote branch?
21:42 Dougie187 left #git
21:42 skinux Yeah
21:42 skinux GitHub specifically
21:42 skinux I also need to change the master on local
21:42 osse there is no specific command, but push can do the job just fine
21:43 osse git push remote certainbranch:master
21:43 skinux It says 'remote' isn't a git repo? Weird, I've been pushing to GitHub...
21:44 skinux Wait, nevermind, it's probably saying the one I specified isn't recognized.
21:44 osse skinux: replace it with whatever the remote name actually is
21:44 osse it's likely "origin!"
21:44 skinux Well, I thought it was 0.80
21:45 skinux This is the remote branch...I thought it was called 0.80 https://github.com/skinuxgeek/entertainernew/blob/0.80/
21:45 durham_ joined #git
21:46 daynaskully joined #git
21:46 osse it is
21:46 durham_ joined #git
21:46 osse https://github.com/skinuxgeek/entertainernew/tree/0.80
21:47 skinux Then why did 0.80:master fail?
21:48 osse you expect me to answer that without seeing the error? :p
21:48 kanyeezy joined #git
21:48 Gsham joined #git
21:49 durham joined #git
21:49 Ram-Z_ joined #git
21:50 flavius joined #git
21:52 chrisshattuck joined #git
21:53 Jellyg00se joined #git
21:54 boushi_ joined #git
21:55 kyan joined #git
21:56 hahuang61 joined #git
21:57 daynaskully joined #git
21:58 flaguy48 joined #git
21:58 daynaskully joined #git
22:01 spudowiar joined #git
22:01 vassagus joined #git
22:02 FilipNortic joined #git
22:03 Endarked joined #git
22:04 danslo joined #git
22:06 Wysi joined #git
22:07 byteflame joined #git
22:08 AaronMT joined #git
22:09 wizardedit joined #git
22:11 wizardedit hi there, I'm trying to find a way to check out source from a year ago, and fail if the repository is not that old. git checkout $(git rev-list -n 1 --before="2015-08-27 13:37" master) is what I'm using currently
22:11 daynaskully joined #git
22:12 wizardedit n/m, there's no sha printed in that case, I could use that
22:12 up_the_irons joined #git
22:12 magikid joined #git
22:12 actinide joined #git
22:12 justanotheruser joined #git
22:13 cdg joined #git
22:15 boushi__ joined #git
22:15 Raed joined #git
22:16 aidalgol joined #git
22:18 morenoh149 when does git think that a rename is actually a deletion + creation ? I have a git commit where I moved a file's location and made some changes. Is it normal for git to think that this is a completely new file?
22:18 morenoh149 I'd prefer it say it was moved, along with a diff for the changes in the file
22:20 Vivekananda joined #git
22:20 LeBlaaanc joined #git
22:21 e14 joined #git
22:23 vassagus joined #git
22:23 rgrinberg joined #git
22:23 mingrammer joined #git
22:24 BlueProtoman joined #git
22:24 BlueProtoman I have a Windows 8.1 virtual machine running in VirtualBox through Vagrant.  I'm trying to run "git branch" in C:\vagrant, but I get the error "fatal: Invalid symlink 'C:/vagrant': Function not implemented".  What does this mean and what can I do about it?
22:24 andlabs joined #git
22:26 Spec-Chum joined #git
22:29 boushi joined #git
22:30 Vampire0 morenoh149, man git diff and look for "-M" it tells Git to search for renames and you can also give it a percentage to determine whether it will be detected as rename or as remove and add
22:30 gitinfo morenoh149: the git-diff manpage is available at http://jk.gs/git-diff.html
22:31 rgrinberg joined #git
22:31 madewokherd joined #git
22:32 troulouliou_div2 joined #git
22:33 BSaboia joined #git
22:33 morenoh149 Vampire0: ++
22:35 xelxebar joined #git
22:35 gitinfo morenoh149: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
22:36 Vampire0 wizardedit, did you try           git checkout master@{2015-08-27 13:37}               ?
22:37 felher joined #git
22:37 Vampire0 wizardedit, or rather           git checkout 'master@{2015-08-27 13:37}'
22:38 Vampire0 wizardedit, you can look at man git rev-parse for ways to specify revs without jumping hoops :-)
22:38 gitinfo wizardedit: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html
22:43 actinide joined #git
22:44 up_the_irons joined #git
22:45 wizardedit Vampire0, that only supports 90 days back according to https://stackoverflow.com/questions/6990484/git-checkout-by-date
22:46 e14 joined #git
22:47 BackEndCoder joined #git
22:51 Dyonisos_ joined #git
22:51 dendazen joined #git
22:56 jaguarmagenta joined #git
22:56 BSaboia joined #git
22:57 SwiftMatt joined #git
22:57 ahmed_elgabri joined #git
22:58 anuxivm joined #git
22:58 blackwell joined #git
22:59 Vampire0 wizardedit, oh, does it? o_O that's news to me, never used it though
22:59 sangy joined #git
22:59 up_the_irons joined #git
23:00 nettoweb joined #git
23:01 clemf joined #git
23:01 ahmedelgabri joined #git
23:01 wizardedit Vampire0, yeah. If you've got a repo with history older than 90 days, try git show 'master@{2010-08-27 13:37}'
23:01 wizardedit and look at what shows up
23:02 Vampire0 well, it's not 90 days, but the maximum reflog age
23:02 Vampire0 but that seems really weird
23:02 Mobutils joined #git
23:02 Vampire0 wth do they use the reflog for that?
23:03 Vampire0 w = "why" here, not "what"
23:05 Ekho joined #git
23:07 wizardedit heh, that's a good question I don't have the answer to :)
23:07 Seveas Vampire0: because 'what did master point to at this time' can only be answered by the reflog...
23:07 Vampire0 Well, maybe because of merge commits or something like that
23:08 Vampire0 Hi Seveas, long time no see
23:08 newbiee joined #git
23:08 Seveas commit timestamps tell you nothing about what a ref poins to
23:08 newbiee I did git add some files but didn’t commit the files. How can i see which all files i added?
23:08 Seveas newbiee: git status
23:09 Vampire0 Seveas, true, but if you don't want to know where the ref pointed at that date, but how the branch pointed at by the ref looked at that date?
23:09 Seveas Vampire0: that question really makes no sense
23:09 Vampire0 Seveas, why not?
23:09 Seveas a branch doesn't look like anything, a branch is nothing more than a label that points to a commit
23:09 Seveas !soviet_git
23:09 gitinfo In Soviet Git, commits are not on branches, branches point to a commit.
23:10 Vampire0 Seveas, I know, I usually explain them as post-its, but you got what I meant didn't you?
23:10 byteflame joined #git
23:10 Seveas no, I'm afraid I don't.
23:11 vassagus joined #git
23:11 Vampire0 Seveas how do I say "Git please give me the file-tree of the last commit made before <date> in the history of branch X"
23:11 Seveas you don't
23:11 Vampire0 Why not?
23:11 Seveas because commit timestamp may not even be linear
23:12 Vampire0 wizardedit e. g. tries to
23:12 Vampire0 Hm, good point
23:12 Seveas e.g. it's perfectly valid to have a commit from 2 months ago have a parent that's only 2 days old. Think cherry-pick or rebase.
23:12 dodobrain joined #git
23:12 Vampire0 But what sense do --since and --until have then?
23:13 Vampire0 Wouldn't those be broken by design then too?
23:13 Seveas no, because they don't point to a specific comit, but walk the entire history and pply a filter
23:14 Vampire0 With "-n 1" it points to one specific commit (or none)
23:14 Gitzilla joined #git
23:14 Seveas sure, but that's not an answer to "what's the last commit before date", just "a commit before date"
23:15 Vampire0 So it is the nearest parent with a commit date before <date> right?
23:15 Seveas which still doesn't answer "what did the branch point to", the commit may have been on a side branch that was since merged in
23:16 e14 joined #git
23:16 boushi joined #git
23:16 Vampire0 True, but currently I asked the other way around
23:16 AaronMT joined #git
23:17 Vampire0 Does "--before <date> -n 1" mean "the nearest parent with a commit date before <date>"?
23:17 zumba_addict joined #git
23:17 Seveas it may not be the nearest parent either, depends on how git walks the log (which is influencable with other parameters, and I don't quite know the default)
23:18 Seveas think depth-first versus breadth-first
23:19 Vampire0 So is there a way to say "Git please give me the file-tree of what "--before <date> -n 1" would output" besides doing it manually with "git checkout $(git rev-list -n 1 --before="2015-08-27 13:37" master)" like wizardedit does currently?
23:19 Vampire0 I guess not
23:20 monoprotic joined #git
23:20 Seveas you guess correct
23:21 Vampire0 thx Seveas
23:21 wizardedit fwiw, we're only wanting rough estimates. Trying to look at company wide LoC growth over past few years
23:22 clemf joined #git
23:22 Vampire0 LoC is not really a good metric anyway :-D
23:23 Seveas LoC is a horrible metric
23:23 Seveas wizardedit: you'll have much more fun with gource if you want to do history spelunking :)
23:24 Vampire0 What is gource?
23:24 Seveas wizardedit: and if these metrics matter, use annotated tags (which have a tagging date) for releases and measure LoC diffs between those releases
23:25 Seveas Vampire0: a tool to turn 'git log' output into video
23:26 Vampire0 Yeah, just googled it, the video looks nice
23:27 wizardedit Seveas, it's for management to make some bullshit report. It's not that important, as long as they're there and reasonable over time
23:27 Seveas it's about as useful as LoC count. Entertainment purposes only :)
23:28 Seveas wizardedit: I'd tell management to stuff it and come up with real KPI's :)
23:28 Seveas And yes, I've done so in the past for similar useless non-kpi's, like ticket handling time or amount of tickets.
23:29 dsantiago joined #git
23:29 wizardedit Seveas, I agree. I think it's for requesting more budget, not to criticize current work ;)
23:30 rkazak joined #git
23:31 Vgr_ joined #git
23:31 boushi joined #git
23:34 raijin joined #git
23:37 ahr3n joined #git
23:38 zumba_addict joined #git
23:38 mellernoia joined #git
23:39 bruce_lee joined #git
23:39 bruce_lee joined #git
23:39 zumba_addict joined #git
23:41 zumba_addict joined #git
23:41 ahmed_elgabri joined #git
23:45 dsdeiz joined #git
23:49 actinide joined #git
23:50 skylite joined #git
23:50 durham_ joined #git
23:51 durham_ joined #git
23:52 ekinmur joined #git
23:54 ahmedelgabri joined #git
23:54 EvilPenguin joined #git

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