Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-02

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

All times shown according to UTC.

Time Nick Message
00:04 VA3VNA joined #git
00:04 shgysk8zer0 joined #git
00:05 shaggycat_ joined #git
00:07 sdothum joined #git
00:10 catag87 joined #git
00:11 sdothum joined #git
00:15 fuchstronaut joined #git
00:23 boombatower joined #git
00:23 dwmw2_gone joined #git
00:24 interne7y joined #git
00:26 mellernoia joined #git
00:27 nyexpress joined #git
00:28 byteflame joined #git
00:35 rominronin joined #git
00:36 vassagus joined #git
00:39 mellernoia-work joined #git
00:40 crayon joined #git
00:42 Topic for #git is now Welcome to #git, the place for git help and take-out special surprises | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-nom --omnom: eats all your tasty code
00:44 byteflame joined #git
00:45 mellernoia joined #git
00:52 ajf- joined #git
00:52 suuure joined #git
00:52 maroloccio joined #git
00:53 suuure I accidentally left some unneccesary lines of code in my commit, what is the cleanest/best way to get rid of them? https://github.com/stephennn/android-anuto/blob/master/app/src/main/res/values/strings.xml#L38-L39
00:53 suuure adding a whole new commit seems a bit overkill
00:54 cqi joined #git
00:54 chartractegg joined #git
00:55 qpdb joined #git
00:55 Rish joined #git
00:56 SwiftMatt joined #git
00:57 mellernoia joined #git
01:00 _xor joined #git
01:01 mellernoia-work joined #git
01:02 chartractegg left #git
01:04 chartractegg joined #git
01:05 chartractegg left #git
01:05 sarbs joined #git
01:08 afusion joined #git
01:10 kyan_ joined #git
01:11 BSaboia joined #git
01:12 mellernoia joined #git
01:12 catag87 joined #git
01:13 ljc joined #git
01:16 kyan_ left #git
01:18 mellernoia joined #git
01:19 jeffreylevesque joined #git
01:22 durham joined #git
01:24 soerenb joined #git
01:26 frogonwheels joined #git
01:32 Electrometro joined #git
01:35 thiago joined #git
01:37 BrianJ joined #git
01:39 dhollinger joined #git
01:40 ToxicFrog joined #git
01:41 pks joined #git
01:41 vassagus joined #git
01:46 RedneckDonut joined #git
01:46 Shentino joined #git
01:46 ytl joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and take-out special surprises | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-nom --omnom: eats all your tasty code
01:55 neersighted joined #git
01:57 BSaboia joined #git
01:57 BSaboia joined #git
01:57 BSaboia joined #git
01:58 ahr3n joined #git
02:01 zivester joined #git
02:02 jaguarmagenta joined #git
02:07 jimi_ joined #git
02:07 zezba9000 joined #git
02:09 zooo joined #git
02:09 zezba9000 joined #git
02:09 zezba9000 testing
02:10 zezba9000 In the git docs what does "LF" mean in the line "<local ref> SP <local sha1> SP <remote ref> SP <remote sha1> LF"
02:10 zezba9000 Looking at: https://git-scm.com/docs/githooks/1.8.2.2
02:10 zezba9000 SP = space I'm guessing?
02:10 zezba9000 very unclear
02:11 moumitude joined #git
02:12 johnmilton joined #git
02:12 robattila256 joined #git
02:13 catag87 joined #git
02:13 ImJune joined #git
02:14 banana_pancakes joined #git
02:14 robattila256 hey can anyone teach a git noob what to do, im trying to make sure i install this specific version https://github.com/dolphin-emu/dolphin/commit/be9416c462b1b5f0074d8a3a2b35171f2a154693
02:14 robattila256 am I supposed to do something with that commit numbers?
02:16 Gianormagantrous joined #git
02:17 banana_pancakes joined #git
02:18 fuchstronaut joined #git
02:20 zezba9000 does LF = \n or \r\n ?
02:21 ToxicFrog zezba9000: \n
02:21 ToxicFrog \r\n is CRLF
02:21 david007 joined #git
02:24 texinwien joined #git
02:25 interne7y joined #git
02:26 Sucks joined #git
02:26 zezba9000 @ToxicFrog when using the pre-push method with git-lfs it never pushed any data
02:26 nnyk joined #git
02:27 zezba9000 while passing git-lfs random data will
02:27 ToxicFrog ...ok? I have no idea what git-lfs even is
02:27 cd-rum joined #git
02:27 Smashcat joined #git
02:28 zezba9000 https://git-lfs.github.com/
02:28 ToxicFrog But yes, SP is space and LF is linefeed (aka newline or \n)
02:28 zezba9000 ok, tnx for confirming that
02:28 Smashcat Hi, I need to find out where a git repo was checked out from. Using the "git remote show origin", but not sure where I can set my username (it's a github repo)
02:29 ToxicFrog Smashcat: all github access uses 'git' as the ssh username; your github username is inferred from the keypair you authenticate with
02:30 Smashcat It's defaulting to another user, and asking for that user's password, which I don't know. So I need to replace that default with my username
02:30 ShekharReddy joined #git
02:30 invex joined #git
02:30 Sucks joined #git
02:32 ToxicFrog Smashcat: the remote definition should start with the username
02:32 ToxicFrog e.g. mine all show up as "git@github.com:toxicfrog/<project name>.git"
02:32 Smashcat Ok thanks, I think we're talking about different things
02:33 Smashcat this is appearing as https://otherUserName@github.com/someAccount/someRepo/
02:34 ToxicFrog Oh
02:34 ToxicFrog I have no knowledge of HTTPS authentication
02:34 deltab okay, so the username is there
02:34 ToxicFrog I have no idea if you can even push using that
02:35 ToxicFrog That said, you should be able to just edit the remote definition to have the correct username
02:35 deltab I think it asks for the password every time
02:35 ToxicFrog Edit .git/config or use 'git remote set-url'
02:35 FlySkype joined #git
02:35 rominronin joined #git
02:35 Smashcat Yeah, it's the wrong username though. I need to use my username for a "git remote show origin". This isn't my machine, so I don't want to change it permanently
02:37 d5sx43 joined #git
02:37 deltab are you saying you want it to push to a different repo?
02:37 Smashcat I'll take a look at the docs - couldn't find anything earlier :)
02:37 Smashcat No, same repo, my username instead of the one that's being used automatically.
02:38 deltab or do you want to change the authorship on the commits?
02:39 Smashcat I'm SCP'ing the who local working copy to my machine, so I can push it all from there :) Seems like the easiest way around this.
02:39 deltab I think you can give a url in place of the remote name
02:39 nydel07 joined #git
02:42 Smashcat I hardly ever use git to be honest. All my stuff is in svn, so it's a nightmare when I have to check stuff in for someone else using git :) Every command seems about 10x as long - hehe :)
02:43 Smashcat (Should probably find a good GUI client one day)
02:44 netj joined #git
02:45 Goplat joined #git
02:46 aavrug joined #git
02:46 vassagus joined #git
02:50 arescorpio joined #git
02:50 red_ joined #git
02:50 noyb joined #git
02:51 chachasmooth joined #git
02:52 hexagoxel joined #git
02:53 Zythyr joined #git
02:54 lagothri1 joined #git
02:54 KeelOfSteel joined #git
02:55 Zythyr Hi guys. I am a noob at git. I have a question. I am working on a local directory, A, in which I init the git. Directory A is: C://user/dev/project1/. I want to pull/copy the directory A in to directory B, which is C://user/dev/project2/. How can I do this?
02:57 deltab do you want them linked, so that you can copy changes between them?
02:58 a3Dman joined #git
02:58 Captain_Ramius joined #git
02:59 Captain_Ramius joined #git
03:01 MZAWeb joined #git
03:04 rewt Zythyr, you can do it a few different ways.   what's your end goal?  why do you want to copy?  what do you want to do with the copy?
03:05 jaguarma_ joined #git
03:06 lillian joined #git
03:07 CEnnis91 joined #git
03:09 Dougie187 left #git
03:09 RedneckDonut joined #git
03:10 Captain_Ramius joined #git
03:11 Captain_Ramius joined #git
03:11 zacts joined #git
03:14 catag87 joined #git
03:15 robattila256 if I wanted to build this specific version, how would I do that? https://github.com/dolphin-emu/dolphin/commit/be9416c462b1b5f0074d8a3a2b35171f2a154693
03:15 rgrinberg joined #git
03:16 mehola joined #git
03:16 robattila256 build/install dont really know the difference
03:18 rewt checkout that commit and build/install as usual most likely
03:19 corebits joined #git
03:19 robattila256 rewt: thanks for helping ,what am I supposed to do with that commit #?
03:19 robattila256 never used git before
03:19 robattila256 i did git clone but it just gave me the newest version
03:19 rewt git checkout be9416
03:20 robattila256 It says HEAD is now at be9416c
03:20 robattila256 so I assume if i install thats what i will get
03:21 robattila256 thanks
03:24 hahuang61 joined #git
03:25 dreiss joined #git
03:26 Zythyr deltab rewt I want to pully/copy the directory A to B becasue I want all changes in A to appear on B. A is my development site and confgirations. B is my copy of dev site for testing those configurations.
03:26 cdg joined #git
03:26 aavrug joined #git
03:27 rewt Zythyr, so B already exists?
03:27 Zythyr rewt Yes B already exisits
03:28 rewt you can set A as a remote for B, and git fetch from it
03:28 rewt a remote can be another dir on the same machine
03:28 aavrug joined #git
03:29 Zythyr rewt So would my commant be like this: git fetch dir/to/A dir/to/B?
03:29 rewt no, add A as a remote of B
03:29 rewt in B's dir:  git remote add ...
03:29 rewt then in B's dir:  git fetch ...
03:31 Electrometro joined #git
03:32 rewt git remote add dev C://user/dev/project1/ ; git fetch dev
03:32 tortib_ joined #git
03:34 Zythyr rewt ohh wow thanks
03:34 fstd_ joined #git
03:35 Zythyr rewt So I can also name the repo? When I started tracking my dir A, i did "git init". How do I give my dir A a name such as "dev"?
03:35 rewt what do you mean?
03:35 rewt "dev" is the name of a remote repo in B, that just happens to be A
03:36 rewt because that's the dir that was given as the location of the "dev" remote repo
03:36 zumba_ad_ joined #git
03:37 Zythyr Can I give my repo a name so I don't have to type in the path all the time/
03:37 rewt type it in where?
03:38 Zythyr rewt Like instead of doing: git clone /path/to/dir/A, how can I do git clone "devA"
03:39 ytl_ joined #git
03:40 rewt no
03:41 wargoti joined #git
03:41 Zythyr rewt Thanks for helping. Sorry for noobish quesiton. I just found an amazing guide online. I am going to read through it :) https://www.atlassian.com/git/tutorials/what-is-version-control
03:43 wargoti left #git
03:50 dlaboratory joined #git
03:51 vassagus joined #git
04:01 thecomedian joined #git
04:01 Sonderblade joined #git
04:02 pwnz0r joined #git
04:02 rscata joined #git
04:04 dreiss joined #git
04:04 RustyShackleford joined #git
04:04 blackwind_123 joined #git
04:06 phanimahesh joined #git
04:06 l4v2 left #git
04:12 jaguarmagenta joined #git
04:14 kfoonamalik joined #git
04:16 slayerjain joined #git
04:17 cdg joined #git
04:18 jaguarmagenta joined #git
04:19 fuchstronaut joined #git
04:19 govg joined #git
04:19 howdoi joined #git
04:22 ytl joined #git
04:25 ytl joined #git
04:26 vuoto joined #git
04:26 leprechau joined #git
04:26 interne7y joined #git
04:29 sagerdearia joined #git
04:31 jaguarmagenta joined #git
04:33 Sazhen86 joined #git
04:33 sangy joined #git
04:35 circ-user-HPmjC joined #git
04:36 dreiss joined #git
04:37 rominronin joined #git
04:39 josuebrunel joined #git
04:41 Cabanossi joined #git
04:42 beyertech joined #git
04:43 dsdeiz joined #git
04:49 nilg joined #git
04:50 grawity if you run `git clone devA`, how is git going to know where the repo really is
04:50 grawity but it's not like you have to clone anew every day, do you
04:51 dreiss joined #git
04:55 tango_ joined #git
04:55 ggherdov Hello. While editing a commit in the middle of a `rebase -i`, can I use do `git reset HEAD~1`, then `git add -i` to select/discard hunks, make multiple new commits, then `rebase --continue` ?
04:56 vassagus joined #git
04:57 ahr3n joined #git
05:01 ytl joined #git
05:01 ljc joined #git
05:03 freimatz joined #git
05:06 jaguarmagenta joined #git
05:06 thiago ggherdov: yes
05:07 thiago you can also do git reset -p HEAD~ to remove things from the commit, commit --amend, then make new commit
05:08 titanium17 joined #git
05:08 rgrinberg joined #git
05:09 catag87 joined #git
05:09 SwiftMatt joined #git
05:10 catag87 joined #git
05:10 Cooler joined #git
05:11 ggherdov thiago: thanks, useful tip
05:13 cqi joined #git
05:13 leeN joined #git
05:16 Puffball joined #git
05:17 subhojit777 joined #git
05:17 jaguarma_ joined #git
05:17 jceb joined #git
05:25 t2mkn joined #git
05:25 Takumo joined #git
05:25 Takumo joined #git
05:25 hahuang61 joined #git
05:28 emPi joined #git
05:29 Lvjasha joined #git
05:29 mehola joined #git
05:31 neunon joined #git
05:34 ytl joined #git
05:34 eggoez joined #git
05:34 jaguarmagenta joined #git
05:35 mariuscc joined #git
05:35 lordjancso joined #git
05:40 subhojit777 joined #git
05:41 lucasem joined #git
05:46 jaguarma_ joined #git
05:48 jceb joined #git
05:50 settermjd joined #git
05:51 jaguarmagenta joined #git
05:52 Raging_Hog joined #git
05:53 zeroed joined #git
05:53 zeroed joined #git
05:54 TomyLobo joined #git
05:55 shaggycat_ joined #git
05:56 Shentino joined #git
05:57 satya4ever joined #git
05:58 xcesariox joined #git
06:00 rscata joined #git
06:01 kugel joined #git
06:01 ImJune_ joined #git
06:01 vassagus joined #git
06:08 cqi joined #git
06:09 ytl joined #git
06:10 stuh84 joined #git
06:11 interne7y joined #git
06:13 bambanx joined #git
06:13 bambanx hi
06:14 ki0 joined #git
06:14 bambanx how i can ignore __pycache__  subfolders under a project folder?
06:15 grawity add the line "__pycache__" to .gitignore
06:15 bocaneri joined #git
06:15 JeroenT joined #git
06:16 rominronin joined #git
06:18 bambanx thanks grawity
06:18 cbreak remember that git will not ignore things it was told to track
06:18 bambanx ok
06:19 cbreak you'll have to git rm --cached those to remove them
06:19 bambanx didnt created the repo yet
06:19 bambanx thanks cbreak
06:19 fuchstronaut joined #git
06:22 OAC joined #git
06:23 stuh84 joined #git
06:23 gugas joined #git
06:24 zeroed joined #git
06:25 ytl joined #git
06:27 star_prone joined #git
06:28 jceb joined #git
06:31 ImJune joined #git
06:32 djb-irc joined #git
06:32 star_prone joined #git
06:33 JeroenT joined #git
06:33 ambro718 joined #git
06:47 lordjancso joined #git
06:48 danslo joined #git
06:48 JeroenT_ joined #git
06:49 dopesong joined #git
06:51 Rish joined #git
06:52 PCatinean joined #git
06:54 kugel joined #git
06:55 Sceorem joined #git
06:55 Macaveli joined #git
06:57 mohabaks joined #git
06:57 JeroenT joined #git
06:58 freimatz joined #git
06:59 zeroed joined #git
07:00 nnyk joined #git
07:02 fees joined #git
07:02 Lomex joined #git
07:03 Darcidride joined #git
07:06 mohabaks joined #git
07:06 vassagus joined #git
07:07 jknetl joined #git
07:07 p4trix joined #git
07:07 danslo joined #git
07:08 OAC joined #git
07:09 govg joined #git
07:11 bdknls joined #git
07:14 djb-irc joined #git
07:15 ki0 joined #git
07:17 DevAntoine joined #git
07:18 mflow joined #git
07:19 ki0 joined #git
07:21 pcre_ joined #git
07:24 Softeisbieger joined #git
07:26 hahuang61 joined #git
07:28 Balliad joined #git
07:30 netj joined #git
07:30 kugel joined #git
07:32 ome joined #git
07:32 GT4066 joined #git
07:34 moriko joined #git
07:35 Rish joined #git
07:36 josuebrunel joined #git
07:38 tax joined #git
07:38 dreiss joined #git
07:39 Novitsh_ joined #git
07:41 kugel joined #git
07:42 twb joined #git
07:43 twb When I "git gc", how do I interpret this line?  "Total 38837 (delta 24989), reused 36150 (delta 24673)"
07:43 twb Or: can I make git say something like "hey before .git was 350MB and now it's 300MB, that's a 14% saving!"
07:44 selckin du -csh .git; git gc; du -csh .git
07:44 twb Fair enough, that's what I'm doing now
07:44 tchan joined #git
07:44 selckin http://stackoverflow.com/questions/9379714/what-do-the-numbers-in-the-total-line-of-git-gc-git-repack-output-mean
07:44 twb yay learning
07:45 selckin also you can go way more aggressive then git gc to reduce size if you want
07:46 twb Yeah I used to do that a lot until I got told off because YAGNI
07:46 twb So now I just do that every year or so
07:47 osse i've heard --aggressive can actually increase size in some weird cases
07:47 selckin i never do it unless i'm planning to copy it somewhere else
07:47 selckin osse: i was talking like git reflog expire --expire=now --all; git gc --prune=now
07:47 osse ah
07:48 mrkake joined #git
07:48 twb it is a lot better after I told git not to make packs bigger than the free space in my $HOME quota
07:48 selckin you can move into 2016 aswel
07:48 twb Let's see, it was pack.packSizeLimit=128M & pack.windowMemory=512M
07:49 twb That server's running in the past tho
07:49 twb It probably doesn't even have a 3.x kernel
07:49 selckin thats why you rent, so you can just upgrade
07:49 twb Not allowed to upgrade it until we get some customers that are profitable instead of... lossible?
07:50 selckin still can't imagine disk space being an issue, but sure
07:50 twb $HOME quotas are strict to stop people leaving 20 years of work in there
07:50 moritz if the customers don't make money, fire them :-)
07:50 twb The /srv/vcs filesystem grows as needed
07:51 twb Aaaaanyway
07:52 jason237 joined #git
07:53 ahmedelgabri joined #git
07:54 jceb joined #git
07:57 GavinMagnus joined #git
07:57 mrkat joined #git
07:58 gtristan joined #git
07:59 mahendra_ joined #git
08:01 ikmaak joined #git
08:05 tax joined #git
08:07 xall joined #git
08:07 chll_ joined #git
08:09 fees joined #git
08:09 hecliunyx joined #git
08:09 nikitasius joined #git
08:10 helloNL joined #git
08:10 eijk_ joined #git
08:10 helloNL Hey, is there a way to check if 2 branches are exactly the same?
08:10 twb git diff branch1 branch2
08:10 helloNL Thanks
08:11 vassagus joined #git
08:11 RichiH well, not quite
08:11 RichiH that will tell you if the content is the same
08:11 RichiH not if the history is the dame
08:11 RichiH same
08:11 twb Right - it depends exactly what you mean by "the same" :-)
08:11 helloNL Well it is about the content :P
08:11 osse add a --quiet for maximum sciptnicity
08:12 RichiH git rev-parse HEAD master
08:12 RichiH git rev-parse HEAD fooblargh
08:12 helloNL I get no output, does this mean it is the same content?
08:12 RichiH helloNL: yes
08:13 tomog999_ joined #git
08:13 tanuki joined #git
08:13 RichiH osse: why not --plumbing ?
08:13 osse RichiH: does that exist?
08:13 RichiH no
08:14 JeroenT joined #git
08:14 RichiH it was a play of words on the awesome history of --porcelain
08:15 texinwien joined #git
08:15 Captain_Ramius joined #git
08:15 osse :O
08:16 Cata|Work joined #git
08:16 Garen_ joined #git
08:16 watersoul_ joined #git
08:17 liuzhen_ joined #git
08:17 RichiH (well, and a comment on how --quiet can break in unexpected ways)
08:17 stealthii joined #git
08:18 osse :O :O
08:18 d0nn1e joined #git
08:18 huhlig joined #git
08:18 JackMc joined #git
08:19 JeroenT joined #git
08:19 RichiH :O :O :O
08:19 osse how can --quiet break?
08:19 osse don't leave me hannging
08:19 pcre joined #git
08:19 RichiH osse: git diff master dontexist --quiet
08:20 henriquev joined #git
08:20 RichiH no one expects the spanish inquisition
08:20 RichiH or spurious output on stderr
08:20 fuchstronaut joined #git
08:20 DuncanT joined #git
08:20 Peng_ joined #git
08:20 beckyconning_ joined #git
08:20 nnyk joined #git
08:20 NightMonkey joined #git
08:21 cbreak stderr is for errors.
08:21 marcogmonteiro joined #git
08:21 Lewix_ joined #git
08:21 cbreak errors are expected
08:21 Lewix_ joined #git
08:21 Cabanossi joined #git
08:21 crose joined #git
08:21 skylite joined #git
08:21 cdown joined #git
08:21 jceb joined #git
08:21 go1111111 joined #git
08:21 tomboy64 joined #git
08:21 hide joined #git
08:21 mattcen joined #git
08:22 jrnieder joined #git
08:22 tax joined #git
08:22 TinkerTyper joined #git
08:22 docnvk joined #git
08:22 cqi joined #git
08:23 star_prone joined #git
08:23 snowinferno joined #git
08:24 TheMoonMaster joined #git
08:26 ygeLN joined #git
08:26 pcre_ joined #git
08:29 davisonio joined #git
08:29 arand joined #git
08:32 EgS joined #git
08:32 JeroenT joined #git
08:34 ahmedelgabri joined #git
08:35 clmsy joined #git
08:36 xaa joined #git
08:38 marcogmonteiro joined #git
08:38 yoan__ joined #git
08:42 lordjancso joined #git
08:43 aidalgol joined #git
08:44 legumbre joined #git
08:45 danslo joined #git
08:45 jab416171 joined #git
08:45 Sasazuka joined #git
08:45 Rish joined #git
08:47 Shashikant86 joined #git
08:47 brandonw joined #git
08:48 Tachyon_ joined #git
08:49 tvw joined #git
08:50 j`ey joined #git
08:50 j`ey can git rev-parse HEAD ever return an empty string?
08:50 nnyk joined #git
08:50 danslo joined #git
08:51 phanimahesh joined #git
08:51 M-shine joined #git
08:54 tobiasvl I don't believe so
08:54 tobiasvl just tested with a new repo with no commits, even that returned the string "HEAD" instead of a sha
08:56 j`ey thanks, I cant imagine a case either
08:57 osse try outside a repo :)
08:58 phanimahesh joined #git
08:59 tobiasvl hehe
08:59 j`ey that might be a possibilty :P
08:59 OAC left #git
09:00 cbreak in a new repository, HEAD is in unborn branch state
09:01 cbreak HEAD's sometimes a symbolic ref, so, if you want to know what it really contains, use git rev-parse --symbolic-full-name HEAD
09:03 anuxivm joined #git
09:05 Rish joined #git
09:05 aidalgol joined #git
09:06 JeroenT joined #git
09:08 Grievre git doesn't track changes per-file in the way perforce does right?
09:09 alcohol this is quite a nice read. phrased some topics in certain ways that I had not considered or looked at before, very informative :> http://think-like-a-git.net/
09:09 Grievre Like in p4, you can p4 copy, have two files in the repo that are independent but have a shared history, and then later merge/integrate them
09:09 Rish joined #git
09:09 moritz Grievre: it doesn't
09:10 moritz Grievre: but when you want to know the history of a file, you can git to detect moves/copies
09:10 moritz so if you do a copy, a git log --follow -- thefile picks up the history from the original
09:11 moritz similar options exists for git blame, for example
09:12 JanC_ joined #git
09:13 davisonio joined #git
09:14 kasjdasd joined #git
09:14 cYmen joined #git
09:15 lr7db2 joined #git
09:15 lr7db2 1470127277254|954|statement|connection 19|create table Account_ (  mvccVersion bigint default 0 not null,  accountId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  parentAccountId bigint,  name varchar(75),  legalName varchar(75),  legalId varchar(75),  legalTy
09:15 lr7db2 pe varchar(75),  sicCode varchar(75),  tickerSymbol varchar(75),  industry varchar(75),  type_ varchar(75),  size_ varchar(75) )|
09:15 lr7db2 1470127278170|915|statement|connection 19|create table Address (  mvccVersion bigint default 0 not null,  uuid_ varchar(75),  addressId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  classNameId bigint,  classPK bigint,  street1 varchar(75),  street2 varchar(75
09:15 lr7db2 ),  street3 varchar(75),  city varchar(75),  zip varchar(75),  regionId bigint,  countryId bigint,  typeId bigint,  mailing smallint,  primary_ smallint )|
09:16 lr7db2 1470127277254|954|statement|connection 19|create table Account_ (  mvccVersion bigint default 0 not null,  accountId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  parentAccountId bigint,  name varchar(75),  legalName varchar(75),  legalId varchar(75),  legalTy
09:16 lr7db2 pe varchar(75),  sicCode varchar(75),  tickerSymbol varchar(75),  industry varchar(75),  type_ varchar(75),  size_ varchar(75) )|
09:16 lr7db2 1470127278170|915|statement|connection 19|create table Address (  mvccVersion bigint default 0 not null,  uuid_ varchar(75),  addressId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  classNameId bigint,  classPK bigint,  street1 varchar(75),  street2 varchar(75
09:16 lr7db2 ),  street3 varchar(75),  city varchar(75),  zip varchar(75),  regionId bigint,  countryId bigint,  typeId bigint,  mailing smallint,  primary_ smallint )|
09:16 lr7db2 1470127279138|967|statement|connection 19|create table AnnouncementsDelivery (  deliveryId bigint not null primary key,  companyId bigint,  userId bigint,  type_ varchar(75),  email smallint,  sms smallint,  website smallint )|
09:16 lr7db2 1470127280771|1632|statement|connection 19|create table AnnouncementsEntry (  uuid_ varchar(75),  entryId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  classNameId bigint,  classPK bigint,  title varchar(75),  content clob,  url varchar(4000),  type_ varchar(7
09:16 lr7db2 5),  displayDate timestamp,  expirationDate timestamp,  priority integer,  alert smallint )|
09:16 lr7db2 sorry
09:16 lr7db2 i was trying to pastebin
09:16 j`ey left #git
09:16 vassagus joined #git
09:17 lb lr7db2 it failed, try again ^^
09:17 star_prone joined #git
09:17 Ineentho[m] joined #git
09:17 lr7db2 1470127277254|954|statement|connection 19|create table Account_ (  mvccVersion bigint default 0 not null,  accountId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  parentAccountId bigint,  name varchar(75),  legalName varchar(75),  legalId varchar(75),  legalTy
09:17 lr7db2 pe varchar(75),  sicCode varchar(75),  tickerSymbol varchar(75),  industry varchar(75),  type_ varchar(75),  size_ varchar(75) )|
09:17 lr7db2 1470127278170|915|statement|connection 19|create table Address (  mvccVersion bigint default 0 not null,  uuid_ varchar(75),  addressId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  classNameId bigint,  classPK bigint,  street1 varchar(75),  street2 varchar(75
09:17 lr7db2 ),  street3 varchar(75),  city varchar(75),  zip varchar(75),  regionId bigint,  countryId bigint,  typeId bigint,  mailing smallint,  primary_ smallint )|
09:17 lr7db2 1470127279138|967|statement|connection 19|create table AnnouncementsDelivery (  deliveryId bigint not null primary key,  companyId bigint,  userId bigint,  type_ varchar(75),  email smallint,  sms smallint,  website smallint )|
09:17 lr7db2 1470127280771|1632|statement|connection 19|create table AnnouncementsEntry (  uuid_ varchar(75),  entryId bigint not null primary key,  companyId bigint,  userId bigint,  userName varchar(75),  createDate timestamp,  modifiedDate timestamp,  classNameId bigint,  classPK bigint,  title varchar(75),  content clob,  url varchar(4000),  type_ varchar(7
09:17 lr7db2 5),  displayDate timestamp,  expirationDate timestamp,  priority integer,  alert smallint )|
09:17 M-mistake joined #git
09:17 lr7db2 1470127281763|991|statement|connection 19|create table AnnouncementsFlag (  flagId bigint not null primary key,  companyId bigint,  userId bigint,  createDate timestamp,  entryId bigint,  value integer )|
09:17 M-meznak joined #git
09:17 lr7db2 lol
09:17 lr7db2 how many lines
09:19 alcohol i didn't know trying to pastebin was this complicated :<
09:20 Ezzy joined #git
09:26 sanketdg joined #git
09:27 hahuang61 joined #git
09:29 Sceorem joined #git
09:31 omegak joined #git
09:32 [exa] left #git
09:35 Balliad joined #git
09:36 omegak joined #git
09:38 Shashikant86 joined #git
09:38 GavinMagnus joined #git
09:42 xcesario_ joined #git
09:42 nnyk joined #git
09:45 creppe joined #git
09:46 jceb joined #git
09:48 mrBen2k2k2k joined #git
09:49 MrMojito1 joined #git
09:55 zarubin joined #git
09:55 pcre joined #git
09:55 a3Dman joined #git
09:57 Anticom joined #git
10:01 zacts joined #git
10:02 sdothum joined #git
10:05 maroloccio sorry, how do i go back to the previous reflog entry again? git reset --hard HEAD{1} does not work, nor does branch-name{1}.. (only the sha1?)
10:06 osse @{1}
10:06 nnyk joined #git
10:10 creppe joined #git
10:10 star_prone joined #git
10:15 mischat joined #git
10:21 vassagus joined #git
10:22 t0by joined #git
10:24 ToBeCloud joined #git
10:26 abhinav joined #git
10:26 abhinav hi
10:27 abhinav i just merged two branches. my code in branch1 works in branch1 but not in branch2. i merged branch1 in branch2. is there anything on git part which is causing this?
10:30 iota_pi joined #git
10:30 tobiasvl were there conflicts in the merge?
10:30 MattMaker joined #git
10:31 MattMaker joined #git
10:31 MattMaker joined #git
10:32 MattMaker joined #git
10:32 moop joined #git
10:33 freimatz joined #git
10:35 nilg joined #git
10:35 JeroenT joined #git
10:45 texinwien_ joined #git
10:47 johnmilton joined #git
10:48 Pulp joined #git
10:52 Gitzilla joined #git
10:53 abhinav tobiasvl: no
10:55 phanimahesh maybe you made incompatible changes?
10:56 abhinav ok
10:58 Arokh joined #git
10:58 felher joined #git
11:00 Dro joined #git
11:02 fuchstronaut joined #git
11:04 danslo joined #git
11:05 rnsanchez joined #git
11:07 Lipp joined #git
11:07 playfullyExist joined #git
11:10 paws_ joined #git
11:12 Shashikant86 joined #git
11:14 mischat joined #git
11:17 felher joined #git
11:17 ojdo joined #git
11:17 _ikke_ a merge does nit guarantee that the result is semanticslly
11:17 interne7y joined #git
11:17 _ikke_ semantically correct
11:18 Arokh joined #git
11:19 nnyk_ joined #git
11:21 ams__ joined #git
11:23 anuxivm joined #git
11:25 tjone270 joined #git
11:26 vassagus joined #git
11:26 Lomex joined #git
11:26 jceb joined #git
11:27 hahuang61 joined #git
11:28 lagothri1 joined #git
11:31 Arokh joined #git
11:34 magicTurtle joined #git
11:35 diens joined #git
11:36 veilig2000 joined #git
11:41 star_prone joined #git
11:48 jceb joined #git
11:49 mastro joined #git
11:50 ash_workz joined #git
11:50 dsdeiz joined #git
11:50 dsdeiz joined #git
11:56 synthroid joined #git
11:59 cYmen i'm looking for a tool that allows me to quickly and easily view diffs of files and select the ones I want to commit
11:59 cYmen any suggestions
11:59 cYmen ?
11:59 fahadash joined #git
11:59 cYmen on linux btw
12:00 smithbone joined #git
12:00 vktec cYmen: git diff and git add...?
12:01 bremner git-gui, fugitive (vim), magit (emacs)
12:05 Sceorem joined #git
12:05 Corosus joined #git
12:07 xall joined #git
12:09 aavrug joined #git
12:09 _ikke_ git add -i
12:09 _ikke_ git add -p
12:12 talin joined #git
12:13 talin hello. i'm in some weird detatched from head state... i have no changes i care about in this repo. so i try to git checkout master, but it still says "not a git.repo"
12:13 Lomex joined #git
12:13 osse talin: sounds like you're in the wrong directory
12:14 phanimahesh joined #git
12:15 talin osse: i'm in the right dir :/ where i've always worked and where my .git is
12:15 osse !repro
12:15 gitinfo [!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
12:15 talin .git/ that is
12:16 nd joined #git
12:16 ozette joined #git
12:17 talin hmm, i had to delete a dir and now it seems to work
12:17 talin weird..
12:18 tobiasvl delete what dir?
12:19 eijk_ joined #git
12:20 afuentes joined #git
12:21 dopesong joined #git
12:21 rwb joined #git
12:22 ozette i'm having trouble installing git lfs
12:23 eijk joined #git
12:23 ozette i downloaded git lfs from here https://git-lfs.github.com/
12:23 talin tobiasvl: some weird ui-style/ dir that had appeared from out of nowhere
12:24 ozette what's it mean when i do './git-lfs install' and it says 'Git LFS initialized' ?
12:24 ozette and after that git lfs is still unknown
12:25 leeN joined #git
12:25 johnmilton joined #git
12:26 netj joined #git
12:27 cyphase joined #git
12:29 gtristan joined #git
12:30 denimsoft joined #git
12:30 jeffreylevesque joined #git
12:31 vassagus joined #git
12:33 jceb joined #git
12:34 str joined #git
12:34 ozette no git lfs users?
12:36 kyan joined #git
12:36 SourTrout joined #git
12:36 wwwi joined #git
12:38 sanketdg joined #git
12:39 ozette left #git
12:39 ozette joined #git
12:39 dopesong joined #git
12:39 osse ozette: my guess is you're supposed to copy git-lfs to somewhere in $PATH
12:41 rgrinberg joined #git
12:42 rgrinberg joined #git
12:43 zivester joined #git
12:43 TooLmaN joined #git
12:45 CQ joined #git
12:47 ozette osse: good point
12:47 TooLmaN joined #git
12:48 ozette i copied the binary git-lfs from the download to my ~/bin
12:48 ozette but .. i have a feeling the documentation isn't correct
12:48 ozette they're talking about 'git lfs install' and 'git lfs track'
12:48 ozette but i think it should be 'git-lfs install' and 'git-lfs track'
12:49 CQ does git always create the files in .git/objects/??/* as mode 444?
12:49 osse ozette: no. if you run 'git foo' then git will search $PATH for a program named git-foo
12:49 osse ozette: unless it's a builtin or an alias, of course
12:50 Seveas CQ: no. Depends on your umask and the sharedRepository setting
12:50 CQ umask is 0022 ... where can I find the shared repository setting?
12:51 FuzzySockets joined #git
12:51 SourTrou_ joined #git
12:51 osse ozette: you can run git-lfs directly if you wish. it's just a feature git provides to make auxiliary scripts feel more integrated
12:55 Shashikant86 joined #git
12:55 Hello71 and also originally git commands were all separate programs
12:57 daniel_rose joined #git
12:57 _ikke_ They're still treated as such, even if implemented by the same binary
12:57 zivester joined #git
12:57 ozette osse: oh i see
12:57 _ikke_ when executing git foo, git will execute git-foo in $PATH
12:57 ozette that's confusing..
12:58 Seveas CQ: git config core.sharedRepository
12:58 TooLmaN joined #git
12:59 CQ Seveas: no result when I run that
12:59 Seveas then it's not set :)
12:59 daniel_rose joined #git
12:59 Seveas which makes sense as you're getting 0444
13:03 ozette can git lfs track directories instead of extensions?
13:03 bluezone joined #git
13:03 ozette i did 'git lfs track static', but i'm not sure if it thinks of static as a directory, or as an extension
13:05 fuchstronaut joined #git
13:07 fission6 joined #git
13:08 davis joined #git
13:08 davis hello
13:08 davis I am working with some folks on a shared git repot
13:09 davis i'm currently pulling from master but yesterday three commits were done which are now breaking my build
13:09 PCatinean joined #git
13:09 SourTrout joined #git
13:09 davis i'm working in a different area
13:09 fission6 if i have master and a topic branch, and id like to deploy the topic branch and see how it goes in production for a few days without merging it into master -- is that typical  workflow behavior?
13:10 davis how would I pull the repot minus the last three commits?
13:10 JeroenT joined #git
13:10 jaafar joined #git
13:10 tobiasvl davis: pull? why pull
13:10 tobiasvl davis: !revert
13:10 gitinfo davis: 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]?
13:10 _ikke_ fission6: This is actually not a git question
13:10 davis perhaps clone would be better term.
13:11 tobiasvl davis: but can't you just clone/pull the whole thing with the last three commits and then reset to the commit you want?
13:11 davis i don't want to mess up there work, I just want to have the tree i'm working on be without their three commits.
13:12 texinwien_ joined #git
13:12 SourTro__ joined #git
13:14 ozette fission6: why do you care if it's typical, if that's how you want to do it, it's fine
13:14 davis im not certain. this is part of a script, the script pulls many git repots down. I work in one tree they work in another. their tree breaks and my work does not even get started. the script pulls the repots using ssh and specifies a two entries at the end. <branch name>, HEAD. I'm thinking I could mod script to be <branch name>, HEAD-3 or something
13:14 fission6 yea, it seems easier than merging into master and then pulling it out if it doesn't work or people don't like it ozette
13:15 star_prone joined #git
13:15 ozette fission6: you can make a snapshot with a proper name of your topic branch, and deploy that snapshot
13:16 star_prone joined #git
13:16 CEnnis91 joined #git
13:17 davis fwiw, if I try to use <branch name>, HEAD-3 instead of HEAD I get this error
13:17 davis fatal: ambiguous argument 'HEAD-3': unknown revision or path not in the working tree.
13:18 davis then it gives git usage info
13:18 Guest5 joined #git
13:18 davis could I replace HEAD with the commit number associated with HEAD-3?
13:19 davis hmm. that works
13:19 davis many thanks
13:19 lordjancso joined #git
13:21 ejb joined #git
13:22 jast davis: the correct spelling is HEAD~3 (tilde)
13:24 rahtgaz joined #git
13:24 davis jast many thanks
13:24 courrier joined #git
13:24 is_null left #git
13:25 jimi_ joined #git
13:26 fission6 ozette: what do you mean by snapchat
13:26 rom1504 snapshot
13:26 khelkun joined #git
13:26 ozette lmao
13:26 khelkun salut ouglaaa
13:26 khelkun sorry wrong chann
13:27 fission6 i mean snapshot
13:27 ozette fission6: i don't know how you deploy your code, but what i mean is for example the current state of your topic branch as a zip
13:27 fission6 you mean like ec2 snapshot
13:28 ExoUNX joined #git
13:28 fission6 ok
13:28 khelkun left #git
13:28 fission6 so basically deploy my topic branch not master, ie dont merge into master
13:28 ozette topic-branch.zip
13:28 hahuang61 joined #git
13:28 ozette yea, don't merge if you don't want to merge just yet
13:29 fission6 k thanks
13:29 zeroed joined #git
13:29 zeroed joined #git
13:29 Lomex joined #git
13:30 jeffreylevesque joined #git
13:32 cdg joined #git
13:32 rnsanchez_ joined #git
13:32 sfeinste joined #git
13:36 griffindy joined #git
13:36 vassagus joined #git
13:36 Lomex joined #git
13:38 sostenuto joined #git
13:39 Noldorin joined #git
13:40 fished joined #git
13:40 axl_ joined #git
13:41 notfrosty joined #git
13:42 notfrosty Hey ! How can I make contributions from my other ssh keys count as mine on github ?
13:42 selckin add the keys to you user?
13:42 ilmari notfrosty: the key doesn't matter. add the email address to your account
13:43 notfrosty I used my own email address and added the keys. But the contributions are shown as "root" and not my username.
13:44 _ikke_ it config --get-regex user
13:44 kaldoran joined #git
13:44 _ikke_ git*
13:44 CheckDavid joined #git
13:45 Macaveli joined #git
13:46 Dougie187 joined #git
13:46 ilmari notfrosty: that's because the commit has root as the author and has nothing to do with github
13:46 l4v2 joined #git
13:47 AaronMT joined #git
13:47 JeremyM joined #git
13:48 notfrosty In that case I just need to setup the mail address, ok. (In the previous comment I thought he meant the address generating the ssh key)
13:48 AaronMT joined #git
13:48 notfrosty *you meant
13:48 noidea joined #git
13:49 tabrez joined #git
13:49 netj joined #git
13:52 settermjd joined #git
13:53 sfeinste joined #git
13:54 sfeinste joined #git
13:55 Shashikant86 joined #git
13:55 sfeinste joined #git
13:55 sfeinste joined #git
13:56 thiago joined #git
13:57 kadoban joined #git
13:58 cdg joined #git
13:58 jaguarmagenta joined #git
14:02 JeroenT joined #git
14:04 eizua joined #git
14:05 ShekharReddy joined #git
14:06 gargola joined #git
14:08 nfk joined #git
14:12 StephanS joined #git
14:12 ilmari notfrosty: if you have commits with different email addresses you can make them all be attributed to you by adding the addresses to your account
14:13 fmcgeough joined #git
14:13 GodGinrai joined #git
14:14 notfrosty Yes. The problem was that I didn't setup any mail address so... Would it be possible to add user : root / email : BLANK ?
14:14 _ikke_ No
14:15 _ikke_ I think you need to confirm the e-mail in github
14:15 StephanS Hi. I have files stuck in cache... I have reset and push is still trying to upload the deleted file to GitHub, receiving the 100 MB limit error. I have tried to reset and invalidate. Am I resetting incorrectly?
14:15 _ikke_ This has nothing to do with reset / cache
14:15 mohabaks joined #git
14:15 _ikke_ If git tries to push those files, it means it's still being referenced in your history somewhere
14:16 notfrosty _ikke_, ilmari : i'll filter the branch, changing the user (I'm the only one working on the project) Thanks !
14:16 StephanS so just keep stepping back through my revisions until it accepts the push?
14:16 _ikke_ StephanS: you might want to look at !BFG
14:16 gitinfo StephanS: [!bfg] A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
14:17 al-damiri joined #git
14:17 StephanS Thank you
14:19 interne7y joined #git
14:21 jumpman joined #git
14:24 phaleth joined #git
14:24 shinnya joined #git
14:26 gryffus joined #git
14:26 daniel_rose joined #git
14:27 Guest13 joined #git
14:27 mrkat joined #git
14:27 sanketdg joined #git
14:28 gryffus When i add a new tag in my branch and want to merge that branch to master with that tag, do i need to push from that branch first, or checkout master, merge and push from master?
14:28 notfrosty left #git
14:28 grawity doesn't matter
14:28 grawity all pushing can be left for whenever you want
14:29 chigang_ joined #git
14:29 ResidentBiscuit joined #git
14:29 gryffus ok and do i need to push AND push --tags? or push --tags is enough?
14:29 grawity not sure
14:30 fracting joined #git
14:30 gryffus ok, so correct way woud be: git checkout branch, git tag, checkout master, git merge branch, git push, git push --tags ?
14:31 kevwil joined #git
14:31 madewokherd joined #git
14:31 grawity I suppose
14:31 _ikke_ Last two can be comibined with git push --follow-tags
14:32 gryffus nice, thank you :)
14:32 grawity tags aren't associated with a merge; they're only associated with a specific commit ID, so technically you can always tag a given commit even after merge
14:33 LionsMane joined #git
14:33 nikitasius joined #git
14:33 star_prone joined #git
14:33 dopesong_ joined #git
14:34 jpX joined #git
14:36 sarbs joined #git
14:36 fished joined #git
14:37 catag87 joined #git
14:40 johntramp joined #git
14:41 vassagus joined #git
14:42 beyertech joined #git
14:44 syndikate joined #git
14:44 MattMaker joined #git
14:45 texinwien_ joined #git
14:47 syndikate joined #git
14:47 thecomedian joined #git
14:49 dopesong joined #git
14:50 BryzNSTY joined #git
14:50 crayon joined #git
14:50 crayon joined #git
14:52 r3sno joined #git
14:52 zivester joined #git
14:53 thecomedian joined #git
14:53 cjohnson joined #git
14:53 cjohnson Is there a way to tell which branch is checked out in a repo where git commands are not installed?
14:53 cjohnson Helping a friend debug an issue, remote server is broken but the filesystem exists, and he's not sure if he can mount it to a machine where git is installed
14:55 eivarv joined #git
14:55 nikitasius joined #git
14:55 cjohnson .git/HEAD
14:55 cjohnson thanks rubber duck
14:55 gfixler2 joined #git
14:58 r3sno quick question. i need to rename some tags. im basically doing this: "git tag new_tag old_tag; git tag -d old_tag; git push origin :refs/tags/old_tag; git push origin --tags"
14:58 cjohnson ok rubber duck don't fail me now. How do I tell which commit is currently checked out just by inspecting the .git dir?
14:58 TomyWork joined #git
15:01 fuchstronaut joined #git
15:01 kadoban cjohnson: .git/HEAD and then look in .git/refs/heads/ or wherever for whatever that corresponds to, if it needs to be dereferenced.
15:01 kadoban It can be packed though.
15:02 jknetl joined #git
15:03 BlackMaria_netsp joined #git
15:04 reactormonk joined #git
15:05 reactormonk Where can git push hooks be?
15:05 kadoban All hooks are in .git/hooks/
15:05 kadoban If you mean the server-side ones ... they're on the server.
15:06 subhojit777 joined #git
15:07 subhojit777 joined #git
15:07 subhojit777 joined #git
15:08 romerocesar joined #git
15:09 johnny56 joined #git
15:11 reactormonk Nah, client-side. found them.
15:11 cjohnson thanks kadoban that was exactly it
15:11 cjohnson left #git
15:19 BlackMaria joined #git
15:19 Guest5 joined #git
15:21 dopesong joined #git
15:21 cyan__ joined #git
15:21 tyreld joined #git
15:23 dopesong joined #git
15:23 danslo joined #git
15:26 Lunatrius joined #git
15:28 eijk_ joined #git
15:29 netj joined #git
15:29 porton joined #git
15:29 hahuang61 joined #git
15:30 porton If I call a branch "rebase" (after a math term in my book), will it cause any problems? Well, I can call it "filter-rebase" or "rebase-filter". Is a branch with "rebase" in its name a good thing?
15:30 synthroid joined #git
15:30 porton ... or "filters-rebase" or "rebase-filters"
15:31 perlpilot git won't care.
15:31 porton Also: Should I fork this branch (where I rewrite a chapter in my LaTeX book) from "master" or from "devel"?
15:31 perlpilot you might want to be careful though
15:32 porton perlpilot: that Git does not care is clear, I am about an inadvent fishing attack for PEOPLE
15:32 perlpilot ah
15:33 thejoecarroll joined #git
15:33 crayon joined #git
15:33 kadoban Calling something 'rebase' will be confusing for people, if that's what you're asking.
15:33 madewokherd joined #git
15:33 porton kadoban: yes, it is what I ask
15:34 porton Also: Should I fork this branch (where I rewrite a chapter in my LaTeX book) from "master" or from "devel"?
15:34 kadoban That's really up to your workflow. 'master' doesn't have any inherent meaning.
15:34 porton I feel that from "devel" because it is a development thing, but I am not quite sure
15:37 crayon joined #git
15:39 beyertech joined #git
15:41 eijk_ joined #git
15:42 invex joined #git
15:43 kevwil_ joined #git
15:43 HappyLoa- joined #git
15:44 fission6 joined #git
15:44 mooru joined #git
15:45 Rish joined #git
15:46 Macaveli joined #git
15:46 texasmynsted joined #git
15:46 vassagus joined #git
15:47 texasmynsted I am trying to move my repo from one remote to another.
15:47 texasmynsted I added the new remote as a "remote" in my local repo
15:47 t0by joined #git
15:47 fracting joined #git
15:47 texasmynsted when I try to push I get a message that the histories are out of sync, as I would expect and same kind of error for pushing.
15:48 SourTrout joined #git
15:48 rubyonrailed joined #git
15:48 nikitasius joined #git
15:48 texasmynsted what is the best way to address this?
15:50 emPi joined #git
15:51 moritz merging!
15:51 SourTrout joined #git
15:52 SourTrou_ joined #git
15:52 kadoban texasmynsted: Is there old content in the "new" remote?
15:52 texasmynsted I think I need a new local tracking branch
15:52 texasmynsted yes.
15:53 Kulrak joined #git
15:53 Kulrak joined #git
15:54 osse ozette: you can run git-lfs directly if you wish. it's just a feature git provides to make auxiliary scripts feel more integrated
15:54 sangy joined #git
15:54 osse oops, sorry
15:56 snowkidind joined #git
15:57 syndikate joined #git
15:58 willettjf joined #git
15:58 texasmynsted hmm
15:58 texasmynsted "fatal: refusing to merge unrelated histories"
15:58 texasmynsted ok , how do I get past that?
15:58 Electrometro joined #git
15:58 phanimahesh joined #git
15:59 texinwien_ joined #git
15:59 geko- joined #git
15:59 texasmynsted Hmm. there must be a way to grab a branch and overwrite the current branch without pulling the history.
16:00 texasmynsted archive is the only thing I can think of.
16:00 denimsoft joined #git
16:00 texasmynsted Is there another way?
16:00 kadoban fetch it, and do some kind of reset? I don't really understand the goal.
16:01 soerenb joined #git
16:01 texasmynsted I need to move from one remote to another.
16:01 thiago texasmynsted: I think there's a way to force
16:02 texasmynsted I will try forcing.
16:02 thiago but are you sure you want to merge unrelated histories?
16:02 dreiss joined #git
16:02 geko- joined #git
16:03 texasmynsted ah,
16:03 texasmynsted --allow-unrelated-histories
16:03 thiago before you do, are you sure you want to do that?
16:03 texasmynsted I really want to replace the history of the new remote with that of the old
16:03 thiago your problem sounds like XY
16:03 thiago your merge is not going to replace
16:03 thiago it's going to *merge* the histories
16:04 texasmynsted goal is replace
16:04 thiago it also does not change a remote
16:04 dmto joined #git
16:04 texasmynsted it will change local then I expect I can push -f
16:04 thiago so I think you're way off if your goal is to "replace the history of a remote"
16:04 thiago why can't you just push now?
16:04 synthroi_ joined #git
16:05 airdisa joined #git
16:05 thiago anyway, you're looking for git reset --hard
16:05 thiago note that you'll discard any changes committed and uncommitted that aren't in the new remote
16:05 texasmynsted because the changes I want to push are in a different branch.  When I tried to push from my local master to the new remote master I got an error for my local being out of date, unrelated history, etc.
16:06 texasmynsted I do not see how git reset —hard would help
16:06 kadoban What's the new remote master supposed to look like?
16:06 texasmynsted reset all the way to empty?
16:06 * texasmynsted checks the history
16:06 denimsoft joined #git
16:07 texasmynsted The "new" repo has only one commit, and that has content.
16:07 texasmynsted new remote master should look exactly like my local master
16:07 texasmynsted and thus like my "old" remote master
16:07 osse git push --force newremote master
16:08 texasmynsted ok
16:08 star_prone joined #git
16:08 texasmynsted will try
16:08 davisonio joined #git
16:08 thiago texasmynsted: reset to the commit you want to be in
16:08 Macaveli joined #git
16:09 osse this is why you should politely decline github's offer to populate your new repo with a .gitignore or readme
16:09 texasmynsted ok that worked
16:09 texasmynsted +1 osse
16:09 texasmynsted +1 osse
16:09 oich joined #git
16:09 texasmynsted Yes that worked, and yes not populating readme etc is wise.
16:10 texasmynsted Thank all who helped
16:10 texasmynsted I mean thanks to all who helped
16:11 xall joined #git
16:11 zumba_ad_ joined #git
16:11 artemisart joined #git
16:11 osse texasmynsted: am i right in assuming that one commit you mentioned was because of this?
16:12 osse *was
16:12 texasmynsted yes
16:12 texasmynsted you are correct
16:12 osse goddammit I'm a genius
16:12 osse no wonder my opponents think I use wallhacks
16:12 texasmynsted hahaha
16:15 ozette osse: i see, thanks
16:15 texasmynsted what are wallhacks?
16:16 fracting joined #git
16:17 osse ozette: that's different from what you wrote last time!
16:18 osse texasmynsted: a kind of cheat for games
16:18 texasmynsted ha ok
16:20 lindenle joined #git
16:21 GavinMagnus left #git
16:24 Kicer86 joined #git
16:24 danslo joined #git
16:24 ozette osse: a little bit yes
16:25 aguimaraes1986 joined #git
16:25 ozette i'm good at this
16:25 EvilPenguin joined #git
16:26 Lipp__ joined #git
16:26 Lipp__ joined #git
16:29 davisonio joined #git
16:33 durham joined #git
16:33 eivarv joined #git
16:33 t0by joined #git
16:35 blackwind_123 joined #git
16:35 robotroll joined #git
16:35 ambro718 joined #git
16:36 beyertech joined #git
16:38 rominronin joined #git
16:41 Mannn joined #git
16:41 jeffreylevesque_ joined #git
16:45 BrianBlaze420 joined #git
16:49 rubyonrailed joined #git
16:49 BrianBlaze420 joined #git
16:50 Lomex joined #git
16:50 tjone270 joined #git
16:50 adamm joined #git
16:51 vassagus joined #git
16:51 daynaskully joined #git
16:52 freimatz joined #git
16:53 ejb joined #git
16:54 Darcidride joined #git
16:54 Zamerick joined #git
17:00 ImJune joined #git
17:02 lindenle joined #git
17:03 daniel_rose joined #git
17:04 SteffanW2 joined #git
17:04 davisonio joined #git
17:06 rubyonrailed joined #git
17:07 eivarv joined #git
17:09 denimsoft joined #git
17:09 catag87 joined #git
17:10 realz joined #git
17:11 dopesong joined #git
17:14 GavinMagnus joined #git
17:14 Guest5 joined #git
17:17 rubyonrailed joined #git
17:18 dopesong joined #git
17:18 Dyonisos joined #git
17:20 fission6 joined #git
17:20 fuchstronaut joined #git
17:20 dreiss joined #git
17:21 kpease joined #git
17:22 diegoviola joined #git
17:23 tjone270_ joined #git
17:23 jstimm joined #git
17:23 fahadash joined #git
17:26 sybariten joined #git
17:26 sybariten oh hai
17:27 osse its dat boi!
17:27 sybariten de e de
17:27 Derperperd left #git
17:27 Darren_ joined #git
17:27 sybariten i'm a git newbie. I am modifying a .gitignore file, cause when i do git status i see that git is picking up a file that i dont want it to. Can i modify the gitignore "on the fly" and git should sense that, or should i restart something?
17:27 Seveas /topic #git [18:12] <osse> goddammit I'm a genius
17:27 sybariten my changes to the gitignore arent working as im hoping  :)
17:27 Derperperd joined #git
17:28 kadoban sybariten: It notices immediately when you change it. You're probably running into ... .gitignore only affects stuff that's not already tracked.
17:28 osse !ignore_tr > sybariten
17:28 gitinfo [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
17:28 Seveas sybariten: git doesn't ignore changes to tracked files.
17:28 sybariten (when i say that git is picking up a file, i meant that it sees that an ini file has changed. It sees it as modified)
17:28 Seveas !config
17:28 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
17:28 kbs joined #git
17:29 sybariten now.... i'm confused
17:30 hahuang61 joined #git
17:30 sybariten the file that i would like git to ignore, is listed in red under "Changes not staged for commit:"
17:30 sybariten does that mean that it will be included in the add if i do git add .    ?
17:30 osse yes
17:31 sybariten So.... hm could my gitignore be badly written, or am i missing something fundamental in how git works...
17:31 osse sybariten: .gitignore only applies to files which otherwise haveen under "Untracked files:"
17:31 osse *otherwise would have been
17:31 sybariten hmmmm ok
17:32 sybariten basicly i need to.. .remove this file from git altogether, so it's untracked...
17:32 jost joined #git
17:32 thiago joined #git
17:32 kadoban sybariten: 'git rm --cached the_file' and then commit it
17:32 osse sybariten: try reading this again, !ignore_tr
17:32 gitinfo sybariten: [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
17:35 fuchstronaut joined #git
17:35 sybariten ok thanks all
17:35 Guest5 joined #git
17:36 rubyonra_ joined #git
17:38 nikitasius joined #git
17:39 rominronin joined #git
17:40 rominronin joined #git
17:41 dopesong joined #git
17:44 Guest5 joined #git
17:45 McNozes joined #git
17:47 Shentino joined #git
17:47 sanketdg joined #git
17:50 Softeisbieger joined #git
17:51 stfn joined #git
17:52 daniel_rose joined #git
17:54 m0viefreak joined #git
17:54 nitric joined #git
17:55 nitric joined #git
17:56 vassagus joined #git
17:58 xall joined #git
17:58 Thorsion joined #git
17:58 Gune joined #git
17:58 fracting joined #git
17:59 rubyonra_ joined #git
17:59 davisonio joined #git
18:00 Sasazuka joined #git
18:02 daniel_rose joined #git
18:05 roflincopter joined #git
18:06 occupant joined #git
18:07 ArchNoob joined #git
18:07 the_cybersphinx joined #git
18:08 d^sh joined #git
18:08 EgS joined #git
18:09 yoan__ joined #git
18:09 star_prone joined #git
18:09 catag87 joined #git
18:11 Gune Any idea why I would get a "Git 'fatal: Unable to write new index file" when doing a "git reset"? It's through a php library that uses Git. I checked permissions and diskspace, anything else that can trigger it?
18:12 occupant so we run our own git server and people in the org are wanting a real audit trail. how best could I accomplish this short of shelling out for gitlab or some other commercial solution?
18:12 perlpilot Gune: something else has the "old index file" still open?
18:13 ljharb left #git
18:14 nitric occupant: signed commits? https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work not sure what other audit requirements they have, or that git itself can do
18:14 Hedgework occupant: Can you define "real audit trail" in this context?  Are you looking for more security than git's internal tools provide, finer-grain access control and logging, or just to make it more intelligible to management?
18:14 rpd occupant: what does a real audit trail entail? Why not just have a set of precommit scripts that check that the commit is signed etc
18:15 kulelu88 joined #git
18:15 Hedgework brb
18:15 Gune perlpilot: Not that i know of no. I also tried clearing the index.lock beforehand in the event a process crashed and left it there, but still nothing
18:16 rpd Gune: can you manually `git reset`? i.e. Does it only fail from your script?
18:16 rpd What user does your script run under, etc?
18:17 Gune rpd: same user as the owner of the files. I cant reproduce the damn thing, whenever i run it myself it works. and whenever i re-run the script it works, happens once a day or so not more.
18:18 rpd Are you sure you close the file descriptor in your PHP script? Sounds like what perlpilot suggested is probably happening; the PHP script never lets go of the file and can't re-open it.
18:20 LeBlaaanc joined #git
18:20 interne7y joined #git
18:21 LeBlaaanc If I'm trying to merge a feature into two different release branches how do I do this?
18:21 byteflame joined #git
18:22 TomyLobo joined #git
18:22 LeBlaaanc the problem is I think I branched from a release thinking I should but shouldn't have... so I have release/2.13 and release/2.12, 2.12 has 3 commits that 2.13 doesn't and I branched off that...
18:22 LeBlaaanc when I tried to merge feature/foo into 2.13, it tried to apply the 3 commits in 2.12 to 2.13 but I really just wanted it to do the things that changed in the branch.
18:23 Gune rpd: Well, the script is designed to access a repo, and perform a git pull. in what event would it hold onto the file?
18:23 Gune Not sure im following
18:23 rpd Probably if the pull hangs
18:24 ki0 joined #git
18:24 rpd Don't really know your script, but it sounds like your script has problems accessing the repo several times in a row.
18:24 occupant Hedgework: I'd say finer grained access controls and logging fits the bill.
18:25 rpd LeBlaaanc: Probably cherry-pick that change from 2.12 to 2.13?
18:25 danslo_ joined #git
18:28 LeBlaaanc rpd is that the proper way to do it?
18:28 patarr joined #git
18:28 LeBlaaanc or can I actually use branches somehow?
18:29 HanClinto joined #git
18:29 LeBlaaanc would branching off a master branch help this situation?
18:30 davisonio joined #git
18:31 johnmilton joined #git
18:31 Gune rpd: here it is-> http://pastebin.com/8m0FvUBS   error happends on line 95, all the try/catches were the latest attempt at finding the issue.
18:31 Hedgework occupant: Finer grain access control and logging is what you get by switching to gitolite, and if needed upping your logging a bit on top of that.
18:32 Hedgework occupant: gitolite gives you the most granular access control of any of the hosting software available, and it's generally easy to set up and manage (also easy to migrate repos into)...it's not high overhead like gitlab and similar web front-ends.
18:33 Hedgework occupant: What gitolite does NOT do is provide mitigations of any risks related to server compromise.  That would require different controls, such as a code signing policy.
18:33 veilig2000 joined #git
18:34 mand0 joined #git
18:34 Hedgework !gitolite
18:34 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
18:34 kugel joined #git
18:36 Sasazuka__ joined #git
18:36 playfullyExist joined #git
18:36 deltab joined #git
18:38 mooru joined #git
18:39 rpd Gune: uh what's the critical message you get when that codepath is taken?
18:39 Balliad joined #git
18:40 rpd also I have no clue what fetchAll is supposed to do, but that seems like it would do a lot of work and possibly hang or fail itself
18:40 LeBlaaanc rpd is a cherry pick equivalent to merging but only selecting the changes that apply?
18:42 Gune rpd: it just reports it as "git reset error: Could not write new index file", thats all im afraid. Ah the fetchall+reset was a fix i found online for overwriting local files with repo files. in our case, it happends when a developer incorrectly uses a backend editor for editing files rather than git, it causes a collision which git doesnt like.
18:42 rpd LeBlaaanc: well, I wouldn't say that it's equivalent to merging at all. It only applies the changes you want and creates a new commit for it. Merging sort of implies that same commit or a merge commit before that
18:43 rpd Gune: still not much of a clue. There's a lot of reasons you can get that error; it also might just be you're out of disk space and actually cannot write anything, not to mention an index file.
18:44 Gune rpd: I see, Ill keep looking. its a tricky one:/ thanks for the help!
18:44 rpd It also might be the case that the new index being written does not have the same permissions as the parent directory or anything else around it. But you say it's the same user so it's hard to debug. Need more logging.
18:45 robattila256 joined #git
18:45 Gune rpd: Ill keep going, there ought to be a pattern to what is triggering it somewhere
18:47 tjone270__ joined #git
18:47 johnmilton joined #git
18:50 zincrokx joined #git
18:51 zincrokx left #git
18:52 mischat joined #git
18:56 t0by joined #git
18:57 l4v2 joined #git
18:57 tjone270_ joined #git
18:59 netj joined #git
19:01 MZAWeb joined #git
19:01 nilg joined #git
19:01 vassagus joined #git
19:02 mohabaks joined #git
19:04 Macaveli joined #git
19:07 ShekharReddy joined #git
19:07 mooru joined #git
19:09 Darcidride_ joined #git
19:12 durham_ joined #git
19:15 ahmedelgabri joined #git
19:15 shinnya joined #git
19:16 gbs joined #git
19:16 fuchstronaut joined #git
19:17 NeonSynth joined #git
19:18 grayjoc joined #git
19:19 Macaveli joined #git
19:20 paul424 joined #git
19:22 playfullyExist joined #git
19:22 cdown joined #git
19:22 foist joined #git
19:23 akiva joined #git
19:23 CQ left #git
19:25 Spec-Chum joined #git
19:25 mooru_ joined #git
19:26 darkbit joined #git
19:26 star_prone joined #git
19:26 jaafar joined #git
19:27 kugel_ joined #git
19:27 Discovery joined #git
19:27 kugel__ joined #git
19:28 cdown_ joined #git
19:28 zivester joined #git
19:29 thejoecarroll joined #git
19:30 IlNominePatre joined #git
19:30 zacts joined #git
19:31 causasui joined #git
19:32 causasui joined #git
19:34 BSAlb joined #git
19:34 mablae joined #git
19:35 MadLamb joined #git
19:36 BSab joined #git
19:37 MadLamb I have a fork, and a branch based on develop. Develop was updated and I rebased my branch, and pushed --force to origin. There was another branch on another fork that was based on my branch. My history was rewritten, and when the second fork tries to rebase on my branch, it fails. Ideas?
19:37 t0by joined #git
19:37 astaves joined #git
19:38 invex joined #git
19:39 zumba_ad_ joined #git
19:40 dhollinger joined #git
19:42 byteflame joined #git
19:43 fullstack joined #git
19:45 LeBlaaanc joined #git
19:47 sigma__ joined #git
19:48 sigma__ If I create branch B from branch A, then make changes in branch A such that a rebase is performed on branch A, can I rebase branch B onto A at this point?
19:48 rgrinberg joined #git
19:49 Darcidride_ joined #git
19:50 sigma__ I've been creating a branch B2 from the rebased branch A and cherry picking the work from branch B over to B2, but I feel like that isn't necessary.
19:51 LeBlaaanc sigma__ i think i have a similar question
19:51 LeBlaaanc we tried to merge and then it did all the things in branch A
19:51 LeBlaaanc in branch B
19:52 joshc_ sigma__: yes, see "Recovering from upstream rebase" in the git rebase manpage
19:52 sigma__ joshc_: Thanks.
19:56 sigma__ joshc_: "The real fix, however, would be to avoid rebasing the upstream in the first place." Do you know if there's a section covering what to do to avoid this scenario?
19:56 ash_workz git merge Foo while Bar is checked out  will merge changes from Foo into Bar right?
19:57 sigma__ In my example, should I just branch from A again for the changes and then merge it all back in later?
19:58 ash_workz ...
19:58 ash_workz it seems like that from the docs anyway
19:58 sigma__ ash_workz: Yes.
19:58 nettoweb joined #git
19:58 ash_workz that's what I thought
19:58 ash_workz thanks sigma__
19:59 skapunker joined #git
20:00 mgoodwin left #git
20:00 pzvxewlxmllzncdz joined #git
20:01 kugel joined #git
20:01 kugel joined #git
20:01 cdown joined #git
20:01 davisonio joined #git
20:02 rahtgaz I have created a repository on github and linked it already with my local repository. Now I created a development branch on github abd made it the default branch. I also protected master. How can I add the development branch to my local repository?
20:03 mcmillhj joined #git
20:03 mcmillhj left #git
20:03 jstimm joined #git
20:03 GodGinrai rahtgaz: `git fetch; git checkout devbranch`
20:04 rgrinberg joined #git
20:04 rahtgaz oh! finally it is working. thank you GodGinrai
20:04 fooobarrr !works
20:04 GodGinrai np :)
20:06 vassagus joined #git
20:06 remi Mhh, anyone got an idea how to name a repository that holds small Linux GUI things (like minimalistic panels)? I'd rather not have it in dotfiles as I'd like to use a programming language which compiles to binaries. I was thinking 'graphical-utils', but the Wikipedia page for Utility Software doesn't describe what I think of it
20:07 Walex remi: they are usually called "widgets" or "gadgets"
20:07 rpd naming is much harder than using git
20:07 Gitzilla joined #git
20:07 remi Walex, mhh that
20:07 remi Oops Enter to early
20:08 nnyk_ joined #git
20:08 Walex remi: and there used to be an important distinction between the two terms
20:08 * GodGinrai wonders if there is a channel for name suggestions
20:08 remi Walex, mhh that sounds right. I think maybe 'graphical-widgets' then!
20:08 Walex remi: widgets/gadgets are always graphical ;-)
20:08 GodGinrai graphical-bits?
20:09 remi rpd; some variety for you peeps
20:09 GodGinrai widgets are not always graphical
20:09 Walex remi: widgetlib?
20:09 remi GodGinrai, mhh good point
20:09 GodGinrai http://tfd.com/widget
20:09 remi Walex, it's not a library but the source files in it should compile to executable binaries
20:09 Walex remi: gadgetshelf?
20:10 Walex remi: it is source library...
20:10 remi "A program that performs some simple function, such as providing a weather report or stock quote, and can be accessed from a computer desktop, webpage, mobile phone or subscription television service." That sounds right
20:10 remi I am going to go with widget then. Maybe graphical-widgets
20:10 GenZai joined #git
20:11 netj joined #git
20:11 remi Walex, widgetlib makes me think the repository contains libraries for use in other programs, but maybe that's just me :$
20:11 GodGinrai remi: maybe it does
20:11 Walex "widget" is a term of art in GUIs, like "gadget", they have a specific meaning.
20:11 Rodya_ joined #git
20:12 choki joined #git
20:12 GodGinrai Walex: yes, but if you don't use the word "graphical" to imply a gui, then widget does not have that meaning.
20:12 Walex I can't remember which is which, but one is GUI elements that are built out of several windows, the other is GUI elements that built out of a single window and bitmaps inside it.
20:13 remi I was expecting it to be complicated
20:13 GodGinrai I've never seen widget used to specifically mean either of those
20:13 remi Thanks for the help you
20:16 mattwildig joined #git
20:17 tjone270__ joined #git
20:18 StephanS _ikke_ thanks again, it worked perfectly.
20:19 Walex https://www.cs.cf.ac.uk/Dave/X_lecture/node6.html#SECTION00630000000000000000
20:19 SourTrout joined #git
20:21 jaafar joined #git
20:21 kbs that is pretty old :-)
20:21 qpdb joined #git
20:21 interne7y joined #git
20:22 zacts joined #git
20:22 * kbs still has scars
20:23 mablae_ joined #git
20:24 kbs though oddly, I can't help but reflect that the current UIs have converged to what the classic X window system widgets used to look like
20:26 danslo joined #git
20:27 Spec-Chum On the branches that only I will work on, merge or rebase?
20:28 oich left #git
20:31 nitric joined #git
20:33 vuoto joined #git
20:34 daniel_rose joined #git
20:39 sonOfRa joined #git
20:40 veilig2000 joined #git
20:43 sagerdearia joined #git
20:43 ArchNoob joined #git
20:44 MadLamb joined #git
20:46 Guest5_ joined #git
20:48 Balliad joined #git
20:49 vdv joined #git
20:50 Captain_Ramius joined #git
20:50 Captain_Ramius joined #git
20:50 tjone270_ joined #git
20:51 Limes_ joined #git
20:51 NeonSynth joined #git
20:51 zeroed joined #git
20:52 Captain_Ramius joined #git
20:52 kenlefeb joined #git
20:54 ambro718 joined #git
20:55 ImJune joined #git
20:56 cyan__ joined #git
21:00 texinwien_ joined #git
21:02 sigma__ left #git
21:02 catag87 joined #git
21:03 IndigoTiger_ joined #git
21:05 NwS joined #git
21:06 SourTrout joined #git
21:07 cjohnson joined #git
21:07 cjohnson I made a bunch of commits and pushed them up to github in a branch that nobody else is working on
21:07 cjohnson so then I rebased them and squashed all back down to one
21:08 cjohnson Then I accidentally pulled thinking it would resolve the conflicting histories so it pulled all those commits back over top of my squashed commit. If I do git reset $squashedcommit and git push --force origin my-branch  will it rewrite?
21:08 fahadash joined #git
21:09 cjohnson er git reset --hard $goodcommit
21:10 ki0 joined #git
21:10 kadoban cjohnson: Yes, except you don't need to specify the branch you're pushing ... or the remote. Unless you always do.
21:10 jhass it will set what origin/my-branch points to, regardless of what it points to currently
21:11 vassagus joined #git
21:11 cjohnson No I don't normally do that
21:11 hahuang61 joined #git
21:11 josuebrunel joined #git
21:11 cjohnson so git reset --hard $goodcommit is for sure the way to abandon all the following now-junk commits?
21:12 WaReZ joined #git
21:12 cjohnson It was a -> b -> c -> d -> e, I squashed b->e into b2, and now it's a -> b2, -> c -> d -> e so I just need to git reset --hard b2
21:12 atrus joined #git
21:12 kadoban Sounds right to me
21:12 cjohnson thanks
21:13 kadoban In other cases, where you've like lost track of what the good commit is, you can use the reflog, but sounds like you already know what you want, so ... yeah that's fine.
21:13 Ariadeno joined #git
21:13 ResidentBiscuit joined #git
21:14 cjohnson haha damnit. It also force pushed another branch I wans't working on
21:14 jhass if you never committed your conflict state, git merge --abort works too
21:15 kadoban Oh, haha ... woops. I forgot it depends what your push.default is set to :-/
21:15 cjohnson oh well haha no worries
21:15 cjohnson other dev has a good copy on his end
21:16 cjohnson jhass: It didn't conflict, it just rewrite all the remote commits back over my squashed history
21:16 cjohnson probably because I do a rebase pull by default
21:16 dsdeiz joined #git
21:18 fuchstronaut joined #git
21:18 cjohnson kadoban: Just for future reference, what should my push.default be set to to avoid this?
21:18 cjohnson matching?
21:18 cjohnson oh, it is matching
21:19 kadoban Yeah I think matching is what I didn't count on. I'm pretty sure I use 'current' myself? I kind of forget what they all are honestly.
21:19 kadoban I didn't actually know that matching + -f would do that with push ... though it makes sense it does.
21:20 Spec-Chum joined #git
21:21 LionsMane joined #git
21:21 ResidentBiscuit I need to see when a particular method was added to a file, is there an easyish way to do this with git-blame?
21:21 shmuli joined #git
21:21 jaequery joined #git
21:22 ResidentBiscuit According to docs, `blame_usage` sounds like it can, but it doesn't say much about it
21:22 Guest5 joined #git
21:22 _ikke_ ResidentBiscuit: what about git log -S "method_name"
21:22 kadoban ResidentBiscuit: Sounds like the pickaxe stuff from git log (if you just search for pickaxe in the manpage you should find it)
21:22 kadoban Yeah that ...
21:23 ResidentBiscuit Oh yeah, totally misread the docs lol. That does seem like what I need
21:24 boltR joined #git
21:25 [cust] joined #git
21:26 Duder9999 joined #git
21:26 fabio_ joined #git
21:28 mooru joined #git
21:29 mablae joined #git
21:29 aidalgol joined #git
21:30 boltR does anyone know any projects that build the git model on a sql database?
21:30 ahr3n joined #git
21:30 boltR kind of like gitlab or github but using sql instead of git
21:31 kadoban I think other DVCS use a more standard data store compared to git, like maybe mercurial or shit I dunno, darcs? Not really sure. I think there's more, but I don't know any of their internals.
21:31 cuar joined #git
21:32 boltR hmm i'll take a look at a mercurial, thanks
21:32 LionsMane joined #git
21:32 kbs gerrit does this
21:33 kbs it has an abstraction for the data store bits - it can use (iirc) h2 or a sql database
21:33 artemisart joined #git
21:33 kadoban Really?
21:34 kbs that's my understanding - afaik it stores the actual data in an arbitrary store, and uses jgit to translate into the exposed git protocol
21:34 Darren_ joined #git
21:34 boltR oh interesting
21:34 boltR we actually use gerrit too and i had no idea
21:35 kbs (probably helps that git's content-addressable store is basically easy to mock with any other thing.) One of these days, someone is going to decide using bit-torrent as the datastore is a lovely idea
21:36 boltR i'll take a look at gerrit too, thanks
21:36 shmuli joined #git
21:37 kbs again - my understanding :) so if you find out different - would love to know
21:37 _ikke_ mercurial has also it's own filesystem representation
21:38 _ikke_ They're working on making the refs back-end pluggable, with also a (not sqlite) db back-end
21:38 _ikke_ for hiy
21:38 _ikke_ git
21:40 emPi joined #git
21:43 kbs boltR: ah, seems I am not correct - only some parts of the back end is in git, but not the actual blobs. sorry, mea culpa
21:43 kbs s/git/databasae
21:46 boltR kbs: no worries, could be gerrit 1.x
21:46 boltR i was just reading the system design myself
21:46 boltR https://gerrit-review.googlesource.com/Documentation/dev-design.html
21:46 spudowiar joined #git
21:51 Dougie187 left #git
21:53 shmuli joined #git
21:56 Ariadeno joined #git
21:56 Zamerick joined #git
21:59 cd-rum joined #git
22:00 tvw joined #git
22:01 yoan joined #git
22:03 theskillwithin joined #git
22:06 boltR http://www.aosabook.org/en/git.html
22:07 Ariadeno joined #git
22:07 Twirl joined #git
22:07 Twirl does git commit -am or git add . remove files?
22:07 boltR looks like someone has been working on different backends for libgit2 and jgit
22:07 boltR Twirl: nope
22:09 boltR however depending on where you run "git add ." in your git repo, you may end up omitting files from being committed
22:10 byteflame joined #git
22:10 Samual joined #git
22:11 tjone270 joined #git
22:11 SourTrout joined #git
22:13 ki0 joined #git
22:15 Twirl man i just need to remove these files
22:15 jaafar_ joined #git
22:15 Twirl i removed it in my project and i want them removed when i commit
22:16 jimi_ joined #git
22:16 vassagus joined #git
22:20 WakiMiko joined #git
22:21 SpeakerToMeat joined #git
22:22 cjohnson left #git
22:27 madewokherd joined #git
22:28 danslo joined #git
22:30 adrian_broher joined #git
22:32 beyertech joined #git
22:35 Twirl left #git
22:36 cbreak git add -u or -A
22:36 cbreak or git rm
22:38 SpeakerToMeat joined #git
22:40 HanClinto joined #git
22:40 venmx joined #git
22:41 Guest11 joined #git
22:41 red_ joined #git
22:43 gargola joined #git
22:49 shmuli joined #git
22:54 playfullyExist joined #git
22:54 CheckDavid joined #git
22:55 Spec-Chum joined #git
23:01 byteflame joined #git
23:01 SwiftMatt joined #git
23:02 rgrinberg joined #git
23:03 wwwi joined #git
23:04 Ahmed90 joined #git
23:05 adrian_broher joined #git
23:07 Jon28__ joined #git
23:11 azerus joined #git
23:11 SpeakerToMeat joined #git
23:12 hahuang61 joined #git
23:12 ImJune joined #git
23:14 SpeakerToMeat joined #git
23:17 SourTrout joined #git
23:19 fuchstronaut joined #git
23:21 shmuli joined #git
23:21 vassagus joined #git
23:23 dsdeiz joined #git
23:23 dsdeiz joined #git
23:25 d0nn1e joined #git
23:30 rubyonrailed joined #git
23:30 SourTrout joined #git
23:31 _sjs joined #git
23:33 l4v2 joined #git
23:36 boombatower joined #git
23:38 Rodya_ joined #git
23:39 Dougie187 joined #git
23:40 Henkie joined #git
23:40 cyphase joined #git
23:47 mostlybadfly joined #git
23:49 rkazak joined #git
23:51 Rodya_ joined #git
23:53 snowkidind joined #git
23:54 shmuli joined #git
23:54 beyertech joined #git
23:55 beyertech joined #git

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