Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-05

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

All times shown according to UTC.

Time Nick Message
00:05 bilal joined #git
00:05 Stumbler joined #git
00:06 serialoverflow joined #git
00:07 Ardethian joined #git
00:08 masuberu joined #git
00:08 blocky joined #git
00:08 blocky what does it mean if i try to clone a repo and it says "does not appear to be a git repository"
00:09 blocky but then i login through ssh and see that folder contains config description FETCH_HEAD etc
00:09 Vampire0 blocky, !repro
00:09 gitinfo blocky: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
00:10 jnewt can someone look at this for me: http://pasted.co/3ac1c0a8 ? I want to apply a hunk that is just a change of the function, ie the first - line and the last + line.  if i edit the hunk, and remove the two center + lines (replacing them with ' ' as instructed), it won't apply the patch (error: patch failed ... patch does not apply.)
00:10 d^sh joined #git
00:11 _Vi joined #git
00:14 Vampire0 jnewt, that is not like instructed
00:14 Vampire0 jnewt, read the instruction again
00:15 ExeciN joined #git
00:15 blocky Vampire0: https://paste.linux.community/view/65dc91d0
00:16 bilal joined #git
00:16 blocky i don't think the repo is set up right but i'd like to be able to suggest to the owner how to fix it
00:17 mel00010 joined #git
00:17 h12o joined #git
00:23 Vampire0 blocky, ssh into the machine, go into the git dir and try git status there, what does it say?
00:24 roelmonnens joined #git
00:25 PettanShoutaKun_ what is the best to reverse a commit you made on master?
00:25 bilal joined #git
00:25 PettanShoutaKun_ the way that is the least painful for everyone?
00:25 nidr0x joined #git
00:25 Vampire0 blocky, and are you supposed to clone this via SSH? gl-conf sounds to me like there should be a GitLab instance serving this
00:25 Vampire0 PettanShoutaKun_, man git revert
00:25 gitinfo PettanShoutaKun_: the git-revert manpage is available at https://gitirc.eu/git-revert.html
00:26 Vampire0 PettanShoutaKun_, if you did not push it yet, you can also eradicate it from the history
00:26 PettanShoutaKun_ it's pushed
00:26 Vampire0 PettanShoutaKun_, if you already pushed and you eradicate it from history, you will suffer from !rewrite
00:26 gitinfo PettanShoutaKun_: 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
00:26 fstd_ joined #git
00:27 netj joined #git
00:28 PettanShoutaKun_ wait can I not use git revert without rewritting history?
00:28 PettanShoutaKun_ also the commit is a merge commit from a pull requests
00:28 PettanShoutaKun_ *pull request
00:29 blocky Vampire0: git status says: fatal: This operation must be run in a work tree
00:29 bilal joined #git
00:31 Cabanossi joined #git
00:32 Puffball joined #git
00:34 bilal joined #git
00:35 onehrxn joined #git
00:36 Vampire0 PettanShoutaKun_, you can use revert to undo the effects, but you will not be able to redo the merge later, because even if you undo the merge effects, the merge will still be there. So if you want to redo the merge later, it sees that those commits are merged already and will not merge them again
00:36 Vampire0 PettanShoutaKun_, but yes, git revert is just a new commit, no history rewriting involved
00:37 phase2 joined #git
00:38 PettanShoutaKun_ I don't want to redo the merge
00:38 PettanShoutaKun_ so I think I'll be okay
00:39 brent__ joined #git
00:39 PettanShoutaKun_ I changed a bunch of stuff thinking it would fix stuff, but it never actually fixed stuff so it was all kind of pointless
00:40 h12o joined #git
00:40 Vampire0 blocky, hm, sounds ok and `git rev-parse --verify HEAD && echo true || echo false`?
00:41 durham joined #git
00:44 ssmall joined #git
00:46 nidr0x joined #git
00:47 Noldorin joined #git
00:47 bronson joined #git
00:50 bronson joined #git
00:51 Gurkenglas_ joined #git
00:55 User458764 joined #git
00:59 naf joined #git
01:00 h12o joined #git
01:00 sunri5e joined #git
01:01 MattMaker joined #git
01:01 otiose joined #git
01:01 nd joined #git
01:05 durham joined #git
01:08 durham joined #git
01:10 d^sh joined #git
01:10 svm_invictvs joined #git
01:11 jon-mac joined #git
01:13 tnecniv joined #git
01:16 Cabanossi joined #git
01:20 h12o joined #git
01:21 Bock joined #git
01:22 Bock joined #git
01:23 Wulf4 joined #git
01:25 fatalhalt joined #git
01:26 iamasamosa joined #git
01:32 a3Dman joined #git
01:33 caper joined #git
01:34 fatalhalt joined #git
01:36 cust joined #git
01:37 fatalhalt joined #git
01:38 VladGh_ joined #git
01:40 raijin joined #git
01:41 brent__ joined #git
01:41 h12o joined #git
01:42 sunri5e joined #git
01:47 stoopkid joined #git
01:47 sturner joined #git
01:50 ilbot3 joined #git
01:50 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:51 ir7466 joined #git
01:51 ir7466 Hello I have a strange issue - there's a couple of files that when I try to commit or revert - nothing happens
01:52 ir7466 so I do a "git status" and see 3 files
01:52 ir7466 no matter what i do to those files, nothing happens
01:53 Marquisk2 joined #git
01:53 MattMake_ joined #git
01:53 shgysk8zer0 joined #git
02:00 TbobbyZ joined #git
02:00 njbair joined #git
02:00 dreiss joined #git
02:00 dermoth joined #git
02:01 Cabanossi joined #git
02:01 h12o joined #git
02:03 madewokherd joined #git
02:03 chigang joined #git
02:06 rwp ir7466, git status shows you those file has local modifications? Or that they are untracked files?  Or other?
02:07 rwp ir7466, git diff shows you that they have changes?  You 'git add ...' then and 'git diff --cached' shows the changes?
02:08 chachasmooth joined #git
02:11 jameser joined #git
02:12 Marble68 joined #git
02:12 roelmonnens joined #git
02:13 zer0her0 joined #git
02:13 zer0her0 joined #git
02:14 ir7466 Hi rwp
02:14 Technocrat7 joined #git
02:14 prg3 joined #git
02:15 ir7466 i believe the problem is, on GitLab some of these files are duplicates
02:15 ir7466 ie. one is called "myfile.php" and another is called "MyFile.php"
02:15 ir7466 but when i pull to windows, it's only taking one... i guess a case sensitivity issue
02:15 MattMaker joined #git
02:16 telephone joined #git
02:16 telephone joined #git
02:16 Goplat joined #git
02:17 ir7466 so yeah, git status shows modifications. git diff shows changes... but it's showing changes between myfile.php and MyFile.php
02:17 AlienMachineElf joined #git
02:18 AlienMachineElf left #git
02:18 bronson joined #git
02:19 iamashishkebab2 joined #git
02:20 zer0her0 joined #git
02:20 zer0her0 joined #git
02:22 h12o joined #git
02:22 lagothri1 joined #git
02:24 Es0teric joined #git
02:24 rwp ir7466, Ah...  Case insensitive file system.  Gotcha.
02:26 QwertyDragon joined #git
02:28 anuxivm left #git
02:29 QwertyDragon_ joined #git
02:29 prg3 joined #git
02:32 QwertyDragon__ joined #git
02:33 ir7466 rwp: what about colons, could that cause a problem?
02:33 ir7466 i was able to solve a few of the conflicts because of the case
02:34 ir7466 but there's one like "FileName:_1234_i.inc"
02:34 QwertyDragon__ joined #git
02:34 ir7466 and my local version control is saying the file is deleted
02:34 ir7466 i'm not sure why it's saying it's deleted, I guess it must be something to do with the colon
02:34 h12o joined #git
02:35 Motoko joined #git
02:35 rwp I can only suggest 'git ls-files' to see what file names git has and then you can compare them to the local file system names.
02:35 watabou joined #git
02:36 ir7466 one moment
02:36 rwp I don't run on MS or Apple (which I assume you are on a Mac) and so I don't have those problems myself.
02:36 ir7466 im on windows
02:36 ir7466 but like you i kind of prefer running on linux
02:37 ir7466 if i run git ls-files what should i look for
02:37 ir7466 i do see the unusual name with the colon
02:38 ir7466 there's also a name identical except the after the colon
02:38 ir7466 like
02:38 rwp I was thinking that it would store the file name with the case associated with it and then you would know if it was different than the native name of the file on disk.
02:38 ir7466 it shows FileName:_1234_i.inc and FileName
02:39 rwp And if that is the actual file name then I would think you are okay. Except as you note it has a colon. So don't know if Windows will freak out because of that.
02:39 ir7466 yeah, i've figured out a way around the case insensitivity problem - i'm just deleting the redundant file from GitLab and re-cloning
02:39 ir7466 but yeah i think windows must be freaking out because it's seeing one with a colon and one without
02:41 rwp Probably looking for the FileName drive.
02:41 ir7466 ah
02:41 ir7466 yeah
02:41 rwp So strange to see that remnent of CP/M still hanging around these days.
02:42 hexagoxel joined #git
02:43 ir7466 i'm not really sure what i should do
02:43 ir7466 i want to rename the file, but i don't know the project well enough to know if someone is actually using a file with this name
02:44 rwp Any regression tests with this project?
02:44 ir7466 haha
02:44 ir7466 good one
02:44 lb1c joined #git
02:44 rwp https://en.wikipedia.org/wiki/Legacy_code
02:44 ir7466 (no)
02:45 ir7466 its still running php4
02:45 ir7466 and git has only been used for the last month or so
02:45 rwp "Michael Feathers introduced a definition of legacy code as code without tests"
02:46 ir7466 so i cant even look at the history to see when changes were made to a file
02:46 rwp You have hit the problem dead center because you would like to make the change but without tests you have no feedback as to what will break, if anything, if you do.
02:46 ir7466 yep
02:46 ir7466 and i cant even see when it was last changed, or who changed it, to know who i should talk to
02:46 rwp Wait...  git won't care what the file name is about.  You should be able to get the git history of the file.
02:47 rwp "git log FileName:_1234_i.inc" should tell you something.
02:48 ryxai joined #git
02:48 rwp Or if you want to see more detail such as changes "git log -p FileName:_1234_i.inc" and optionally with -m -c --cc for other effects.
02:49 zturner joined #git
02:50 prg3 joined #git
02:50 CEnnis91 joined #git
02:55 h12o joined #git
02:58 Vortex34 joined #git
03:00 bilal joined #git
03:01 otiose joined #git
03:02 Puffball joined #git
03:04 bilal joined #git
03:05 menip joined #git
03:14 navidr joined #git
03:14 xall joined #git
03:15 h12o joined #git
03:20 bronson joined #git
03:26 Lyqyd joined #git
03:29 salamanderrake joined #git
03:30 Cabanossi joined #git
03:30 dsdeiz joined #git
03:30 dsdeiz joined #git
03:30 ojdo joined #git
03:34 aavrug joined #git
03:35 aavrug joined #git
03:36 h12o joined #git
03:39 bronson joined #git
03:40 Es0teric joined #git
03:45 trobotham joined #git
03:46 kutenai My dev team committed some files. These are just normal .js files. The files have been marked as +x. They are on Ubuntu. Assuming they didn't manually do a chmod +x on those files, any ideas what mechanisms might account for the files being given the +x attribute?
03:48 telephone joined #git
03:48 telephone joined #git
03:48 preaction their mask could set it
03:48 thiago someone used Windows
03:50 kutenai thiago: yeah, that's what I'm thinking.
03:50 thiago or they copied from a USB drive
03:50 kutenai preaction: Their umask?
03:50 kutenai hmm.
03:50 preaction yes
03:50 kutenai These are not new files.. but might have been re-written by the system.
03:50 thiago the umask does not affect the executable bits
03:51 thiago what is "the system"?
03:51 kutenai "the system" -- meaning, IDE. Using PyCharm.
03:52 thiago I don't know why an IDE would rewrite a file and, even if it did, why it would set the +x attributes
03:52 kutenai So,  umask can't be it.. hmm.
03:52 kutenai Yeah, makes no sense..
03:52 thiago Windows and/or USB stick are your likely candiates
03:52 thiago of course, USB stick is a problem because of Windows too
03:55 a_thakur joined #git
03:56 h12o joined #git
03:56 Ardethian\ joined #git
03:58 cads joined #git
04:01 tohuw joined #git
04:01 tohuw joined #git
04:03 TbobbyZ joined #git
04:06 watabou joined #git
04:06 FuzzyWuzzyPanda joined #git
04:09 rkazak joined #git
04:12 frobnic joined #git
04:16 h12o joined #git
04:17 zturner joined #git
04:18 cagedwisdom joined #git
04:30 Cabanossi joined #git
04:37 h12o joined #git
04:41 nickel_dime_look joined #git
04:46 mniip joined #git
04:49 noorbeh joined #git
04:49 ayogi joined #git
04:50 shgysk8zer0 joined #git
04:52 rchavik joined #git
04:54 noorbeh left #git
04:58 h12o joined #git
04:58 watabou joined #git
05:00 Cabanossi joined #git
05:04 Chu joined #git
05:04 otiose joined #git
05:05 tarkus joined #git
05:07 dec0n joined #git
05:08 fluffystub joined #git
05:13 theoceaniscool joined #git
05:14 pks joined #git
05:15 albel727 joined #git
05:18 h12o joined #git
05:24 albel727 joined #git
05:25 m4sk1n joined #git
05:29 albel727 joined #git
05:30 Cabanossi joined #git
05:35 qt-x joined #git
05:37 imack joined #git
05:38 mda1 joined #git
05:38 soto_ joined #git
05:39 h12o joined #git
05:40 JanC_ joined #git
05:43 latino31 joined #git
05:43 sea-gull joined #git
05:43 VladGh joined #git
05:43 dec0n joined #git
05:43 cvt joined #git
05:44 cvt joined #git
05:44 cvt left #git
05:44 cvt joined #git
05:47 marlinc joined #git
05:48 sea-gull_ joined #git
05:48 o11c joined #git
05:48 o11c Using git-remote-bzr (the quasiofficial one), how do I get the bzr revision number for a git commit?
05:49 jonas_ joined #git
05:49 h12o joined #git
05:51 a_thakur joined #git
05:52 shgysk8zer0 joined #git
05:53 durham_ joined #git
05:53 a_thakur joined #git
05:54 Se7yLade joined #git
05:55 regedit joined #git
05:55 a_thakur_ joined #git
05:57 Raging_Hog joined #git
06:00 VladGh joined #git
06:00 dermoth joined #git
06:02 jay-m joined #git
06:04 rkazak joined #git
06:05 TbobbyZ joined #git
06:06 bilal_ joined #git
06:06 daishan left #git
06:08 netj joined #git
06:09 aavrug joined #git
06:10 xall joined #git
06:11 rscata joined #git
06:11 Silmarilion joined #git
06:13 otiose joined #git
06:14 zeroed joined #git
06:14 zeroed joined #git
06:16 whydoubt left #git
06:17 Cabanossi joined #git
06:18 roelmonnens joined #git
06:18 h12o joined #git
06:18 roelmonnens joined #git
06:21 zturner joined #git
06:24 JeroenT joined #git
06:26 JeroenT joined #git
06:28 ogny joined #git
06:28 iamashishkebab2 joined #git
06:28 duderonomy joined #git
06:28 JeroenT joined #git
06:28 otiose joined #git
06:29 visual hello /git/
06:29 D630 joined #git
06:30 nidr0x joined #git
06:30 visual in order to pull changes from upstream, i removed a local file, because i didnt need the local changes
06:30 visual it pulled ok
06:30 visual but now, the deleted file is staged for commit
06:30 visual how do i discard it?
06:32 visual actually, it pulled, but without that file, and now git fetch says it's up-to-date
06:32 visual but the file is missing locally :U
06:34 rwp visual, use "git reset HEAD <file>..." to unstage the removal.  See the output of 'git status' for that hint.
06:34 xall_ joined #git
06:36 rominronin joined #git
06:38 h12o joined #git
06:43 otiose joined #git
06:44 Gianormagantrous joined #git
06:45 ertes-w joined #git
06:49 dersand joined #git
06:50 jfr joined #git
06:51 acetakwas joined #git
06:51 jagob joined #git
06:51 watabou joined #git
06:52 cads joined #git
06:52 theoceaniscool joined #git
06:53 alexandre9099 joined #git
06:55 bronson joined #git
06:55 lindenle joined #git
06:58 chele joined #git
06:59 Gloomy joined #git
06:59 tarkus joined #git
07:02 Tobbi joined #git
07:02 theoceaniscool joined #git
07:03 manuelschneid3r joined #git
07:03 felGru joined #git
07:04 pbandark joined #git
07:04 visual thanks rwp
07:05 rwp visual, That or you need to use "git checkout -- <file>..." to discard changes in working directory.
07:06 rwp It all depends upon where in the staging pipeline you have made the changes. :-)
07:06 rwp "git status" should include hints on what to do to undo what has been done.
07:07 YuGiOhJCJ joined #git
07:09 h12o joined #git
07:09 o11c Okay, I've come up with a horrible bash script to convert read the mark info and convert git-commit-hash to bzr-commit-hash, then call bzr revno
07:10 o11c but I have no idea how it works in conjuction with bzr branches
07:10 o11c then again, I don't know of any bzr projects that actually *use* branches
07:10 xall_ joined #git
07:11 tonikt joined #git
07:12 zturner joined #git
07:12 o11c here's my result if anyone's interested: https://gist.github.com/o11c/cc3520bda444f2b26717952f02e51bf4
07:12 o11c this is the first time I really got into using jq
07:12 o11c it really is a nifty tool
07:13 barbos joined #git
07:13 schleppel joined #git
07:14 tonikt Hi guys. How can I make an existing branch a new HEAD? I don't want to merge - just change where the head is
07:14 tobiasvl tonikt: git checkout branch
07:14 ryxai joined #git
07:15 goTAN joined #git
07:15 o11c tonikt: consider also `git-worktree`
07:16 tonikt tobiasvl: I mean, I want everyone, from now on, checking out the master branch form the repo, to check out the code that is on my branch
07:17 liuxu joined #git
07:17 jameser joined #git
07:17 liuxu left #git
07:18 tobiasvl tonikt: OK… so you want to make an existing branch the new master?
07:18 o11c tonikt: change remote master, or change remote HEAD?
07:18 Stace joined #git
07:18 tonikt tobiasvl: yes
07:18 tobiasvl because you didn't mention master, you said HEAD
07:18 tobiasvl two very different things
07:19 tonikt o11c: sorry, I don't know what that means :)
07:19 osse change what HEAD points to on the host
07:19 o11c tonikt: there's a setting to change a remote repo's HEAD (the default branch)
07:19 lordjancso joined #git
07:19 nevodka joined #git
07:19 tobiasvl as o11c says, do you want to actually delete the current master branch and replace it with something else, or change what branch is checked out when cloning? (default branch)
07:19 netroxen joined #git
07:19 tonikt sorry guys, I was always thinking that  master and HEAD were same thing :)
07:19 nevodka joined #git
07:20 o11c e.g. on github, you can change the default branch here: https://github.com/o11c/python-curl-requests/settings/branches
07:20 o11c rewriting history is generally a bad thing
07:20 o11c so if you can't merge, you probably shouldn't overwrite master
07:21 tobiasvl (but if that REALLY is what you want, you can do it)
07:22 tonikt The current master has not been developed since I forked to the branch
07:22 tobiasvl tonikt: what is the scenario here exactly? just so we don't misunderstand each other more. why do you want to do what you want to do?
07:22 lipsumar joined #git
07:22 tonikt OK - here is the scenario...
07:22 tobiasvl ok, so why can't you merge?
07:22 tobiasvl ok
07:23 theoceaniscool joined #git
07:23 tonikt I am the only person who works on his repo, but many people use it in read only mode. Two weeks ago I created a branch and started working on it. Now the code on it is quite stable, so I want to make it the new head/master, so anyone doing a simple git clone will be using this code form now on
07:23 digidog joined #git
07:24 tonikt Honestly I don't know why I cant merge. It says "merge: v1.9 - not something we can merge"
07:24 osse tonikt: git checkout master; git merge a-new-branch; git push
07:24 tonikt Maybe I did one or two commits, but nothing big
07:24 zeroed joined #git
07:24 osse is your branch named v1.9 ?
07:24 tonikt Yes
07:25 osse run  git for-each-ref | grep -F v1.9
07:25 o11c ah, if you're not switched to master, yet you can't merge obviously
07:25 theoceaniscool joined #git
07:25 jameser joined #git
07:25 tonikt but I am switched to master
07:25 tonikt git checkout master - works
07:25 o11c wait, is v1.9 a *remote* or *local* branch?
07:26 tonikt git merge v1.9 - says "merge: v1.9 - not something we can merge"
07:26 osse o11c: must be neither.
07:26 o11c run `git branch -a`
07:26 tonikt it's remote
07:26 o11c *sometimes* remote branches are handled as-if local, but sometimes they aren't
07:26 mel00010 joined #git
07:27 kristofferR joined #git
07:27 o11c so try `git merge origin/v1.9`
07:27 tonikt o11c: https://pastebin.com/umgZL9Qv
07:27 tobiasvl ver1.9
07:27 osse jebus
07:27 o11c er
07:27 tobiasvl not v1.9
07:27 o11c not v, ver
07:28 tonikt o11c: "git merge origin/v1.9" says the same "merge: origin/v1.9 - not something we can merge"
07:28 o11c ver1.9
07:28 osse you don't know the name of your own branches!
07:28 o11c though using a v prefix for something other than a *tag* is heresy
07:28 tobiasvl hehe
07:28 tonikt oh, shit
07:28 tonikt sorry guys - you are right :)
07:29 tonikt I'm a nutter
07:29 tonikt it was ver1.9
07:29 tonikt git merge ver1.9 - works just fine
07:29 XenophonF joined #git
07:29 tonikt thank you all!
07:29 h12o joined #git
07:30 mikecmpbll joined #git
07:31 sbulage joined #git
07:32 Cabanossi joined #git
07:32 Tobbi joined #git
07:33 hendry from a git diff, could i somehow spawn a vimdiff so i can perhaps choose to put back some changes that I've made? https://youtu.be/A_U3EuYpGDw?t=74
07:33 osse no, but you can run git difftool
07:33 jeffreylevesque_ joined #git
07:37 jstimm joined #git
07:37 selckin think you can git checkout -p like add -p
07:37 selckin and git gui, and ofc what osse said
07:37 ankit01ojha joined #git
07:37 qt-x joined #git
07:39 slidercrank joined #git
07:39 JeroenT joined #git
07:39 Levex joined #git
07:40 kelvah joined #git
07:41 barbos joined #git
07:42 lipsumar joined #git
07:42 manuelschneid3r joined #git
07:42 miczac joined #git
07:46 elect joined #git
07:47 chu joined #git
07:49 Random832 joined #git
07:49 masuberu joined #git
07:50 h12o joined #git
07:51 Mavericks joined #git
07:51 sea-gull_ joined #git
07:51 sea-gull joined #git
07:51 jameser joined #git
07:51 Mavericks left #git
07:51 manuelschneid3r joined #git
07:52 watabou joined #git
07:53 elect_ joined #git
07:53 ssmall joined #git
07:54 manuelschneid3r joined #git
07:55 MattMaker joined #git
07:56 bronson joined #git
07:56 apotry joined #git
07:57 sturner joined #git
07:57 mikecmpbll joined #git
07:58 elect joined #git
07:59 iamashishkebab2 joined #git
08:00 h12o joined #git
08:01 Cabanossi joined #git
08:01 hendry I tried git config diff.tool vimdiff, but still i get this https://s.natalian.org/2017-05-05/1493971269_2548x684.png prompt... what am I missing? Can't I use vimdiff?
08:02 osse looks like you didn't run 'git difftool'
08:02 dvaske joined #git
08:03 hendry oh i used selckin's suggestion -p
08:04 visual can i stash some changes, switch branches, work, swich _back_, and unstash the changes?
08:04 visual as an alternative to commiting just because you switch a branch
08:05 hendry osse: my buffer is in RO mode via difftool. no idea why.
08:05 kurkale6ka joined #git
08:05 osse hendry: one of them are
08:05 selckin visual: yes
08:05 osse visual: yes, that's exactly how stash is used msot often
08:06 o11c visual: consider git-worktree though
08:06 visual awesome, thanks selckin & osse
08:06 visual o11c: oh?
08:06 o11c work on multiple branches at the *same* time, just in different directories
08:06 visual >A git repository can support multiple working trees, allowing you to check out more than one branch at a time.
08:07 o11c seaprate git index and stuff
08:07 visual interesting, will deff. check it out, thank o11c
08:07 Masber_080 joined #git
08:09 wandering_vagran joined #git
08:09 jameser joined #git
08:09 hendry osse: both are in my case bizaarely
08:09 sbulage joined #git
08:09 osse hendry: what are the paths?
08:11 hendry osse: /tmp/test ? https://s.natalian.org/2017-05-05/1493971807.mp4
08:11 lipsumar joined #git
08:12 cstratak joined #git
08:12 cebor joined #git
08:13 osse hendry: i see. same here. makes no sense. I don't think it used to be like that
08:14 selckin hendry: what do you use for recording
08:14 ijafidnsfod joined #git
08:14 hendry selckin: own crappy script that uses ffmpeg https://github.com/kaihendry/recordmydesktop2.0/blob/master/x11capture
08:16 cdown joined #git
08:17 marcogmonteiro joined #git
08:17 selckin where does $res come from
08:17 Snugglebash joined #git
08:18 IRQ` joined #git
08:18 _ADN_ joined #git
08:20 osse selckin: three lines above
08:20 onehrxn joined #git
08:21 h12o joined #git
08:21 selckin oh i'm sleepy fool
08:22 Levex joined #git
08:22 jameser joined #git
08:22 selckin was thinking you had way to select part of your screen because looked like that last video was like that, so i searched $res instead res :(
08:23 tymczenko joined #git
08:23 aax joined #git
08:24 djb-irc joined #git
08:26 najemnyvrah joined #git
08:26 sturner_ joined #git
08:28 cdown_ joined #git
08:29 hendry osse: should i file a bug about this RO issue with difftool ?
08:30 kurkale61 joined #git
08:31 osse hendry: I wouldn't call it a bug to mark the buffer RO. I'd call it a feature to figure out whether it makes sense for it to be RO or not
08:31 Cabanossi joined #git
08:31 osse but in principle, yes, it would be nice of it was brought up
08:32 hendry wonder if it's a vim issue or something odd
08:33 osse hendry: git explicitly launches vim in read only mode
08:33 iamashishkebab2 joined #git
08:33 osse hendry: https://github.com/git/git/blob/master/mergetools/vimdiff#L2
08:33 kurkale6ka joined #git
08:35 Faux joined #git
08:36 jim joined #git
08:36 jim hi, I want to chop off one commit I haven't pushed yet... git reset HEAD?
08:37 _ikke_ git reset --keep HEAD~
08:37 rogl joined #git
08:37 _ikke_ (--keep to prevent you from obliterating uncomitted changes)
08:37 jim oh ok, thoughtful, thanks... and there are none right now :)
08:39 jim and maybe I mistakenly thought there was a commit problem... checking...
08:40 chll_ joined #git
08:40 machinly joined #git
08:41 notebox joined #git
08:41 matt|home okay, if i want to create a new dir in my repo and move all files to it, do i have to do that with git or do i just mkdir mv * newdir
08:41 jim _ikke_, it was a false positive... looks like I'm ok
08:41 h12o joined #git
08:41 jim thanks anyway for your time
08:43 User458764 joined #git
08:44 JeroenT joined #git
08:44 otiose joined #git
08:44 bschindler joined #git
08:45 bschindler Hi - I'm trying to rebase a branch from a repository containing a submodule and I get conflicts because of this... here is the output
08:45 bschindler https://pastebin.com/VR9GSjqK
08:45 bschindler the submodule link at the commit I'm rebasing onto should be the same - so what is going on here?
08:45 CandyAngel joined #git
08:46 JeroenT_ joined #git
08:47 CandyAngel Is it possible to clone a repo over ssh without the remote compressing all the objects again? They are already packed..
08:47 dxtr joined #git
08:49 iamasamosa joined #git
08:49 selckin why do you care
08:50 selckin if ssh is slow its ssh and encryption and its terrible buffer sizes
08:50 CandyAngel Because it takes about 18 hours to repack them
08:51 osse huh, i'd expect a new repack to take much shorter time...
08:51 CandyAngel There are a *lot* of objects :)
08:51 tcorneli joined #git
08:52 DelTree quite a repo-potamus as it sounds...
08:52 CandyAngel Just a bit :)
08:52 CandyAngel It's like.. 12 million objects
08:52 osse CandyAngel: maybe you can (ab)use --upload-pack
08:52 seni joined #git
08:54 barbos joined #git
08:54 watabou joined #git
08:55 marcogmonteiro joined #git
08:58 zturner joined #git
08:59 sbasso joined #git
09:02 h12o joined #git
09:04 barbos joined #git
09:05 Gurkenglas_ joined #git
09:07 lipsumar joined #git
09:08 TbobbyZ joined #git
09:08 najemnyvrah Im getting ready to open source a project on github. I have found lots of opinions on how to clean/squash previous commits. Although, I have not found one that I like. The easiest seems to be `git checkout --orphan` but then you loose authoring. There are only two authors but I dont want it to look just like I did all the work.  Looking for best practices for open sourcing a previous closed project. Any advice here?
09:09 achadwick joined #git
09:13 rory joined #git
09:13 tarkus joined #git
09:14 djb-irc joined #git
09:16 Cabanossi joined #git
09:18 sbulage joined #git
09:19 jim left #git
09:20 theoceaniscool joined #git
09:20 Acerific joined #git
09:20 Tobbi joined #git
09:20 CandyAngel Turns out I can just copy the objects directory and then 'git fetch origin' just spends some time checking everything is there and is happy :)
09:21 barbos joined #git
09:21 Faux You don't even need to download the pack indexes if you're doing that, can regenerate them relatively quickly locally.
09:21 canton7 CandyAngel, also look at man git clone --reference
09:21 gitinfo CandyAngel: the git-clone manpage is available at https://gitirc.eu/git-clone.html
09:22 h12o joined #git
09:22 CandyAngel canton7: They aren't on the same machine
09:22 canton7 ah, fair enough
09:23 CandyAngel I did init, rsync objects, fetch and it is happy
09:24 jameser joined #git
09:24 holodoc joined #git
09:25 CandyAngel Faux: Seeing as the total size of the pack files is in the gigabytes range, copying the indexes is pretty much lost in the noise :)
09:27 rory left #git
09:28 kegster joined #git
09:29 ronskisika joined #git
09:30 theoceaniscool joined #git
09:31 sarri joined #git
09:31 sarri joined #git
09:31 lipsumar joined #git
09:33 h12o joined #git
09:34 pbandark joined #git
09:34 hs366 joined #git
09:37 Karazhan joined #git
09:40 zturner joined #git
09:40 marianina8 joined #git
09:40 JeroenT joined #git
09:42 osse najemnyvrah: whatæs in the commit metadata that needs cencoring in the first place?
09:43 User458764 joined #git
09:45 JeroenT joined #git
09:45 Lauven joined #git
09:46 D630 joined #git
09:46 PHPanos joined #git
09:47 tymczenko joined #git
09:52 Lauven joined #git
09:53 h12o joined #git
09:53 ssmall joined #git
09:54 jameser joined #git
09:54 watabou joined #git
09:56 SadAdmin joined #git
09:56 bronson joined #git
10:00 SadAdmin Hi everyone. I am setting up git for our dev team with git for windows (sadly we cannot use linux). At this moment, I am unable to start git daemon as a windows service, even tried with cygwin. Any suggestions? The daemon should be running at all times. Thanks
10:00 _ikke_ SadAdmin: Any reason why you are using git daemon?
10:01 SadAdmin We prefer to use the git protocol instead of smb, but we have no need for encryption to use ssh.
10:02 chardan joined #git
10:02 osse get one of those ready-made VMs with gitlab or gitblit or something on it. Spin it up. Done!
10:03 barbos joined #git
10:03 JeroenT joined #git
10:04 romank joined #git
10:04 SadAdmin For security concerns I prefer to install it on our own VMs
10:05 osse run the VM in a VM
10:05 osse done!
10:05 ronskisika joined #git
10:05 selckin gitlab is super easy to install
10:06 maroloccio joined #git
10:06 SadAdmin I appreciate the suggestion, but I'd really like to just set the daemon to run automatically
10:06 SadAdmin Everything is working fine except for this
10:06 SadAdmin Tried with cygwin and with sc, services are created but won't run
10:06 diogenese joined #git
10:07 selckin things usually give an error
10:07 Murii joined #git
10:07 kelvah joined #git
10:09 tymczenko joined #git
10:11 SadAdmin It's a stupid error message like "unable to start server" or that it didn't respond. The command runs without an error in cmd though
10:11 SadAdmin *server = service
10:12 osse that doesn't sound like a message git itself produces
10:14 h12o joined #git
10:14 ferr joined #git
10:14 sbulage joined #git
10:16 Tobbi joined #git
10:16 Cabanossi joined #git
10:19 basiclaser joined #git
10:19 SadAdmin The problem is not on git itself, but setting up the daemon command to start automatically in windows
10:20 SadAdmin Git is working, it just needs someone to run the daemon command so all devs can clone, push and do everything they should
10:20 zturner joined #git
10:22 d^sh joined #git
10:23 CandyAngel SadAdmin: If you can run VMs, why can't you have a Linux VM for this?
10:23 osse Ultimately it sounds like not a git problem
10:24 _ikke_ btw, ssh is not only encryption, but also authentication
10:24 ams__ joined #git
10:24 _ikke_ the git protocol is unauthenticated
10:25 miczac joined #git
10:26 _ikke_ SadAdmin: How did you define the service?
10:27 cbreak SadAdmin: both smb and the git protocol suck in their own ways
10:27 _ikke_ SadAdmin: https://stackoverflow.com/a/13044820/20261
10:28 barbos joined #git
10:28 govg joined #git
10:28 cbreak SadAdmin: as server, any unix should work well, mac os, linux, one of the bsds
10:28 cbreak as long as it's not windows it should be fine :)
10:29 cbreak just using a simple ssh server is probably the easiest, almost doesn't require any setup at all
10:30 mda1 joined #git
10:34 h12o joined #git
10:36 BSaboia joined #git
10:36 cads joined #git
10:39 Tobbi joined #git
10:41 JeroenT joined #git
10:41 clickjack joined #git
10:42 leeN joined #git
10:42 rchavik joined #git
10:42 JeroenT joined #git
10:43 sbasso joined #git
10:45 a3Dman joined #git
10:45 otiose joined #git
10:46 JeroenT_ joined #git
10:46 rvgate joined #git
10:49 freddy_ joined #git
10:49 marianina8 joined #git
10:49 sbasso joined #git
10:49 murii_ joined #git
10:49 rominron_ joined #git
10:49 Gloomy joined #git
10:49 Ardethian joined #git
10:51 Guest67506 joined #git
10:52 Aljone joined #git
10:52 cliluw joined #git
10:52 MuffinMedic joined #git
10:53 JeroenT joined #git
10:54 StormLrd joined #git
10:54 slavking joined #git
10:54 slavking hi I have a question
10:54 IRQ` joined #git
10:54 safe joined #git
10:54 slavking I have a github account
10:55 slavking and I forked my friend's project
10:55 h12o joined #git
10:55 slavking how do I work on my end of the project without screwing with his project
10:55 slavking why is git so difficult
10:55 tobiasvl slavking: your fork will not screw with his project at all
10:55 watabou joined #git
10:55 tobiasvl slavking: you clone your fork and do what you want with it
10:55 slavking my fork is the same as his
10:56 slavking why can't they be in the same directory?
10:56 tobiasvl I don't understand what you mean by that
10:56 slavking my pull request destroyed his project
10:56 tobiasvl then why did he accept it
10:56 theoceaniscool joined #git
10:56 slavking because he thought it wouldnt
10:56 slavking also how do I pull request to a different branch
10:56 tobiasvl well that's on him then
10:57 slavking i don't want to merge everything to master
10:57 slavking why can't the project have branches for the two of us
10:57 tobiasvl you might want to head over to #github if you mostly have github questions
10:57 tobiasvl but I don't understand what your problem is
10:57 tobiasvl so maybe here is just as well
10:57 slavking also why does git rm delete files forever
10:57 tobiasvl maybe start from the beginning, you've just rattled off a lot of issues
10:57 slavking who thought that is a good idea
10:58 tobiasvl git rm does not delete files forever
10:58 tobiasvl they're still in the repo's history
10:58 slavking how do I undo stuff?
10:58 slavking like git rm
10:58 slavking and unwinding commits
10:58 tobiasvl slow down please
10:58 tobiasvl and read a !book
10:58 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
10:59 slavking I suffer with git
10:59 tobiasvl what are your concrete and practical problems that we can help you with, beyond the fact that you suffer with (and don't fully understand?) git?
11:00 tvw joined #git
11:00 bitmod joined #git
11:00 slavking how do I set up in such a way that i have a clone of a project and do my project without having to switch directories
11:01 telephone joined #git
11:01 telephone joined #git
11:01 tobiasvl switch directories? what do you mean by that?
11:01 slavking yes
11:01 slavking i mean not having to do cd all the time
11:01 theoceaniscool_ joined #git
11:01 Gloomy joined #git
11:01 opr joined #git
11:01 dvaske joined #git
11:01 slavking I did clone *github project*
11:01 osse on your local computer you usually only have *one* directory you work in. inside that directory you communicate with both your fork and your friend's original
11:02 slavking osse, that's the thing!
11:02 slavking how do I do that?
11:02 sbasso joined #git
11:02 slavking git clone *some project*
11:02 osse slavking: clone your fork. cd inside. run 'git remote add upstream {friend's URL here}'
11:02 slavking git clone *my fork*
11:02 cebula joined #git
11:02 slavking then it blows up
11:02 opr hey - I have mydirectory/a.txt in my master branch and mydirectory/a.txt in my "stage" branch. I would like both of these files to be different and never overwrite each other even when merging the branches, how cam I do this?
11:03 slavking so first I have to fork
11:03 slavking I can't clone and work on it
11:03 SteffanW joined #git
11:03 osse you can work on the clone of his directly
11:04 osse but since you alreadu have forked, and already have a clone of your fork... remove the clone of the original and run the command i said
11:04 tobiasvl slavking: you can work on a clone all you want, but you can't push to his repo. if you're a contributor on your friend's repo, ie. if he has added you so you have access, then you can push
11:04 otiose joined #git
11:05 slavking ok I did that
11:05 slavking how do I merge my fork to his original now
11:05 slavking cause my fork is screwed
11:05 slavking i just want to overrun my fork
11:05 osse so I guess you mean the other way around, then.
11:06 slavking yes
11:06 slavking merge his original to my fork
11:06 osse !merge_up
11:06 osse !upstream
11:06 gitinfo Do you want to set the remote branch which is being tracked(!set_upstream), list what remote branches are being tracked(!show_upstream), or incorporate changes from another repo which is not your "origin"(!pull_upstream) ?
11:06 osse !pull_upstream
11:06 gitinfo To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
11:06 telephone joined #git
11:06 telephone joined #git
11:06 Mogget joined #git
11:06 tobiasvl also you don't necessarily want to merge if you want to throw away your local stuff, you can use git reset instead
11:07 tobiasvl "merge" means that you actually want the histories of both repos to mesh together
11:07 slavking I want to overrun any local changes
11:07 slavking a clean start
11:07 slavking git fetch upstream
11:08 osse git reset --hard upstream/master  (if your branch name is master)
11:08 tobiasvl then you can do `git reset --hard upstream/master` if you want to overrun master. that will throw away any local changes, so be sure that's what you actually want before you run it
11:08 slavking okay finally
11:08 slavking now can I push this to my fork on github
11:08 osse git push origin master
11:09 slavking git push  failed
11:09 slavking let me try git push origin master
11:09 slavking same
11:09 slavking updates were rejected
11:09 slavking beacsue the time of your
11:09 slavking current branch
11:10 slavking is behind its remote counterpart
11:10 slavking well I am onto something
11:10 slavking thanks guys
11:10 osse slavking: since everything is fucked anyway I give you permission to use --force this one time
11:10 a3Dman joined #git
11:10 GingerGeek joined #git
11:10 slavking force works
11:10 GingerGeek joined #git
11:11 tobiasvl then you have already pushed some stuff to your fork. if you want to override that too, use "git push --force origin master". if you want to get that stuff down to your clone, "git pull"
11:11 ok91 joined #git
11:11 tobiasvl ok you forced, that is fine
11:11 TbobbyZ joined #git
11:11 tobiasvl now your fork, clone and your friend's repo (well the master branch) are all in sync
11:12 slavking how do I push changes to my fork and to his original?
11:12 slavking and how do I push changes to local ?
11:12 slavking I want a branch for myself
11:12 osse you never push changes to local. that'
11:12 slavking and a branch for him
11:12 osse you never push changes to local. that's where you make the changes in the first place
11:13 osse you push to your fork (ie. "origin"), then you make a pull request
11:13 slavking so everything I locally do is not saved somewhere?
11:13 osse it is saved on your hard drive
11:13 tobiasvl you don't need a branch for you and a branch for him. everything in your local repo is yours. every branch that starts with "upstream/" is his. his master branch is in upstream/master for example
11:14 slavking can I change that stupid name, upstrea
11:14 slavking upstream to his name>
11:14 slavking and origin to my name?
11:14 osse git remote rename foo bar
11:14 slavking brb
11:15 slavking yesh!
11:15 slavking it work
11:15 slavking s
11:15 h12o joined #git
11:17 re1 joined #git
11:17 borkr joined #git
11:19 ThomasLocke joined #git
11:19 otiose joined #git
11:19 sbasso_ joined #git
11:20 PHPanos joined #git
11:21 sturner joined #git
11:22 Tobbi joined #git
11:22 PHPanos joined #git
11:23 ayogi joined #git
11:24 Gloomy joined #git
11:25 MineCoins joined #git
11:27 deronnax joined #git
11:27 deronnax hello
11:27 gitinfo deronnax: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
11:28 ertes-w joined #git
11:28 deronnax I have a commit with 2 hunks. I would like to move 1 hunk to another commit, on top. How to do ?
11:28 deronnax (I know I can reset and redo with git reset but that's not the method I would like to use)
11:29 deronnax (imagine these 2 hunks are the result of a very tedious git add -p I don't want to redo again
11:29 maroloccio joined #git
11:30 Vampire0 deronnax, !perfect should help
11:30 gitinfo deronnax: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
11:31 deronnax Vampire0, I'll have a look. git rebase -i is not needed because the commit is on top
11:31 lipsumar joined #git
11:31 Cabanossi joined #git
11:32 dglambert joined #git
11:32 dglambert yo
11:32 Vampire0 deronnax, should still apply accordingly, you just need to do a little transfer in mind :-)
11:33 rchavik joined #git
11:33 Levex joined #git
11:33 seveneve1 joined #git
11:33 ertes-w joined #git
11:34 Vampire0 deronnax, basically I'd say simply stash your changes, then do it with reset and making two commits out of the one, then stash pop
11:35 deronnax Vampire0, I already know how to do this :). I said I don't want to reset everything, I want to selectively extract the hunk I'im interested in
11:35 h12o joined #git
11:37 Vampire0 deronnax, do a --soft reset, this is like just undoing the commit with the index left untouched. Then use reset -p to selectively remove the hunk and commit again
11:38 deronnax Vampire0, hmm, sounds nice, I'll give a try
11:38 aavrug joined #git
11:39 a3Dman joined #git
11:39 tarkus joined #git
11:40 caper joined #git
11:40 bilal joined #git
11:43 bilal_ joined #git
11:45 bsanford joined #git
11:45 plasticle joined #git
11:47 bongo joined #git
11:48 plasticle joined #git
11:50 yohnnyjoe joined #git
11:52 Spacew00t joined #git
11:53 goTAN joined #git
11:54 freddy_ joined #git
11:54 marcogmonteiro joined #git
11:56 h12o joined #git
11:57 synthroid joined #git
11:57 rnsanchez joined #git
11:58 bronson joined #git
11:59 ssmall joined #git
11:59 Snugglebash joined #git
11:59 synthroi_ joined #git
12:00 AndChat-484449 joined #git
12:01 Cavallari joined #git
12:01 Cabanossi joined #git
12:02 PioneerAxon_ joined #git
12:03 goTAN joined #git
12:03 User458764 joined #git
12:07 cads joined #git
12:07 rivarun joined #git
12:07 amrits joined #git
12:11 Sadeukko joined #git
12:12 goTAN joined #git
12:13 Gloomy joined #git
12:16 jorj joined #git
12:17 wandering_vagran joined #git
12:18 theoceaniscool_ joined #git
12:19 circ-user-zNiD2_ joined #git
12:21 aielima joined #git
12:22 ssmall left #git
12:22 circ-user-zNiD2_ If pushing started to ask me password, which always fails, how do I debug it to start using ssh keys in windows?
12:22 seni joined #git
12:22 m1dnight1 joined #git
12:23 onehrxn joined #git
12:23 masuberu joined #git
12:23 kelvah joined #git
12:24 redeemed joined #git
12:25 Vampire0 circ-user-zNiD2_, did you enable two-factor authorization?
12:25 circ-user-zNiD2_ no
12:25 Marquisk2 joined #git
12:25 Vampire0 circ-user-zNiD2_, ok, so what was your question? how to use SSH keys instead of username / password?
12:26 circ-user-zNiD2_ yes, where should I place them
12:26 Vampire0 circ-user-zNiD2_, use the SSH URL for the remote instead of the HTTPS URL
12:26 circ-user-zNiD2_ or check that they are in place
12:26 Vampire0 SSH keys + HTTPS URL will not work
12:27 courrier joined #git
12:27 sevenever joined #git
12:27 dvaske joined #git
12:30 sbasso joined #git
12:30 circ-user-zNiD2_ It is ssh, yet password is asked.
12:31 Sound joined #git
12:31 Sound joined #git
12:32 onehrxn joined #git
12:33 royal_screwup21 joined #git
12:34 alexandre9099 joined #git
12:35 tobiasvl it's not password, it's the ssh key's passphrase, surely
12:36 Gloomy joined #git
12:37 sbulage joined #git
12:37 lipsumar joined #git
12:38 maroloccio joined #git
12:40 kurkale6ka joined #git
12:42 flaviodesousa joined #git
12:42 _ikke_ if it asks for a password, it's a password
12:45 dave0x6d joined #git
12:47 lipsumar joined #git
12:50 marianina8 joined #git
12:53 tarkus joined #git
12:53 Snugglebash joined #git
12:53 JeroenT_ joined #git
12:53 roelmonn_ joined #git
12:53 Gurkenglas_ joined #git
12:53 zeroed_ joined #git
12:54 perlpilot_ joined #git
12:54 Cavallari1 joined #git
12:54 jfr_ joined #git
12:55 kurkale61 joined #git
12:55 nitemare joined #git
12:57 IanLiu joined #git
12:57 watabou joined #git
12:57 frobnic_ joined #git
12:57 sea-gull1 joined #git
12:58 Aljone joined #git
12:58 sea-gull2 joined #git
12:59 a3Dman joined #git
13:00 sbasso_ joined #git
13:00 kurkale62 joined #git
13:01 m0f0x joined #git
13:01 m0f0x joined #git
13:01 mniip_ joined #git
13:01 pks_ joined #git
13:01 wcstok joined #git
13:02 jeffreylevesque joined #git
13:02 [sarri] joined #git
13:02 circ-user-zNiD2_ What if git log -S"a snippet" finds nothing? How can that code be in repository?
13:02 johnflux joined #git
13:02 johnflux joined #git
13:03 Marble68 joined #git
13:03 sbasso joined #git
13:03 Stumbler joined #git
13:03 Marble68 Hi all - I’d like to squash numerous, committed changes into a new branch but I can’t seem to find the right steps.
13:04 d^sh joined #git
13:04 netroxen joined #git
13:04 Marble68 I branch off master, DevBranch- and over many days I make changes, commit and test, alter the smame files - commit test - etc
13:04 dave0x6d joined #git
13:04 jameser joined #git
13:04 twisted` joined #git
13:04 Marble68 then, what I’d like to do is make a new branch off master - and take the current - working state of my devbranch- and have all it’s changes apply in this new “tomerge” branch
13:05 osse Marble68: git checkout -b tomerge; git reset --soft master; git commit -m 'All of it'
13:05 Marble68 then, I can open a ticket and have the person who has access to the staging reposity merge my “ToMerge” branch into that
13:05 ams__ joined #git
13:05 Marble68 osse: Thank you! I will try that
13:06 synthroid joined #git
13:06 Marble68 Oh I think I see
13:06 Marble68 so I’m sitting on Dev, I branch it to “ToMerge”, then I reset ToMerge to master, keeping changes
13:06 Marble68 oh my gosh - it’s so simple when i see it. I’ve been trying to rebase and squash
13:07 Marble68 Thank you so much
13:07 ok91 joined #git
13:07 circ-user-zNiD2_ What if git log -S"a snippet" finds nothing? How can that code be in repository?
13:07 sturner joined #git
13:07 i7c What if you don’t repeat your question after five minutes?
13:08 maroloccio joined #git
13:08 i7c Are you looking at the whole git history or only a part?
13:08 osse Then the snippet most likely isn't in the repository.
13:09 m1dnight1 joined #git
13:09 chardan joined #git
13:09 chll__ joined #git
13:09 ankit01ojha joined #git
13:09 ThomasLocke joined #git
13:09 ThomasLocke joined #git
13:09 rscata joined #git
13:09 slidercrank joined #git
13:09 achadwick joined #git
13:09 Silmarilion joined #git
13:09 M6HZ joined #git
13:10 maroloccio joined #git
13:10 Gianormagantrous joined #git
13:12 Vampire0 circ-user-zNiD2_, maybe the snippet is only present on another branch?
13:12 mda1 joined #git
13:12 ExoUNX joined #git
13:13 chu joined #git
13:13 Faux left #git
13:14 GingerGeek joined #git
13:14 chele joined #git
13:14 fluffystub joined #git
13:14 prg3 joined #git
13:14 cust joined #git
13:14 sparr joined #git
13:14 idr0p joined #git
13:14 omnigoat joined #git
13:14 ToeSnacks joined #git
13:14 teadrop_ joined #git
13:14 richardlitt joined #git
13:14 mkoskar joined #git
13:14 TbobbyZ joined #git
13:15 sparr joined #git
13:15 mkoskar joined #git
13:15 omnigoat joined #git
13:16 gaucheph joined #git
13:17 tcorneli joined #git
13:18 circ-user-zNiD2 joined #git
13:19 stepho joined #git
13:20 bilal joined #git
13:22 relipse joined #git
13:22 Arokh joined #git
13:22 TheSimonator joined #git
13:23 a3Dman joined #git
13:23 Brski joined #git
13:23 theoceaniscool_ joined #git
13:23 jstimm joined #git
13:24 dglambert joined #git
13:24 bilal joined #git
13:25 CEnnis91 joined #git
13:26 GingerGeek joined #git
13:26 GingerGeek joined #git
13:26 chele joined #git
13:26 ToeSnacks joined #git
13:27 richardlitt joined #git
13:27 CEnnis91 joined #git
13:27 fluffystub joined #git
13:28 teadrop_ joined #git
13:28 borkr joined #git
13:28 idr0p joined #git
13:29 prg3 joined #git
13:29 ResidentBiscuit joined #git
13:30 MineCoins joined #git
13:30 cust joined #git
13:33 dfaught joined #git
13:34 dvaske joined #git
13:34 lipsumar joined #git
13:36 ableto joined #git
13:36 AaronMT joined #git
13:38 zeroed joined #git
13:39 _xor joined #git
13:39 gugah joined #git
13:42 thiago joined #git
13:45 holodoc joined #git
13:45 valize joined #git
13:45 __xor joined #git
13:45 lindenle joined #git
13:45 robotroll joined #git
13:46 texasmynsted joined #git
13:46 Snugglebash joined #git
13:47 lipsumar joined #git
13:47 kurkale6ka joined #git
13:47 jagob joined #git
13:48 __xor left #git
13:50 ash_workz I seem to encounter broken syntax highlighting for php files on git... often.... recently
13:50 ash_workz anyone know what the deal is with that?
13:51 tobiasvl on git?
13:51 tobiasvl you mean github?
13:51 tobiasvl maybe ask in #github
13:52 Es0teric joined #git
13:52 Vampire0 or write a mail to their support, they are pretty responsive
13:54 tobiasvl !sgc
13:54 gitinfo For bug reports, feature requests, suggestions for improvement, or specific problems with an individual repo (or gist, etc.), please contact support via support@github.com or https://github.com/support - support tries to answer all questions within 24 hours, including weekends and holidays.
13:54 zturner joined #git
13:54 azerus joined #git
13:55 kurkale61 joined #git
13:56 PioneerAxon joined #git
13:56 lipsumar joined #git
13:56 cdown joined #git
13:57 soto joined #git
13:57 askb joined #git
13:57 marcogmonteiro joined #git
13:58 watabou joined #git
13:59 bronson joined #git
13:59 djb-irc joined #git
14:00 rasto joined #git
14:00 Qilibrun joined #git
14:01 ok91 joined #git
14:03 MineCoins joined #git
14:04 User458764 joined #git
14:05 kelvah joined #git
14:05 Tobbi joined #git
14:06 roelmonnens joined #git
14:07 JeroenT joined #git
14:08 JeroenT joined #git
14:08 Wefhi joined #git
14:08 polyrob_ joined #git
14:09 ash_workz Vampire0: tobiasvl thanks, I wrote in
14:09 ash_workz but can someone confirm that it's broken? Maybe it's just me? https://github.com/php-fig/http-message/blob/master/src/ServerRequestInterface.php
14:10 Noldorin joined #git
14:11 otiose joined #git
14:12 Vampire0 ash_workz, well, the file ist not valid, is it? The php tag is not closed
14:12 ash_workz Vampire0: that's valid
14:12 ash_workz Vampire0: ?> is optional and not recommended
14:13 TbobbyZ joined #git
14:13 royal_screwup21 joined #git
14:13 Vampire0 Ah, ok, didn't know that
14:13 ash_workz Vampire0: unless you which to switch out of php specifically
14:13 ash_workz Vampire0: like for a template
14:13 Vampire0 Then I'd say yes, it is broken
14:14 ash_workz yay @not just me!
14:14 grawity it's not a template, it just has code
14:14 DelTree characters between "?>" and EOF can be really annoying...
14:14 grawity it's very common to omit ?> in files containing only code
14:14 grawity because otherwise you can accidentally add newlines or spaces after it
14:14 stash_ joined #git
14:15 ash_workz Vampire0: ^ that can break some require/include implemenatations, iirc
14:15 grawity it doesn't break require/include itself, but it can screw up the final page output
14:15 Vampire0 I see
14:15 ash_workz ah
14:16 grawity like, when you try to load a library using require(), you expect it to only load code and nothing else
14:17 grawity if it also accidentally outputs some text (even spaces), that'll cause problems with header(), and can corrupt the actual file your page is outputting
14:17 ash_workz thanks for checking... I wasn't getting traction in #github
14:17 Vampire0 In gist creation it highlights correctly. gist display is also wrong
14:17 dglambert joined #git
14:18 ash_workz yeah, but it doesn't seem to be a problem across the board
14:19 sevenever joined #git
14:19 ash_workz I think
14:19 ash_workz (reloading)
14:19 ash_workz my connection seems to be really slow
14:19 ash_workz okay
14:19 ash_workz https://github.com/PuristPHP/purist/blob/rework/web/index.php
14:19 ash_workz looks fine there
14:21 stash_ Hey. I'm looking for videos from git merge 2017 which was in Brussels. I've found some videos (like this one https://www.youtube.com/watch?v=g_MPGU_m01s&amp;t=996s) but not other talks. Are they going to be available?
14:25 lipsumar joined #git
14:25 letranger joined #git
14:25 jnewt joined #git
14:25 jim joined #git
14:26 durham joined #git
14:27 TheSimonator joined #git
14:27 ronny left #git
14:29 jim hi... I have a dir (which is the working dir of a repo) and it has a dir in it that I wish to factor out into its own repo, and then bring it back into the code in the form of a subdir repo or submodule repo... can I do this with affecting content? and would the new repo have the complete history of the dir?
14:30 grawity Git has tools to rewrite the history – clone the repo, use `git filter-branch --subdirectory-filter=...` in the new clone
14:30 cbreak jim: if you want, you can keep the history, but it will have a different form
14:31 aax joined #git
14:31 avar stash_: judging from the upload date they're still uploading it actively
14:31 avar stash_: see https://www.youtube.com/user/github/videos
14:31 jim how would you characterize this different form?
14:32 jim cbreak ^^
14:32 cbreak as grawity said, it'd involve history rewriting
14:32 stash_ avar: oh, ok, I just need to wait. Thanks
14:32 cbreak see the man page for a description on how subdirectory-filter works
14:32 sevenever joined #git
14:32 stepho joined #git
14:33 avar stash_: did you go to the conference?
14:33 jim where was it?
14:33 rkazak joined #git
14:33 avar this time in brussels, belgium
14:33 avar they're alternating between the US & EU
14:33 stash_ avar: nope, that's why I wanted to see the videos
14:33 jim ahh
14:34 avar "Scaling Mercurial at Facebook: Insights from the Other Side" was really interesting
14:35 ok91 joined #git
14:36 mar77i_ joined #git
14:38 dreiss joined #git
14:38 stash_ avar: yeap, that's exactly what I'm interested in :)
14:39 zivester joined #git
14:40 marianina8 joined #git
14:41 Es0teric joined #git
14:41 kelvah joined #git
14:43 avar privmsg'd you a cut from an email exchange I had with him which shows what stuff on https://bitbucket.org/facebook/hg-experimental he talked about
14:44 avar mm, not like there's active discussion here I'm interrupting
14:44 avar -cut-
14:44 avar For a topic list, I talked about:
14:44 avar Scale:
14:44 avar - Pushrebase – server side rebasing during push
14:44 avar - Remotefilelog – on-demand downloading of file contents to the store
14:44 avar - Infinitepush – redirecting certain pushes to be stored as bundles in a scalable blob store; and the ability to automatically push client commits to this store
14:44 avar UX:
14:44 avar - Smartlog – better default log UI that skips uninteresting commits
14:44 avar - Absorb – automatic detection and amending of pending changes into a stack of commits
14:44 avar - Sparse profiles – versions sparse configs that automatically apply as users move around the repo
14:45 avar - ScmQuery – a Thrift service for answering source control questions
14:45 ResidentBiscuit joined #git
14:45 avar All of them except ScmQuery are available here: https://bitbucket.org/facebook/hg-experimental
14:45 avar -cut-
14:45 avar all very interesting stuff
14:45 clickys joined #git
14:45 gitinfo avar: Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
14:45 avar The absorb command would be a great interactive rebase addition..
14:46 clickys Hello i will need your help if its possible, i clone my git repo from github to my laptop . And i made couple of changes on a branch , but it wont let me commit my changes . Its asking me to create user.name and user.mail , i did it and i still get the same error
14:46 avar how did you create user.name & user.email ?
14:47 clickys $ git config --global user.name
14:47 gareppa joined #git
14:47 Vampire0 clickys, you didn't set a value, that is not helpful
14:47 mizu_no_oto joined #git
14:47 clickys i did set
14:47 clickys $ git config --global user.name "clickys"
14:48 Vampire0 aah, ok
14:48 clickys git config --global user.mail "mymail"
14:48 avar does 'git config user.name' & user.email return those values back to you?
14:49 clickys no
14:49 clickys mnaybe i did something wrong with git remote ?
14:50 Vampire0 clickys, this has nothing to do with the remote, it is a purely local problem
14:50 spark` joined #git
14:50 clickys i did use this git checkout -b new-dev origin/new-dev
14:50 clickys because when i clone my master branch i couldnt checkout to my working branch
14:50 Vampire0 clickys, can you show the output of `git config -l`?
14:51 clickys yes one sec pols
14:52 clickys https://gist.github.com/Clickys/ad37f94c31cd2ecb631f1e30f8c8494a
14:53 Vampire0 clickys, and `git config user.name` does *not* return "clickys"? o_O
14:53 clickys yes it does now
14:54 Vampire0 clickys, now or not?
14:54 clickys but still wont let me commit
14:54 clickys it does return clickys
14:54 Vampire0 clickys, it lets you commit, it just tells you that some generated defaults are used
14:54 Vampire0 clickys, how do you commit? !repro
14:54 gitinfo clickys: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
14:56 ertes joined #git
14:56 TheSimonator joined #git
14:56 clickys https://gist.github.com/Clickys/ad37f94c31cd2ecb631f1e30f8c8494a
14:58 seveneve3 joined #git
14:58 Vampire0 ah, ok, it actually really doesn't commit as it cannot make up an email address, never seen *that* before
14:58 tnecniv joined #git
14:58 clickys maybe its because i first clone the repo
14:58 * RichiH neithe
14:58 RichiH r
14:58 clickys did my changes
14:58 clickys add the changes and then created the user?
14:58 Vampire0 clickys, what about `GIT_TRACE=1 git commit -m "Calendar Works"`?
14:59 RichiH clickys: no, it's because you need to configure an email address
14:59 watabou joined #git
14:59 Vampire0 clickys, no, that would be fine
14:59 Vampire0 RichiH, he did interestingly, we saw the git config -l output
14:59 RichiH huh
14:59 * RichiH shuts up and grabs some popcorn
14:59 RichiH carry on, folks
14:59 notebox joined #git
15:00 Vampire0 clickjack, I know it will also not work, but I want to see the output
15:00 kurkale61 joined #git
15:00 clickys ?
15:00 a3Dman joined #git
15:00 clickys git checkout remotes/origin/new-dev
15:00 clickys maybe this is wrong ?
15:01 d10n-work joined #git
15:01 _ikke_ yes
15:01 sbulage joined #git
15:01 _ikke_ You do not want to directly checkout remote tracking branches
15:01 clickys how do i fix this now ?
15:01 Vampire0 clickys, what you have cloned or checked out has nothing to do with your problem
15:02 _ikke_ git checkout HEAD@{1}
15:02 Vampire0 clickys, even if you are on a detached head, the commit should see your identity
15:02 Vampire0 clickys, what about the command i gave you?
15:02 clickys which Vampire0 ?
15:02 Vampire0 [16:59:00] <Vampire0> clickys, what about `GIT_TRACE=1 git commit -m "Calendar Works"`?
15:03 TomyLobo2 joined #git
15:03 seveneve1 joined #git
15:03 Vampire0 _ikke_, he checked out a local branch from the remote. He gave that command here before and the transcript also looks like that
15:04 clickys $ `GIT_TRACE=1 git commit -m "Calendar Works"` 08:03:55.489654 git.c:371               trace: built-in: git 'commit' '-m' 'Calendar Works'  *** Please tell me who you are.
15:05 Vampire0 clickys, ah, blind, now I see it
15:05 Vampire0 clickjack, you configured user.mail instead of user.email
15:06 Vampire0 clickys,  of course, not clickjack
15:06 clickys omg
15:06 clickys iam so stupid
15:07 clickjack somebody called?
15:07 Vampire0 clickjack, nope, wrong tab completion, sorry
15:07 clickys Vampire thank you so much, i have one question for u . In my main workstation i created the repo push it to github, with two branches , the master and the new-dev. Now iam on my laptop and when i tried to clone my repo from github, the new-dev branch didnt exist .. Do you know why ?
15:07 Vampire0 clickys, !where
15:08 gitinfo clickys: [!wherearemybranches] Git clones all branches, but initially makes only the main branch (usually 'master') available as a normal local branch. To work on another branch, simply 'git checkout <branch>' (or, in versions older than 1.6.6, git checkout -b <branch> origin/<branch>). This works even if the branch doesn't show up in the normal list of branches. For technical details, see !rtb
15:08 clickjack no worries :)
15:08 seveneve1 joined #git
15:08 clickys i was doint git branch it was showing only the master
15:08 clickys i should have used the git checkout -b branchname origin/branchname ?
15:09 Vampire0 clickys, `git branch -a`
15:09 peterbecich joined #git
15:09 clickys it was showing the master and remotes/origin/head / master / newDev
15:10 Vampire0 clickys, you read the trigger I sent, didn't you?
15:10 clickys yeah  , and i asked you in that situation when the branch is not vissible i should have used the git checkout -b branchname origin/branchname
15:11 Vampire0 clickys, ah, ok. You could simply do `git checkout branchname` and it will automatically create the local branch tracking the remote branch if there is no local branch or tag with that name already
15:11 clickys ty so much vampire
15:11 Vampire0 clickys, but doing it explicitly with `git checkout -b branch origin/branch` is also fine
15:11 Vampire0 clickys, yw
15:12 bronson joined #git
15:14 clickys to push my changes on github it should go git push origin new-dev  ?
15:15 madewokherd joined #git
15:15 Vampire0 clickys, if your local branch has the remote branch set as upstream, `git push` is enough
15:15 Blendify|afk left #git
15:16 clickys oki sir
15:16 clickys <- noob
15:16 seveneve2 joined #git
15:16 Vampire0 clickys, no problem
15:16 Vampire0 clickys, we all were
15:17 Cabanossi joined #git
15:18 royal_screwup21 joined #git
15:19 dsdeiz joined #git
15:19 dsdeiz joined #git
15:21 dreiss joined #git
15:22 ozcanesen joined #git
15:22 kegster joined #git
15:23 elect joined #git
15:24 circ-user-zNiD2 joined #git
15:24 borkr joined #git
15:30 borkr joined #git
15:30 brent__ joined #git
15:30 borkr joined #git
15:31 jagobdue joined #git
15:32 gaucheph joined #git
15:32 gugah_ joined #git
15:32 brent__ joined #git
15:33 dsdeiz_ joined #git
15:33 mattcen joined #git
15:33 sturner joined #git
15:35 theskillwithin blah I do git stash and it doesn't stash all the things!
15:37 onehrxn_ joined #git
15:37 _ikke_ git stash does not stash untracked files by default
15:37 Vampire0 but you can tell it to do so
15:38 synthroid joined #git
15:38 theskillwithin Vampire0 how?
15:39 Vampire0 theskillwithin, man git stash
15:39 gitinfo theskillwithin: the git-stash manpage is available at https://gitirc.eu/git-stash.html
15:39 theskillwithin thats what i have been looking at =X
15:39 Vampire0 theskillwithin, -u I think
15:39 Vampire0 theskillwithin, or --include-untracked in long
15:40 theskillwithin :boom: thank you!
15:40 Vampire0 theskillwithin, yw
15:40 gitinfo theskillwithin: 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", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
15:41 theskillwithin Vampire0 thx
15:42 neunon joined #git
15:42 dreiss joined #git
15:44 bilal joined #git
15:45 Snugglebash joined #git
15:45 rkazak joined #git
15:46 HoierM joined #git
15:47 jstimm joined #git
15:47 HoierM joined #git
15:48 HoierM joined #git
15:49 bilal joined #git
15:49 HoierM joined #git
15:49 Nilesh_ joined #git
15:50 HoierM joined #git
15:51 HoierM joined #git
15:52 HoierM joined #git
15:53 HoierM joined #git
15:54 HoierM joined #git
15:56 HoierM joined #git
15:56 warfront1 joined #git
15:56 HoierM joined #git
15:57 onehrxn joined #git
15:57 warfront1 How would i add a log file formatted like this to my gitignore mylogs.log.2017-05-03
15:57 borkr joined #git
15:57 HoierM joined #git
15:58 ShapeShifter499 joined #git
15:58 Vampire0 warfront1, `mylogs.log.*`?
15:58 gaucheph joined #git
15:58 Vampire0 warfront1, or `mylogs.log.*-*-*`?
15:58 HoierM joined #git
15:59 Vampire0 warfront1, maybe adding a specific directory where it can occur like for the root directory `/mylogs.log.*-*-*`
15:59 HoierM joined #git
15:59 watabou joined #git
16:00 thiago joined #git
16:00 Stumbler_ joined #git
16:00 durham joined #git
16:01 HoierM joined #git
16:01 CarlFK left #git
16:01 mel00010 joined #git
16:02 warfront1 mylogs.log.*-*-* worked
16:02 HoierM joined #git
16:03 HoierM joined #git
16:04 Starky joined #git
16:04 Vampire0 warfront1, sure, it will exclude those files no matter where they occur
16:04 warfront1 Exactly what I wanted, thanks!
16:04 HoierM joined #git
16:04 zturner joined #git
16:04 Snugglebash joined #git
16:05 warfront1 For some reason mylogs.log.* was not working
16:05 warfront1 But the second one you provided worked
16:05 HoierM joined #git
16:06 HoierM joined #git
16:07 qqx joined #git
16:07 Starky joined #git
16:07 Vampire0 couldn't be, but well, gone with the wind. !next
16:07 gitinfo Another satisfied customer. NEXT!
16:08 Shock_ joined #git
16:08 HoierM joined #git
16:09 Gustavo6046 joined #git
16:10 HoierM joined #git
16:10 Starky joined #git
16:10 Starky joined #git
16:11 HoierM joined #git
16:11 robotroll joined #git
16:11 HoierM joined #git
16:12 HoierM joined #git
16:13 boombatower joined #git
16:17 justin2 joined #git
16:19 fenikso joined #git
16:22 nitric joined #git
16:22 jozwior joined #git
16:22 nanga joined #git
16:22 nanga joined #git
16:23 fenikso joined #git
16:23 jay-m joined #git
16:23 gnixev joined #git
16:27 synthroi_ joined #git
16:28 tarkus joined #git
16:29 prg3 joined #git
16:30 skered joined #git
16:32 mattcen joined #git
16:34 Introoter joined #git
16:34 Snugglebash joined #git
16:34 TomyLobo2 joined #git
16:35 svm_invictvs joined #git
16:37 royal_screwup21 joined #git
16:38 King_Hual joined #git
16:38 King_Hual joined #git
16:40 barbos joined #git
16:41 jstimm joined #git
16:42 prg3 joined #git
16:46 Murii joined #git
16:47 dsdeiz joined #git
16:48 YuGiOhJCJ joined #git
16:51 MineCoins joined #git
16:52 durham joined #git
16:57 gopar joined #git
16:59 TheMontyChrist joined #git
16:59 aboccia_ joined #git
16:59 TheMontyChrist joined #git
16:59 TheMontyChrist joined #git
16:59 TheMontyChrist test
17:00 TheMontyChrist suppose I branch something.  I add another project that's for debug.  however,  change code in the "main" project
17:00 TheMontyChrist how do I merge in all the changes except my test project?
17:03 GT4066 joined #git
17:03 SteffanW joined #git
17:03 mda1 joined #git
17:04 durham_ joined #git
17:04 overlord_tm joined #git
17:06 zzz joined #git
17:06 TheSimonator joined #git
17:09 Vampire0 TheMontyChrist, could you rephrase the question? What do you call a project?
17:10 rkazak joined #git
17:11 zturner joined #git
17:14 TheMontyChrist main->project one
17:14 TheMontyChrist mybranch(branch of main)->project one, project two
17:14 TheMontyChrist I make a few hacks to project one, but I added project 2 for debug
17:14 mostlybadfly joined #git
17:14 TheMontyChrist I want to merge only those changes in project 1 back into "main"
17:15 TheMontyChrist ugly hack is to remove project 2 commit merge, and put project 2 back
17:15 NeverDie joined #git
17:15 TheMontyChrist each project is it's own directory
17:16 TheMontyChrist probably not possible
17:16 Vampire0 TheMontyChrist, you cannot merge only parts of the repository files
17:16 TheMontyChrist I didn't think so either.
17:17 TheMontyChrist but I had to ask
17:17 osse i would rewrite my branch to leave out the debug thingy before merging
17:17 Vampire0 TheMontyChrist, you probably shouldn't have added project 2 to that repo actually, but use some of !subrepo
17:17 gitinfo TheMontyChrist: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
17:17 osse or maybe not commit the debug stuff at all
17:17 durham joined #git
17:18 circ-user-zNiD2_ joined #git
17:19 iamashishkebab2 joined #git
17:19 o11c TheMontyChrist: cherry pick?
17:20 sbasso joined #git
17:20 mizu_no_oto joined #git
17:22 miczac joined #git
17:24 User458764 joined #git
17:24 matoro joined #git
17:25 Gloomy joined #git
17:25 texasmynsted How do you normally handle a situation where there is public branch, say foo on origin, you branch off of that, then later people rebase and force push their rebased commits onto origin/foo?
17:26 osse texasmynsted: you mean they force-push so that origin/foo is changed?
17:26 texasmynsted correct
17:26 texasmynsted assuming I can not "prevent" them from doing this
17:26 perlpilot complain to those people about their anti-social behavior
17:26 osse texasmynsted: if you're lucky 'git rebase origin/foo' will Just Work, because the changes are minor and git can detect duplicates etc.
17:27 texasmynsted changing their behavior is a more long term solution
17:27 texasmynsted so if the hash is different but the content matches it is assumed the same or something?
17:27 osse texasmynsted: if you're not so lucky, you can do this after fetching:  git rebase --onto=origin/foo origin/foo@{1}, ie. rebasing the commits as if origin/foo wasn't changed, but put those commits on top of the new origin/foo
17:28 TomyLobo joined #git
17:28 osse man git-rebase also has a section called "RECOVERING FROM UPSTREAM REBASE"
17:28 gitinfo the git-rebase manpage is available at https://gitirc.eu/git-rebase.html
17:28 hashpuppy joined #git
17:29 nixjdm joined #git
17:31 telephone joined #git
17:31 telephone joined #git
17:31 Cabanossi joined #git
17:32 foo joined #git
17:33 iamashishkebab2 joined #git
17:34 MDA2 joined #git
17:34 TheSimon_ joined #git
17:35 bilal joined #git
17:35 gopar joined #git
17:37 PettanShoutaKun_ joined #git
17:37 jetole joined #git
17:37 PettanShoutaKun_ git tag -a  -m 'Auto-Tagged  by Jenkins CI' .... fatal: too many params
17:38 PettanShoutaKun_ why :\
17:38 PettanShoutaKun_ is there some issue with the '  ?
17:39 xall_ joined #git
17:40 bronson joined #git
17:41 jetole joined #git
17:41 jetole Hey guys. I committed a file and have no remote. I accidentally just deleted that file. It exists in a .git. Right? And I can restore it?
17:41 gopar joined #git
17:42 maroloccio joined #git
17:42 rwp jetole, git checkout filename
17:42 rwp jetole, "git status" should give you a hint in the information around the data saying how to undo the changes that it is detecting.
17:43 jetole It says nothing to commit, working directory clean
17:43 osse PettanShoutaKun_: is that the *exact* command ?
17:43 jetole error: pathspec 'config.js' did not match any file(s) known to git.
17:44 texasmynsted wow I had not seen that in the docs before
17:44 texasmynsted thank you
17:44 jetole nvm. I checked the wrong file into the repo
17:44 jetole Thanks rwp
17:44 dreiss joined #git
17:46 qpdb joined #git
17:47 clickys joined #git
17:47 rwp Glad to hear it worked out. :-)
17:48 clickys Hello guys, i recently updated a branch and push it to my github project from my laptop . And now i want to retrieve the changes of that branch to my main workstation . I should use git fetch <remote-name> ?
17:48 mikecmpbll joined #git
17:48 PettanShoutaKun_ yes.
17:48 PettanShoutaKun_ although technically it's being punched in by a gradle script
17:48 grover joined #git
17:49 rwp clickys, Yes. Or use one of "git pull <remote-name>" to have it fetch and merge. Or "git pull --rebase <remote-name>" to have it fetch and rebase. Depending upon your work flow.
17:49 synthroid joined #git
17:50 salamanderrake joined #git
17:50 clickys it will pull the master branch as well ?
17:52 clickys i just want to pull a certain branch
17:52 misosoup joined #git
17:52 clickys not all branches
17:55 relipse joined #git
17:55 gopar joined #git
17:55 mikecmpbll joined #git
17:55 o11c clickys: as a rule, you should always fetch (not pull) all enabled branches
17:56 o11c pull is just fetch + merge
17:56 o11c only the active branch can be merged
17:56 clickys git pull origin <branch name >  ?
17:56 dsdeiz joined #git
17:56 dsdeiz joined #git
17:56 davimore joined #git
17:57 cdg joined #git
17:58 o11c clickys: that *exists*, but it's not necessary to use it
17:59 durham_ joined #git
18:01 MineCoins joined #git
18:02 Sasazuka joined #git
18:02 Es0teric joined #git
18:02 Es0teric how do i undo a commit but keep the changes?
18:02 _ikke_ git reset HEAD~
18:02 dhollinger joined #git
18:03 Es0teric _ikke_ git reset HEAD~?
18:03 _ikke_ git reset HEAD~
18:03 _ikke_ It resets the branch back one commit, but keeps the changes, just what you want
18:03 acetakwas joined #git
18:04 Es0teric perfect
18:04 Es0teric thanks!
18:05 gopar joined #git
18:06 synthroi_ joined #git
18:08 cads joined #git
18:09 Agjz joined #git
18:11 mquin joined #git
18:13 sturner joined #git
18:14 gopar joined #git
18:14 Ryanar joined #git
18:15 ahrs joined #git
18:18 tarkus joined #git
18:18 ClassyGrrrl joined #git
18:18 User458764 joined #git
18:19 a3Dman joined #git
18:19 mizu_no_oto joined #git
18:20 livingstn joined #git
18:20 bronson joined #git
18:22 peterbecich joined #git
18:24 Gurkenglas What tutorial will teach me to use a shell such as the one emacs provides to, given the name of a github project and an idea for changes to make to it, make a pull request to make them happen? (I'm on Windows and not good with all this terminal stuff.)
18:24 Hashtag joined #git
18:25 Hashtag Can someone help me with the error "fatal: Not possible to fast-forward, aborting."?
18:26 Hashtag I have sagemath installed and I'm just trying to upgrade it.
18:26 Gurkenglas Ideally, it'd involve a flowchart with the straightest path listing the commands to put into the shell and lots of offshoots telling what to do if something-or-another doesn't go as planned.
18:26 UTAN_dev joined #git
18:27 nascentmind joined #git
18:27 gopar joined #git
18:28 dilijev joined #git
18:30 nascentmind Hi. I have a master. I have a branch b1 based off master where I have some commits. I have another branch b2 off b1 where I again have some commits. I do  -> git checkout b2; git rebase b1; I get a Current branch b2 is up to date. What am I doing wrong?
18:30 dsdeiz joined #git
18:30 dsdeiz joined #git
18:31 Es0teric joined #git
18:31 foo joined #git
18:31 cagomez joined #git
18:31 _ikke_ nascentmind: b1 is an ancestor of b2
18:31 Cabanossi joined #git
18:32 _ikke_ What do you want to achieve?
18:32 Hashtag It seems to be working after I checked out the develop branch...
18:34 MineCoins joined #git
18:34 nascentmind I want add my changes from b2 to b1.
18:34 nascentmind _ikke_, I want to add my changes from b2 to b1.
18:35 gnixev joined #git
18:35 synthroid joined #git
18:35 nascentmind _ikke_, I create a branch b2 off b1 to experiment something. If it works out I want to add the changes of branch b2 to b1 and delete b2.
18:36 _ikke_ then merge it
18:36 _ikke_ (it will result in a fast-forward merge)
18:36 avar joined #git
18:36 avar joined #git
18:36 a3Dman joined #git
18:36 _ADN_ joined #git
18:37 nascentmind _ikke_, merge after I finish rebase, correct?
18:38 _ikke_ nascentmind: There is nothing to rebase
18:38 raijin joined #git
18:38 _ikke_ nascentmind: the branch is already on that base if you follow me
18:38 nascentmind _ikke_, I have commits in b2 and b1.
18:39 Sound joined #git
18:40 nascentmind _ikke_, ah.. yes. Got it.
18:40 manuelschneid3r joined #git
18:41 durham joined #git
18:41 TomyLobo joined #git
18:42 nixjdm joined #git
18:43 Doginal joined #git
18:43 cha1800 joined #git
18:43 faisal joined #git
18:44 zeroed joined #git
18:44 zeroed joined #git
18:44 faisal left #git
18:45 nascentmind _ikke_, If I have changes in both b1 and b2 then rebase should be the right approach?
18:45 kexmex joined #git
18:45 nascentmind _ikke_, changes/commits
18:45 ClassyGrrrl left #git
18:46 _ikke_ Well, a rebase never adds changes to another branch, it just moves the rebase branch
18:46 _ikke_ nascentmind: so you will have to always merge
18:46 rebrec joined #git
18:47 nascentmind _ikke_, Yes I understand merge after that but a rebase before a merge is compulsory, correct?
18:47 _ikke_ no
18:48 _ikke_ it's optional
18:48 imack joined #git
18:48 regedit joined #git
18:49 shgysk8zer0 joined #git
18:52 Soni how well does git work for BSON instead of JSON?
18:52 _ikke_ will, I guess it does not diff well
18:52 _ikke_ so merging etc is going to be hard
18:52 _ikke_ but for the rest it should not be a problem
18:52 Soni (I'd think it works about the same, even if BSON is binary, since BSON is uncompressed)
18:53 shubhnik joined #git
18:53 yohnnyjoe joined #git
18:54 Soni _ikke_: I mean does the delta compression work?
18:55 planigan joined #git
18:56 finalbeta joined #git
18:56 _ikke_ I would expect so
18:56 _ikke_ delta-compression does not care if data is binary or not
18:57 gnixev joined #git
18:57 grover left #git
18:57 D630 joined #git
18:58 TheSimonator joined #git
18:59 Sound_ joined #git
19:00 User458764 joined #git
19:00 PaulCapestany joined #git
19:01 Cabanossi joined #git
19:03 ijafidnsfod joined #git
19:03 kexmex joined #git
19:04 MattMaker joined #git
19:05 tyreld joined #git
19:05 ash_workz fyi: github pushed a fix for the syntax highlighting issue
19:08 Acerific joined #git
19:10 _ikke_ what issue?
19:12 Soni _ikke_: do Z-order curves delta compress better than linear and/or interlaced (uncompressed) images?
19:12 LeBlaaanc joined #git
19:12 _ikke_ Soni: I don't know that much about it
19:15 Es0teric joined #git
19:15 finalbeta joined #git
19:17 Oatmeal joined #git
19:17 Es0teric joined #git
19:18 synthroi_ joined #git
19:21 bilal_ joined #git
19:24 zeroed joined #git
19:25 fission6 joined #git
19:25 fission6 i have a merge conflict, on one file specifically i want to ignore all the conflicts and just take from master (i am doing a git merge master) into a feature branch
19:25 fission6 how do i do that?
19:25 grawity git checkout --theirs myfile
19:27 fission6 grawity: you the man!
19:29 TomyLobo joined #git
19:32 Cabanossi joined #git
19:36 sparr joined #git
19:37 cyphase joined #git
19:38 raynold joined #git
19:41 fission6 how do i compare my local master to upstream, i want to do a diff, something is off
19:41 nixjdm joined #git
19:41 oprypin fission6, git fetch;  git diff origin/master
19:42 chipotle joined #git
19:42 Dougie187 joined #git
19:42 Random832 joined #git
19:43 _rgn joined #git
19:43 fission6 that is making everything appear different?
19:44 m4sk1n joined #git
19:45 romank joined #git
19:46 royal_screwup21 joined #git
19:46 dsdeiz joined #git
19:46 dsdeiz joined #git
19:47 grawity means it's in fact different
19:47 grawity maybe it differs in line endings (CRLF vs LF)
19:49 h12o joined #git
19:50 iamashishkebab2 joined #git
19:52 satifant joined #git
19:52 cagomez joined #git
19:54 hobodave joined #git
19:57 Sound joined #git
19:57 jen_ joined #git
19:57 jen_ The working tree i am working with is clean and fully synced to the remote. I want to test an older commit but after that, I want to come back to the current state. How do I safely do this?
19:58 Seveas jen_: crossposting is considered bad form :)
19:58 TheSimonator joined #git
19:58 oprypin git checkout a1b2c3d;  do stuff;  git checkout branch
20:00 jen_ Seveas: didn’t even realize there was a #git!
20:00 jen_ ok sorry
20:00 tnecniv joined #git
20:02 manuelschneid3r joined #git
20:03 Bennux joined #git
20:03 hobodave_ joined #git
20:05 ijafidnsfod joined #git
20:06 Tobbi joined #git
20:06 a3Dman joined #git
20:07 Guest50066 joined #git
20:11 _noblegas joined #git
20:14 plicki_ joined #git
20:14 romank joined #git
20:16 ok91 joined #git
20:16 Starky joined #git
20:17 romank joined #git
20:18 cdown joined #git
20:18 aielima joined #git
20:18 chrisgeorge joined #git
20:18 stoopkid joined #git
20:18 otisZart joined #git
20:18 otisZart is there a way to know which github repo was a project downloaded from, if it doesnt contain readme/license?
20:19 otisZart so to get the original repo
20:19 o11c otisZart: git remote
20:19 grawity -v
20:19 o11c oh right
20:20 otisZart o11c, and in the case git remove -v returns nothing?
20:21 o11c s/remove/remote/
20:21 otisZart ye, typo
20:21 o11c otisZart: then you didn't clone a git repo
20:21 dsdeiz joined #git
20:21 otisZart o11c what if a user deleted the remote and removed readme/license and used it itself?
20:22 grawity then you resort to googling
20:22 otisZart so there's no actual way to know
20:22 otisZart :/
20:22 sitaram joined #git
20:22 sitaram joined #git
20:23 grawity well it's just a bunch of files, there are no other magic ties to the original repo
20:23 grawity I would suggest Github's own search but it's a bit awful
20:23 otisZart ok I was curious about this case
20:23 synthroid joined #git
20:26 lipsumar joined #git
20:27 Sound_ joined #git
20:29 Vampire0 otisZart if the Readme was removed with a commit, you can simply look at the file in a previous commit
20:30 peterbecich joined #git
20:30 cagomez joined #git
20:32 Cabanossi joined #git
20:35 zeroed joined #git
20:35 zeroed joined #git
20:36 ngf joined #git
20:36 bronson joined #git
20:39 misosoup joined #git
20:40 duderonomy joined #git
20:41 nixjdm joined #git
20:47 Sasazuka joined #git
20:50 iamasamosa joined #git
20:51 Es0teric joined #git
20:51 iamashishkebab2 joined #git
20:51 royal_screwup21 joined #git
20:52 yqt joined #git
20:53 TbobbyZ joined #git
20:53 osse otisZart: There's a limit to however many "what if"s a git reoo can endure :P
20:54 iamasamosa joined #git
20:54 rkazak joined #git
20:56 raijin joined #git
20:56 dsdeiz joined #git
20:56 dsdeiz joined #git
20:59 m0viefreak joined #git
21:00 TikityTik joined #git
21:02 _ikke_ WHat's the upperbound?
21:02 livingstn joined #git
21:03 Seveas 3758914
21:03 p14nd4 joined #git
21:05 zzz joined #git
21:06 p14nd4 i have branch br1 that i've merged into master (git checkout master; git merge br1), but br1 HEAD still points to the last commit before the merge. how do i make br1 HEAD point to the same commit as master HEAD?
21:07 grawity that's normal
21:08 grawity you can merge master back into br1, but why
21:08 Seveas merge master into it (which would be a fast-frward merge). But that doesn't really do you any good. Why would you want the branch to point there?
21:10 p14nd4 because i want people tracking br1 to stop being diverged from master (since i can't force those people to just checkout master)
21:10 rwp But then you would need to merge back into br1 *each and every time* anything changes on master.
21:10 Seveas you've been able to force them to track a branch
21:13 p14nd4 rwp: supposing that my scenario can happen, where HEAD of br1 and master are literally the same commit, then presumably with some care, if someone commits to br1, and then someone later commits to master, the latter person could rebase on top of br1's commits to keep br1 and master united instead of diverged in the log
21:14 rwp p14nd4, Nope. ls -l .git/refs/heads/ and see that those branches are all separate files.
21:15 askb joined #git
21:15 grawity that has nothing to do with refs
21:15 grawity yes, you could rebase the feature branch like that
21:16 grawity annoys the users even more than merging master repeatedly, though
21:16 p14nd4 rwp: in that case, what's to stop me from just modifying the hash in br1 to be the same as master?
21:16 rwp Nothing stops you from doing that.
21:16 qqx p14nd4: That's what a fast-forward merge would do.
21:16 o11c p14nd4: better just delete the branch
21:17 o11c that way, they'll get a nasty message
21:18 Arokh joined #git
21:18 rwp I didn't see any mention of rebase here grawity. I certainly didn't suggest it. I just pointed out why tracking br1 doesn't track master even if they happen to point to the same commit.
21:20 tnecniv joined #git
21:21 nevodka joined #git
21:21 Levex joined #git
21:22 p14nd4 i think that git checkout br1; git merge --ff-only master ; git push gives me what i want
21:23 p14nd4 doesn't appear to actually create a new commit, just updates the HEAD ref of br1 to point to master HEAD
21:23 rwp That will sync br1 up with master at this moment. But the next commit to master will not appear on br1.
21:24 p14nd4 but after such a master commit, couldn't i do the same thing again?
21:25 Snugglebash joined #git
21:26 HoierM joined #git
21:26 rwp Yes. You would need to do that *each and every time*. Is that what you want?
21:27 HoierM joined #git
21:27 rwp If so then I am not going to talk you out of it. That's not my place in the scheme of things.
21:27 Gurkenglas joined #git
21:28 p14nd4 doesn't sound so bad :)
21:28 p14nd4 i worry a little bit that i'm the guy asking whether it's better to use a shoe or glass bottle to pound in a nail
21:29 iamashishkebab2 joined #git
21:29 justin2 joined #git
21:29 p14nd4 ( https://weblogs.asp.net/alex_papadimoulis/408925 , if you're not familiar with the reference)
21:29 Gurkenglas What tutorial will teach me to use a shell such as the one emacs provides to, given the name of a github project and an idea for changes to make to it, make a pull request to make them happen? (I'm on Windows and not good with all this terminal stuff.) Ideally, it'd involve a flowchart with the straightest path listing the commands to put into the shell and lots of offshoots telling what to do if something-or-another
21:29 Gurkenglas doesn't go as planned.
21:31 dsdeiz joined #git
21:31 dsdeiz joined #git
21:31 Klumben joined #git
21:32 kadoban joined #git
21:32 Cabanossi joined #git
21:32 iamashishkebab2 joined #git
21:36 p14nd4 Gurkenglas: https://try.github.io/levels/1/challenges/1 maybe?
21:37 Gurkenglas Looks good, thanks.
21:37 p14nd4 but google will be your friend
21:38 NeXTSUN joined #git
21:38 p14nd4 probably the 10,000th time this has been linked in here, but: https://xkcd.com/1597/
21:40 oprypin - how i feel about perforce
21:40 basiclaser joined #git
21:43 fqoh joined #git
21:44 Spacew00t joined #git
21:44 zedka joined #git
21:44 roar joined #git
21:45 roar joined #git
21:45 Dougie187 left #git
21:48 Spacew00t joined #git
21:49 Darren_ joined #git
21:50 Marumarsu joined #git
21:51 p14nd4 it's a pretty terrible situation, that i'm the one running git for my office and know very little about it, but it's vastly superior to what it was before i got here: windows folder shares, manual merges with WinDiff or something, and archiving a copy quarterly to another location ;_;
21:51 grumble joined #git
21:51 h12o joined #git
21:58 masuberu joined #git
22:00 a3Dman joined #git
22:00 jnewt joined #git
22:01 Cabanossi joined #git
22:02 lightstalker joined #git
22:05 dsdeiz joined #git
22:05 dsdeiz joined #git
22:07 thiago joined #git
22:09 roar joined #git
22:09 raspado joined #git
22:11 h12o joined #git
22:13 robattila256 joined #git
22:14 brent__ joined #git
22:23 Soni does git support "merge helpers" for binary files?
22:23 Soni say I have a binary format that supports merge metadata
22:24 Seveas yes, git supports that
22:24 Seveas see the 'Performing a three-way merge' section in man gitattributes
22:24 gitinfo the gitattributes manpage is available at https://gitirc.eu/gitattributes.html
22:26 Bucciarati joined #git
22:27 Soni cool
22:27 sythe joined #git
22:29 belak Is there a way to check out any files which were changed (and added to the index) into a separate directory?
22:30 belak I found git-checkout-index but I'm not sure how to do it into a different directory
22:30 oskarkv joined #git
22:30 o11c belak: pass a different worktree?
22:30 Seveas belak: that smells a bit !xy, what are you trying to achieve?
22:30 gitinfo belak: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
22:31 roelmonnens joined #git
22:31 belak Seveas: I'm trying to grab the staged version of all changed files so I can run linting on them without needing to run it on the whole repo.
22:32 belak If there's a better way to do this, I'm all ears
22:32 h12o joined #git
22:34 o11c belak: can your linter operate on stdin?
22:34 belak Uh, I'm not sure
22:34 o11c are you assuming the real working tree has unstaged modifications that you *don't* want to link?
22:35 belak Yes
22:35 belak And yes
22:36 Atm0spher1c joined #git
22:36 safe joined #git
22:37 Seveas belak: git checkout-index --prefix perhaps. Though ideally I'd mtry to find a command that spits it to stdout and then feed it to the linter that way
22:37 o11c belak: I usually use `git diff --name-only` for this kind of things
22:37 singlerider joined #git
22:37 * o11c doesn't remember which arguments to pass to get the difference between HEAD and index, etc
22:37 belak I mean, I'd need the full contents of the file for linting though
22:38 belak OH I see
22:38 belak Using diff to get the file names
22:38 o11c yeah, then whatever else to get the contents
22:39 belak alternatively, git diff --name-only | git checkout-index --stdin
22:39 belak With the proper options to git-diff
22:39 Seveas and --prefix to make it spit the files in a separate directory
22:40 belak Yep
22:40 belak Cool
22:40 dsdeiz joined #git
22:40 dsdeiz joined #git
22:42 cagomez joined #git
22:43 belak git diff --name-only --cached | git checkout-index --stdin --prefix=/tmp/belak-git-test/
22:43 belak Worked amazing
22:43 belak Thanks!
22:44 johnnyfive joined #git
22:44 singlerider Any clues about how to sign a commit with a hardware token  while dev
22:44 singlerider eloping in a VM?
22:46 Seveas singlerider: give the vm access to the usb port the token is on?
22:47 singlerider Is that a thing that's possible on an AWS box?
22:47 singlerider I could probably figure it out with VirtualBox, etc
22:48 gopar joined #git
22:49 o11c singlerider: sshfs from the physical machine?
22:50 Seveas sshfs for a usb device?
22:50 Seveas oh, I guess you mean mount the vm's filesystem via sshfs and sign locally
22:51 o11c I'd rather let the host access the vm than vice versa
22:51 singlerider I'll lok into sshfs
22:51 yohnnyjoe joined #git
22:51 singlerider I meant isgning on the VM where I'm VIM-ing a file :p
22:51 o11c I mean, the whole point of a VM is "no hardware"
22:52 madewokherd joined #git
22:52 o11c personally I don't see the point of signing individual commits though, just tgas
22:52 o11c you could always sign while rebasing though
22:52 singlerider That's a good point
22:52 h12o joined #git
22:52 singlerider I was just wondering about the viability
22:53 singlerider Thanks for the insight Seveas and o11c
22:53 Seveas you're welcome
22:55 _ADN_ joined #git
22:59 peterbecich joined #git
23:01 gopar joined #git
23:01 Cabanossi joined #git
23:03 zzz joined #git
23:04 Spacew00t joined #git
23:06 NeverDie joined #git
23:07 stepho joined #git
23:12 gaucheph joined #git
23:13 h12o joined #git
23:15 dsdeiz joined #git
23:15 dsdeiz joined #git
23:15 PaulCapestany joined #git
23:18 texasmynsted somebody linked a page about managing config files with git here… Anybody recall that?
23:19 NightMonkey joined #git
23:22 gopar joined #git
23:23 Vampire0 texasmynsted, !config?
23:23 gitinfo texasmynsted: [!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
23:23 royal_screwup21 joined #git
23:24 texasmynsted that is it.  Thank you
23:24 PaulCapestany joined #git
23:24 ajayk joined #git
23:28 cads joined #git
23:33 druonysus joined #git
23:33 h12o joined #git
23:33 Vampire0 texasmynsted, yw
23:33 gitinfo texasmynsted: 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", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
23:34 texasmynsted Thank you Vampire0
23:35 texasmynsted .karma Vampire0
23:35 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 35 (3 in past 30 days) (4 given out)
23:35 ijafidnsfod joined #git
23:35 telephone joined #git
23:35 telephone joined #git
23:36 zulutango joined #git
23:36 bremner .karma karma chameleon
23:36 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
23:36 NeverDie joined #git
23:37 cmyers joined #git
23:37 cmyers I came here just to tell you guys that --allow-unrelated-histories is complete clowntown.
23:37 cmyers and it is infuriating
23:38 bronson joined #git
23:38 cmyers I am writing a repo-merging tool and I have to figure out which version of git there is so I can figure out if I need to give the argument or not
23:38 cmyers old versions explode with it, new versions explode without it
23:38 cmyers completely insane.
23:38 Vivekananda joined #git
23:38 cmyers ". As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
23:39 cmyers who is driving this car anyways?
23:39 cmyers you might as well say "since we hate programmatic users of our tool, screw you."
23:40 o11c cmyers: shouldn't you be using lower-level commands?
23:40 preaction nobody here can do anything about it, so i hope typing that all out is at least cathartic
23:40 cmyers not if the higher-level command does what I want?  I mean, that's what I'm going ot have to do, if I don't wanbt to run "git merge --help" and grep for --allow-unrelated
23:40 cmyers it is very cathartic, thank you =)
23:40 preaction you should get a blog
23:41 zzz joined #git
23:41 Spacew00t joined #git
23:41 bremner twitter is all the rage for rage
23:41 ajayk joined #git
23:42 MattMaker joined #git
23:47 royal_screwup21 joined #git
23:47 Vampire0 cmyers, well, the porcellain commands are for human use and are _potentially_ unstable in how they work and what they return. The plumbing commands are made for scripted use and should be much more stable and scripted usable
23:48 watabou joined #git
23:49 sostenuto joined #git
23:49 dsdeiz joined #git
23:49 dsdeiz joined #git
23:50 cmyers figuring out what plumbing the merge command calls appears non-trivial
23:50 cmyers I see git merge-tree which outputs the sort of thing you could shove into the index...  it seems easier (though obviously less resiliant) to just grep the --help for the flag and call it "good enough for government work"
23:51 kexmex joined #git
23:51 cmyers I would have expected there was a higher-level plumbing command that is still lower than git merge but maybe there isn't, or maybe I'm just too impatient with the googling/code reading to find it
23:51 SCHAPiE joined #git
23:51 Eugene joined #git
23:52 Hurin joined #git
23:53 h12o joined #git
23:54 mel00010 joined #git
23:55 Gurkenglas When you make a patch to a large project and commit and notice a typo, what is the correct course of action? A second commit seems amateurish and nuking my fork and doing it again seems like I just dont know the right command
23:56 preaction Gurkenglas: git commit --amend; git push --force
23:58 o11c Gurkenglas: rewriting history is fine when you haven't submitted your changes yet
23:59 o11c in fact, often projects *require* you to rewrite history during code review

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