IRCloggy #git 2017-05-05

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2017-05-05

← JUSY left00:00
← Stumbler left00:01
← h12o left00:01
← otiose left00:05
→ bilal joined00:05
→ Stumbler joined00:05
← Starky left00:05
→ serialoverflow joined00:06
← m4sk1n left00:07
← ExeciN left00:07
→ Ardethian joined00:07
→ masuberu joined00:08
← publio left00:08
→ blocky joined00:08
← tyreld left00:08
← d^sh left00: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:08
but then i login through ssh and see that folder contains config description FETCH_HEAD etc00:09
Vampire0 blocky, !repro00: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 see00:09
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
← unbalancedparen left00:10
→ d^sh joined00:10
→ _Vi joined00:11
← Daviey_ left00:11
Vampire0 jnewt, that is not like instructed00:14
jnewt, read the instruction again00:14
← bilal left00:14
← mel00010 left00:14
→ ExeciN joined00:15
blocky Vampire0: https://paste.linux.community/view/65dc91d000:15
→ bilal joined00: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 it00:16
→ mel00010 joined00:17
→ h12o joined00:17
← ssmall left00:17
← miczac left00:20
← nidr0x left00:23
Vampire0 blocky, ssh into the machine, go into the git dir and try git status there, what does it say?00:24
← bilal left00:24
← h12o left00:24
← cagomez left00:24
→ roelmonnens joined00:24
← eb0t left00:24
PettanShoutaKun_ what is the best to reverse a commit you made on master?00:25
→ bilal joined00:25
PettanShoutaKun_ the way that is the least painful for everyone?00:25
→ nidr0x joined00: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 this00:25
PettanShoutaKun_, man git revert00:25
gitinfo PettanShoutaKun_: the git-revert manpage is available at https://gitirc.eu/git-revert.html00:25
Vampire0 PettanShoutaKun_, if you did not push it yet, you can also eradicate it from the history00:26
PettanShoutaKun_ it's pushed00:26
Vampire0 PettanShoutaKun_, if you already pushed and you eradicate it from history, you will suffer from !rewrite00: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/waqum00:26
→ fstd_ joined00:26
← netj left00:27
→ netj joined00:27
← bronson left00:27
PettanShoutaKun_ wait can I not use git revert without rewritting history?00:28
also the commit is a merge commit from a pull requests00:28
*pull request00:28
blocky Vampire0: git status says: fatal: This operation must be run in a work tree00:29
← roelmonnens left00:29
← bilal left00:29
← Cabanossi left00:29
→ bilal joined00:29
phase2 → abc00:30
← fstd left00:30
fstd_ → fstd00:30
abc → abcd00:30
abcd → abcde00:30
abcde → abcdef00:30
abcdef → abcdefg00:31
→ Cabanossi joined00:31
← onehrxn left00:31
← svm_invictvs left00:31
→ Puffball joined00:32
abcdefg → phase300:32
← nidr0x left00:33
phase3 → phase500:33
← bilal left00:33
→ bilal joined00:34
phase5 → newabc00:35
→ onehrxn joined00:35
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 again00:36
PettanShoutaKun_, but yes, git revert is just a new commit, no history rewriting involved00:36
← newabc left00:37
→ phase2 joined00:37
phase2 → peaceflower00:38
← brent__ left00:38
PettanShoutaKun_ I don't want to redo the merge00:38
so I think I'll be okay00:38
← Introoter left00:38
→ brent__ joined00: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 pointless00:39
→ h12o joined00:40
Vampire0 blocky, hm, sounds ok and `git rev-parse --verify HEAD && echo true || echo false`?00:40
← robertparkerx left00:41
← cdg left00:41
→ durham joined00:41
← dreiss left00:42
← salamanderrake left00:44
← h12o left00:44
→ ssmall joined00:44
← tvw left00:45
← durham_ left00:45
← brent__ left00:46
← durham left00:46
→ nidr0x joined00:46
→ Noldorin joined00:47
→ bronson joined00:47
← bronson left00:49
→ bronson joined00:50
→ Gurkenglas_ joined00:51
← davimore left00:51
→ User458764 joined00:55
← Stumbler left00:56
← naf left00:59
→ naf joined00:59
→ h12o joined01:00
← sunri5e left01:00
→ sunri5e joined01:00
← MattMaker left01:00
→ MattMaker joined01:01
→ otiose joined01:01
→ nd joined01:01
← nd_ left01:04
← PettanShoutaKun_ left01:05
← h12o left01:05
→ durham joined01:05
← otiose left01:05
← cust left01:06
← shgysk8zer0 left01:07
← durham left01:08
→ durham joined01:08
← d^sh left01:08
← al-damiri left01:09
→ d^sh joined01:10
→ svm_invictvs joined01:10
→ jon-mac joined01:11
→ tnecniv joined01:13
← Cabanossi left01:14
← boombatower left01:16
→ Cabanossi joined01:16
← bronson left01:17
← kexmex left01:18
→ h12o joined01:20
← yohnnyjoe left01:21
→ Bock joined01:21
← Bock left01:21
← a3Dman left01:22
→ Bock joined01:22
→ Wulf4 joined01:23
→ fatalhalt joined01:25
← h12o left01:25
← Sythrik left01:26
← Wulf left01:26
Wulf4 → Wulf01:26
→ iamasamosa joined01:26
← iamashishkebab2 left01:28
← fatalhalt left01:30
→ a3Dman joined01:32
→ caper joined01:33
← sturner left01:33
→ fatalhalt joined01:34
← fatalhalt left01:34
← rnsanchez left01:35
→ cust joined01:36
← blackwind_123 left01:37
→ fatalhalt joined01:37
→ VladGh_ joined01:38
← Gurkenglas_ left01:39
← VladGh left01:39
→ raijin joined01:40
← sunri5e left01:40
→ brent__ joined01:41
→ h12o joined01:41
→ sunri5e joined01:42
→ stoopkid joined01:43
→ sturner joined01:45
← brent__ left01:45
← ilbot3 left01:45
← h12o left01:46
→ gugah joined01:49
→ ilbot3 joined01:50
→ ir7466 joined01:51
← Sasazuka left01:51
ir7466 Hello I have a strange issue - there's a couple of files that when I try to commit or revert - nothing happens01:51
so I do a "git status" and see 3 files01:52
no matter what i do to those files, nothing happens01:52
← justin3 left01:53
→ Marquisk2 joined01:53
→ MattMake_ joined01:53
← Marquisk2 left01:53
→ shgysk8zer0 joined01:53
← njbair left01:54
← Qilibrun left01:55
← MattMaker left01:57
← roar left01:58
← Cabanossi left01:59
→ TbobbyZ joined02:00
← dermoth left02:00
→ njbair joined02:00
→ dreiss joined02:00
→ dermoth joined02:00
→ Cabanossi joined02:01
→ h12o joined02:01
← davidfetter_ge left02:01
← madewokherd left02:02
→ madewokherd joined02:03
→ chigang joined02:03
← TbobbyZ left02:06
← h12o left02:06
← chachasmooth left02:06
rwp ir7466, git status shows you those file has local modifications? Or that they are untracked files? Or other?02:06
ir7466, git diff shows you that they have changes? You 'git add ...' then and 'git diff --cached' shows the changes?02:07
← YuGiOhJCJ left02:07
← MattMake_ left02:08
→ chachasmooth joined02:08
→ jameser joined02:11
→ Marble68 joined02:12
← lafleurdubien left02:12
← prg3 left02:12
→ roelmonnens joined02:12
→ zer0her0 joined02:13
← zer0her0 left02:13
→ zer0her0 joined02:13
← telephone left02:13
ir7466 Hi rwp02:14
→ Technocrat7 joined02:14
→ prg3 joined02:14
ir7466 i believe the problem is, on GitLab some of these files are duplicates02:15
ie. one is called "myfile.php" and another is called "MyFile.php"02:15
but when i pull to windows, it's only taking one... i guess a case sensitivity issue02:15
→ MattMaker joined02:15
→ telephone joined02:16
← telephone left02:16
→ telephone joined02:16
→ Goplat joined02:16
← roelmonnens left02:16
ir7466 so yeah, git status shows modifications. git diff shows changes... but it's showing changes between myfile.php and MyFile.php02:17
→ AlienMachineElf joined02:17
← caper left02:17
← Noldorin left02:17
← AlienMachineElf left02:18
→ bronson joined02:18
→ iamashishkebab2 joined02:19
← zer0her0 left02:20
→ zer0her0 joined02:20
← zer0her0 left02:20
→ zer0her0 joined02:20
← iamasamosa left02:20
← Doginal left02:21
→ h12o joined02:22
→ lagothri1 joined02:22
← bronson left02:23
→ Es0teric joined02:24
rwp ir7466, Ah... Case insensitive file system. Gotcha.02:24
→ QwertyDragon joined02:26
QwertyDragon → Guest3253402:27
← h12o left02:27
← Guest32534 left02:27
← prg3 left02:28
← anuxivm left02:28
← Technocrat7 left02:28
← watabou left02:29
← Marble68 left02:29
→ QwertyDragon_ joined02:29
QwertyDragon_ → Guest773202:29
→ prg3 joined02:29
← Guest7732 left02:30
→ QwertyDragon__ joined02:32
← Gustavo6046 left02:32
ir7466 rwp: what about colons, could that cause a problem?02:33
i was able to solve a few of the conflicts because of the case02:33
← QwertyDragon__ left02:33
ir7466 but there's one like "FileName:_1234_i.inc"02:34
→ QwertyDragon__ joined02:34
ir7466 and my local version control is saying the file is deleted02:34
i'm not sure why it's saying it's deleted, I guess it must be something to do with the colon02:34
→ h12o joined02:34
→ Motoko joined02: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
← hexagoxel left02:35
→ watabou joined02:35
ir7466 one moment02: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 windows02:36
but like you i kind of prefer running on linux02:36
if i run git ls-files what should i look for02:37
i do see the unusual name with the colon02:37
there's also a name identical except the after the colon02:38
like02: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 FileName02:38
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-cloning02:39
but yeah i think windows must be freaking out because it's seeing one with a colon and one without02:39
← h12o left02:39
← zturner left02:40
rwp Probably looking for the FileName drive.02:41
ir7466 ah02:41
yeah02:41
rwp So strange to see that remnent of CP/M still hanging around these days.02:41
→ hexagoxel joined02:42
ir7466 i'm not really sure what i should do02:43
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 name02:43
rwp Any regression tests with this project?02:44
← lb1c left02:44
ir7466 haha02:44
good one02:44
→ lb1c joined02:44
rwp https://en.wikipedia.org/wiki/Legacy_code02:44
ir7466 (no)02:44
its still running php402:45
and git has only been used for the last month or so02:45
rwp "Michael Feathers introduced a definition of legacy code as code without tests"02:45
ir7466 so i cant even look at the history to see when changes were made to a file02: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 yep02:46
← dilijev left02:46
ir7466 and i cant even see when it was last changed, or who changed it, to know who i should talk to02: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:46
← prg3 left02:47
← gugah left02:47
rwp "git log FileName:_1234_i.inc" should tell you something.02:47
→ ryxai joined02: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:48
→ zturner joined02:49
← gaucheph left02:49
→ prg3 joined02:50
→ CEnnis91 joined02:50
→ h12o joined02:55
← ssmall left02:56
→ Vortex34 joined02:58
← bilal left02:59
← h12o left03:00
→ bilal joined03:00
← Puffball left03:00
→ otiose joined03:01
← Vortex35 left03:02
→ Puffball joined03:02
← bilal left03:03
→ bilal joined03:04
→ menip joined03:05
← duderono_ left03:07
← otiose left03:08
← dsdeiz left03:10
→ navidr joined03:14
→ xall joined03:14
→ h12o joined03:15
← h12o left03:19
→ bronson joined03:20
← ir7466 left03:21
← ojdo left03:23
← raijin left03:24
← bronson left03:24
→ Lyqyd joined03:26
← Cabanossi left03:28
→ salamanderrake joined03:29
→ Cabanossi joined03:30
→ dsdeiz joined03:30
← dsdeiz left03:30
→ dsdeiz joined03:30
→ ojdo joined03:30
← zturner left03:31
← dirtyroshi left03:33
→ aavrug joined03:34
← aavrug left03:35
← Es0teric left03:35
→ aavrug joined03:35
→ h12o joined03:36
← Lyqyd left03:38
→ bronson joined03:39
← h12o left03:40
→ Es0teric joined03:40
← telephone left03:43
← trobotham left03:44
→ trobotham joined03:45
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:46
→ telephone joined03:48
← telephone left03:48
→ telephone joined03:48
preaction their mask could set it03:48
thiago someone used Windows03:48
kutenai thiago: yeah, that's what I'm thinking.03:50
thiago or they copied from a USB drive03:50
kutenai preaction: Their umask?03:50
hmm.03:50
preaction yes03: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 bits03:50
what is "the system"?03:51
kutenai "the system" -- meaning, IDE. Using PyCharm.03:51
thiago I don't know why an IDE would rewrite a file and, even if it did, why it would set the +x attributes03:52
kutenai So, umask can't be it.. hmm.03:52
Yeah, makes no sense..03:52
thiago Windows and/or USB stick are your likely candiates03:52
of course, USB stick is a problem because of Windows too03:52
→ a_thakur joined03:55
→ h12o joined03:56
→ Ardethian\ joined03:56
← Ardethian left03:58
→ cads joined03:58
← Spacew00t left03:58
← shgysk8zer0 left04:00
← h12o left04:01
→ tohuw joined04:01
← tohuw left04:01
→ tohuw joined04:01
→ TbobbyZ joined04:03
← watabou left04:06
→ watabou joined04:06
→ FuzzyWuzzyPanda joined04:06
← TbobbyZ left04:08
→ rkazak joined04:09
→ frobnic joined04:12
→ h12o joined04:16
→ zturner joined04:17
→ cagedwisdom joined04:18
← druonysus left04:19
← h12o left04:22
← User458764 left04:23
← Cabanossi left04:27
← johnnyfive left04:28
→ Cabanossi joined04:30
→ h12o joined04:37
→ nickel_dime_look joined04:41
← h12o left04:42
→ mniip joined04:47
← MattMaker left04:47
→ noorbeh joined04:49
→ ayogi joined04:49
← ryxai left04:49
→ shgysk8zer0 joined04:50
→ rchavik joined04:52
← nick123_ left04:52
← watabou left04:53
← Es0teric left04:54
← noorbeh left04:54
← bronson left04:54
← lindenle left04:54
→ h12o joined04:58
→ watabou joined04:58
← Cabanossi left04:59
→ Cabanossi joined05:00
← h12o left05:02
→ Chu joined05:04
→ otiose joined05:05
Chu → Guest6750605:05
→ tarkus joined05:05
→ dec0n joined05:07
→ fluffystub joined05:08
← _Vi left05:08
← otiose left05:09
← pks left05:10
← albel727 left05:10
← cads left05:10
← bongo left05:11
→ theoceaniscool joined05:13
← tarkus left05:14
→ pks joined05:14
→ albel727 joined05:15
← kadoban left05:17
→ h12o joined05:18
← albel727 left05:21
← h12o left05:23
→ albel727 joined05:24
→ m4sk1n joined05:25
← VladGh_ left05:26
← Cabanossi left05:27
← rkazak left05:29
← CEnnis91 left05:29
← albel727 left05:29
→ albel727 joined05:29
→ Cabanossi joined05:30
← xall left05:32
← shgysk8zer0 left05:35
→ qt-x joined05:35
→ imack joined05:37
→ mda1 joined05:38
→ soto_ joined05:38
→ h12o joined05:39
← mel00010 left05:39
→ JanC_ joined05:40
← ertes left05:40
← marlinc left05:41
JanC → Guest6679505:41
← Guest66795 left05:41
JanC_ → JanC05:41
← dedicated left05:41
← dec0n left05:42
→ latino31 joined05:43
→ sea-gull joined05:43
→ VladGh joined05:43
→ dec0n joined05:43
→ cvt joined05:43
← cvt left05:43
→ cvt joined05:44
← h12o left05:44
← cvt left05:44
→ cvt joined05:44
← cvt left05:46
← theoceaniscool left05:47
← durham left05:47
→ marlinc joined05:47
← FuzzyWuzzyPanda left05:48
→ sea-gull_ joined05:48
→ o11c joined05:48
o11c Using git-remote-bzr (the quasiofficial one), how do I get the bzr revision number for a git commit?05:48
→ jonas_ joined05:49
← jonas_ left05:49
→ h12o joined05:49
← a_thakur left05:51
→ a_thakur joined05:51
→ shgysk8zer0 joined05:52
Blendify → Blendify|afk05:52
← zturner left05:53
← a_thakur left05:53
→ durham_ joined05:53
→ a_thakur joined05:53
→ Se7yLade joined05:54
← h12o left05:54
→ regedit joined05:55
→ a_thakur_ joined05:55
← tnecniv left05:56
← Se7yLade left05:57
→ Raging_Hog joined05:57
← a_thakur left05:59
← VladGh left05:59
← thiago left05:59
→ VladGh joined06:00
← dermoth left06:00
→ dermoth joined06:00
← a_thakur_ left06:01
← lipsumar left06:02
→ jay-m joined06:02
→ rkazak joined06:04
→ TbobbyZ joined06:05
→ bilal_ joined06:06
← aavrug left06:06
← netj left06:07
→ netj joined06:08
→ aavrug joined06:09
← madewokherd left06:09
← bilal left06:09
← TbobbyZ left06:10
→ xall joined06:10
← nidr0x left06:11
→ rscata joined06:11
→ Silmarilion joined06:11
→ otiose joined06:13
← durham_ left06:14
← rkazak left06:14
→ zeroed joined06:14
← zeroed left06:14
→ zeroed joined06:14
← Cabanossi left06:14
← menip left06:15
← whydoubt left06:16
→ Cabanossi joined06:17
→ roelmonnens joined06:18
← roelmonnens left06:18
→ h12o joined06:18
← otiose left06:18
→ roelmonnens joined06:18
→ zturner joined06:21
← h12o left06:23
← onehrxn left06:24
→ JeroenT joined06:24
← JeroenT left06:26
→ JeroenT joined06:26
→ ogny joined06:28
← iamashishkebab2 left06:28
→ iamashishkebab2 joined06:28
← JeroenT left06:28
→ duderonomy joined06:28
→ JeroenT joined06:28
→ otiose joined06:28
← watabou left06:28
visual hello /git/06:29
→ D630 joined06:29
→ nidr0x joined06:30
visual in order to pull changes from upstream, i removed a local file, because i didnt need the local changes06:30
← nidr0x left06:30
visual it pulled ok06:30
but now, the deleted file is staged for commit06:30
how do i discard it?06:30
← masuberu left06:30
visual actually, it pulled, but without that file, and now git fetch says it's up-to-date06:32
but the file is missing locally :U06:32
← otiose left06:33
← Nilesh_ left06:33
rwp visual, use "git reset HEAD <file>..." to unstage the removal. See the output of 'git status' for that hint.06:34
→ xall_ joined06:34
← xall left06:34
← rominronin left06:36
→ rominronin joined06:36
→ h12o joined06:38
← Gianormagantrous left06:43
→ otiose joined06:43
← dave0x6d left06:43
← h12o left06:44
→ Gianormagantrous joined06:44
→ ertes-w joined06:45
← otiose left06:48
→ dersand joined06:49
→ jfr joined06:50
→ acetakwas joined06:51
→ jagob joined06:51
→ watabou joined06:52
→ cads joined06:52
→ theoceaniscool joined06:52
← alexandre9099 left06:53
→ alexandre9099 joined06:53
← sea-gull_ left06:54
← sea-gull left06:54
→ bronson joined06:55
→ lindenle joined06:55
← zturner left06:56
← watabou left06:57
→ chele joined06:58
→ Gloomy joined06:59
← theoceaniscool left06:59
→ tarkus joined06:59
← lindenle left07:00
← bronson left07:00
→ Tobbi joined07:02
→ theoceaniscool joined07:02
← dreiss left07:02
→ manuelschneid3r joined07:03
→ felGru joined07:03
→ pbandark joined07:04
visual thanks rwp07:04
← xall_ left07:05
← Motoko left07:05
rwp visual, That or you need to use "git checkout -- <file>..." to discard changes in working directory.07:06
It all depends upon where in the staging pipeline you have made the changes. :-)07:06
"git status" should include hints on what to do to undo what has been done.07:06
→ YuGiOhJCJ joined07:07
← theoceaniscool left07:07
← peterbecich left07:09
→ h12o joined07: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 revno07:09
← jstimm left07:09
o11c but I have no idea how it works in conjuction with bzr branches07:10
then again, I don't know of any bzr projects that actually *use* branches07:10
→ xall_ joined07:10
→ tonikt joined07:11
→ zturner joined07:12
o11c here's my result if anyone's interested: https://gist.github.com/o11c/cc3520bda444f2b26717952f02e51bf407:12
this is the first time I really got into using jq07:12
it really is a nifty tool07:12
→ barbos joined07:13
→ schleppel joined07:13
tonikt Hi guys. How can I make an existing branch a new HEAD? I don't want to merge - just change where the head is07:14
tobiasvl tonikt: git checkout branch07:14
→ ryxai joined07:14
← ryxai left07:14
← h12o left07:15
← jameser left07:15
→ goTAN joined07:15
o11c tonikt: consider also `git-worktree`07:15
← QwertyDragon__ left07:15
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 branch07:16
→ liuxu joined07:17
→ jameser joined07:17
← nevodka left07:17
← liuxu left07:17
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 joined07:18
tonikt tobiasvl: yes07:18
tobiasvl because you didn't mention master, you said HEAD07:18
two very different things07:19
tonikt o11c: sorry, I don't know what that means :)07:19
osse change what HEAD points to on the host07:19
o11c tonikt: there's a setting to change a remote repo's HEAD (the default branch)07:19
→ lordjancso joined07:19
→ nevodka joined07: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
← nevodka left07:19
→ netroxen joined07:19
tonikt sorry guys, I was always thinking that master and HEAD were same thing :)07:19
→ nevodka joined07:19
o11c e.g. on github, you can change the default branch here: https://github.com/o11c/python-curl-requests/settings/branches07:20
rewriting history is generally a bad thing07:20
so if you can't merge, you probably shouldn't overwrite master07:20
tobiasvl (but if that REALLY is what you want, you can do it)07:21
tonikt The current master has not been developed since I forked to the branch07: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 joined07:22
tonikt OK - here is the scenario...07:22
tobiasvl ok, so why can't you merge?07:22
ok07:22
← jameser left07:23
→ theoceaniscool joined07: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 on07:23
← theoceaniscool left07:23
→ digidog joined07:23
tonikt Honestly I don't know why I cant merge. It says "merge: v1.9 - not something we can merge"07:24
← zeroed left07:24
osse tonikt: git checkout master; git merge a-new-branch; git push07:24
tonikt Maybe I did one or two commits, but nothing big07:24
→ zeroed joined07:24
osse is your branch named v1.9 ?07:24
tonikt Yes07:24
← TikityTik left07:24
osse run git for-each-ref | grep -F v1.907:25
← kristofferR left07:25
o11c ah, if you're not switched to master, yet you can't merge obviously07:25
→ theoceaniscool joined07:25
→ jameser joined07:25
tonikt but I am switched to master07:25
git checkout master - works07:25
o11c wait, is v1.9 a *remote* or *local* branch?07:25
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 remote07:26
o11c *sometimes* remote branches are handled as-if local, but sometimes they aren't07:26
→ mel00010 joined07:26
← Tobbi left07:27
→ kristofferR joined07:27
o11c so try `git merge origin/v1.9`07:27
tonikt o11c: https://pastebin.com/umgZL9Qv07:27
tobiasvl ver1.907:27
osse jebus07:27
o11c er07:27
tobiasvl not v1.907:27
o11c not v, ver07:27
tonikt o11c: "git merge origin/v1.9" says the same "merge: origin/v1.9 - not something we can merge"07:28
o11c ver1.907:28
osse you don't know the name of your own branches!07:28
← Xenophon1 left07:28
← svm_invictvs left07:28
o11c though using a v prefix for something other than a *tag* is heresy07:28
tobiasvl hehe07:28
tonikt oh, shit07:28
← JeroenT left07:28
tonikt sorry guys - you are right :)07:28
I'm a nutter07:29
it was ver1.907:29
git merge ver1.9 - works just fine07:29
→ XenophonF joined07:29
tonikt thank you all!07:29
→ h12o joined07:29
→ mikecmpbll joined07:30
← Cabanossi left07:30
← lipsumar left07:30
← mikecmpbll left07:31
→ sbulage joined07:31
← tonikt left07:31
→ Cabanossi joined07:32
→ Tobbi joined07:32
← qt-x left07: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=7407:33
osse no, but you can run git difftool07:33
→ jeffreylevesque_ joined07:34
← jeffreylevesque left07:34
← h12o left07:35
← barbos left07:35
← Random832 left07:35
→ jstimm joined07:37
selckin think you can git checkout -p like add -p07:37
and git gui, and ofc what osse said07:37
→ ankit01ojha joined07:37
→ qt-x joined07:37
← nevodka left07:38
→ slidercrank joined07:39
→ JeroenT joined07:39
→ Levex joined07:39
→ kelvah joined07:40
→ barbos joined07:41
→ lipsumar joined07:42
← GT4066 left07:42
← manuelschneid3r left07:42
→ manuelschneid3r joined07:42
→ miczac joined07:42
gitinfo set mode: +v07:43
← felGru left07:43
→ elect joined07:46
← lipsumar left07:46
→ chu joined07:47
→ Random832 joined07:49
→ masuberu joined07:49
← jameser left07:50
→ h12o joined07:50
← manuelschneid3r left07:50
→ Mavericks joined07:51
→ sea-gull_ joined07:51
→ sea-gull joined07:51
→ jameser joined07:51
← Mavericks left07:51
→ manuelschneid3r joined07:51
→ watabou joined07:52
← rvgate left07:53
→ elect_ joined07:53
→ ssmall joined07:53
← manuelschneid3r left07:53
→ manuelschneid3r joined07:54
← elect left07:54
→ MattMaker joined07:55
→ bronson joined07:56
← h12o left07:56
← iamashishkebab2 left07:56
← jameser left07:56
→ apotry joined07:56
← sturner left07:56
← sbulage left07:57
→ sturner joined07:57
→ mikecmpbll joined07:57
← ssmall left07:57
← elect_ left07:58
→ elect joined07:58
← watabou left07:58
→ iamashishkebab2 joined07:59
← Cabanossi left07:59
← mel00010 left08:00
← bronson left08:00
→ h12o joined08:00
→ Cabanossi joined08: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:01
osse looks like you didn't run 'git difftool'08:02
→ dvaske joined08:02
← rchavik left08:02
hendry oh i used selckin's suggestion -p08:03
visual can i stash some changes, switch branches, work, swich _back_, and unstash the changes?08:04
as an alternative to commiting just because you switch a branch08:04
hendry osse: my buffer is in RO mode via difftool. no idea why.08:05
→ kurkale6ka joined08:05
osse hendry: one of them are08:05
selckin visual: yes08:05
osse visual: yes, that's exactly how stash is used msot often08:05
o11c visual: consider git-worktree though08:06
visual awesome, thanks selckin & osse08:06
← h12o left08:06
visual o11c: oh?08:06
o11c work on multiple branches at the *same* time, just in different directories08:06
visual >A git repository can support multiple working trees, allowing you to check out more than one branch at a time.08:06
o11c seaprate git index and stuff08:07
← Tobbi left08:07
visual interesting, will deff. check it out, thank o11c08:07
→ Masber_080 joined08:07
← masuberu left08:08
→ wandering_vagran joined08:09
→ jameser joined08:09
hendry osse: both are in my case bizaarely08:09
→ sbulage joined08:09
osse hendry: what are the paths?08:09
← Levex left08:11
hendry osse: /tmp/test ? https://s.natalian.org/2017-05-05/1493971807.mp408:11
← cebor left08:11
→ lipsumar joined08:11
→ cstratak joined08:12
→ cebor joined08:12
osse hendry: i see. same here. makes no sense. I don't think it used to be like that08:13
selckin hendry: what do you use for recording08:14
→ ijafidnsfod joined08:14
← jameser left08:14
hendry selckin: own crappy script that uses ffmpeg https://github.com/kaihendry/recordmydesktop2.0/blob/master/x11capture08:14
← jnewt left08:15
→ cdown joined08:16
→ marcogmonteiro joined08:17
selckin where does $res come from08:17
→ Snugglebash joined08:17
→ IRQ` joined08:18
← IRQ` left08:18
→ _ADN_ joined08:18
osse selckin: three lines above08:20
→ onehrxn joined08:20
← iamashishkebab2 left08:20
→ h12o joined08:21
selckin oh i'm sleepy fool08:21
→ Levex joined08:22
→ jameser joined08: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:22
→ tymczenko joined08:23
→ aax joined08:23
→ djb-irc joined08:24
← holodoc left08:24
← h12o left08:26
→ najemnyvrah joined08:26
→ sturner_ joined08:26
← sturner left08:27
← Stace left08:28
→ cdown_ joined08:28
hendry osse: should i file a bug about this RO issue with difftool ?08:29
← ijafidnsfod left08:29
← Cabanossi left08:29
← cdown left08:30
cdown_ → cdown08:30
← jameser left08:30
→ kurkale61 joined08:30
← tymczenko left08:30
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 not08:31
→ Cabanossi joined08:31
osse but in principle, yes, it would be nice of it was brought up08:31
← kurkale6ka left08:31
hendry wonder if it's a vim issue or something odd08:32
osse hendry: git explicitly launches vim in read only mode08:33
→ iamashishkebab2 joined08:33
osse hendry: https://github.com/git/git/blob/master/mergetools/vimdiff#L208:33
→ kurkale6ka joined08:33
← kurkale61 left08:34
→ Faux joined08:35
gitinfo set mode: +v08:35
→ jim joined08:36
jim hi, I want to chop off one commit I haven't pushed yet... git reset HEAD?08:36
_ikke_ git reset --keep HEAD~08:37
→ rogl joined08:37
_ikke_ (--keep to prevent you from obliterating uncomitted changes)08:37
← rasto left08:37
jim oh ok, thoughtful, thanks... and there are none right now :)08:37
and maybe I mistakenly thought there was a commit problem... checking...08:39
→ chll_ joined08:40
→ machinly joined08:40
← Levex left08:40
→ notebox joined08: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 * newdir08:41
jim _ikke_, it was a false positive... looks like I'm ok08:41
→ h12o joined08:41
jim thanks anyway for your time08:41
← JeroenT left08:43
→ User458764 joined08:43
→ JeroenT joined08:44
← barbos left08:44
→ otiose joined08:44
→ bschindler joined08:44
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 output08:45
https://pastebin.com/VR9GSjqK08:45
the submodule link at the commit I'm rebasing onto should be the same - so what is going on here?08:45
→ CandyAngel joined08:45
gitinfo set mode: +v08:45
← Goplat left08:46
→ JeroenT_ joined08:46
← h12o left08:46
← machinly left08:46
← JeroenT left08:46
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 joined08:47
← Kochergan left08:48
← marcogmonteiro left08:48
← regedit left08:48
→ iamasamosa joined08:49
← zturner left08:49
selckin why do you care08:49
← otiose left08:50
selckin if ssh is slow its ssh and encryption and its terrible buffer sizes08:50
CandyAngel Because it takes about 18 hours to repack them08:50
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 joined08:51
DelTree quite a repo-potamus as it sounds...08:52
CandyAngel Just a bit :)08:52
It's like.. 12 million objects08:52
osse CandyAngel: maybe you can (ab)use --upload-pack08:52
← iamashishkebab2 left08:52
→ seni joined08:52
→ barbos joined08:54
→ watabou joined08:54
→ marcogmonteiro joined08:55
← User458764 left08:56
← YuGiOhJCJ left08:58
→ zturner joined08:58
← watabou left08:59
← netroxen left08:59
→ sbasso joined08:59
← lipsumar left09:01
← barbos left09:01
← nickel_dime_look left09:01
→ h12o joined09:02
← sbulage left09:02
← MattMaker left09:03
← djb-irc left09:03
→ barbos joined09:04
← Atm0spher1c left09:04
→ Gurkenglas_ joined09:05
← shgysk8zer0 left09:05
← theoceaniscool left09:06
← barbos left09:06
→ lipsumar joined09:07
← h12o left09:07
→ TbobbyZ joined09:08
← tarkus left09: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:08
→ achadwick joined09:09
← spark` left09:10
← goTAN left09:11
← bschindler left09:12
→ rory joined09:13
→ tarkus joined09:13
← TbobbyZ left09:14
← Cabanossi left09:14
→ djb-irc joined09:14
← lipsumar left09:15
→ Cabanossi joined09:16
→ sbulage joined09:18
← jim left09:19
→ theoceaniscool joined09:20
→ Acerific joined09:20
→ Tobbi joined09: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:20
→ barbos joined09: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 --reference09:21
gitinfo CandyAngel: the git-clone manpage is available at https://gitirc.eu/git-clone.html09:21
→ h12o joined09:22
CandyAngel canton7: They aren't on the same machine09:22
canton7 ah, fair enough09:22
CandyAngel I did init, rsync objects, fetch and it is happy09:23
→ jameser joined09:24
→ holodoc joined09:24
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:25
← barbos left09:25
← kegster left09:26
← theoceaniscool left09:26
← sarri left09:27
← rory left09:27
← h12o left09:27
← jay-m left09:28
→ kegster joined09:28
← Raging_Hog left09:29
→ ronskisika joined09:29
← jaziz left09:30
→ theoceaniscool joined09:30
→ sarri joined09:31
← sarri left09:31
→ sarri joined09:31
→ lipsumar joined09:31
← aidalgol left09:31
← lipsumar left09:32
→ h12o joined09:33
← pbandark left09:33
← zturner left09:33
→ pbandark joined09:34
← miczac left09:34
→ hs366 joined09:34
← Karazhan left09:36
← h12o left09:37
→ Karazhan joined09:37
← hs366 left09:38
← D630 left09:39
← marianina8 left09:40
← JeroenT_ left09:40
→ zturner joined09:40
→ marianina8 joined09:40
→ JeroenT joined09:40
← jameser left09:40
osse najemnyvrah: whatæs in the commit metadata that needs cencoring in the first place?09:42
→ User458764 joined09:43
← JeroenT left09:44
→ JeroenT joined09:45
→ Lauven joined09:46
→ D630 joined09:46
← Lauven left09:46
→ PHPanos joined09:46
→ tymczenko joined09:47
← marianina8 left09:48
→ Lauven joined09:52
→ h12o joined09:53
→ ssmall joined09:53
→ jameser joined09:54
→ watabou joined09:54
← kelvah left09:56
← Tobbi left09:56
→ bronson joined09:56
→ SadAdmin joined09:56
← ssmall left09:58
digidog → diqidoq09:58
← h12o left09:58
gitinfo set mode: +v10: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. Thanks10:00
← watabou left10:00
_ikke_ SadAdmin: Any reason why you are using git daemon?10:00
← diogenese left10:01
← notebox left10:01
← bronson left10:01
SadAdmin We prefer to use the git protocol instead of smb, but we have no need for encryption to use ssh.10:01
← maroloccio left10:01
Gurkenglas_ → Gurkenglas10:02
→ chardan joined10:02
← PHPanos left10:02
osse get one of those ready-made VMs with gitlab or gitblit or something on it. Spin it up. Done!10:02
→ barbos joined10:03
← JeroenT left10:03
← sbulage left10:03
→ JeroenT joined10:03
→ romank joined10:04
← jon-mac left10:04
SadAdmin For security concerns I prefer to install it on our own VMs10:04
← User458764 left10:04
osse run the VM in a VM10:05
done!10:05
← ronskisika left10:05
→ ronskisika joined10:05
selckin gitlab is super easy to install10:05
→ maroloccio joined10:06
SadAdmin I appreciate the suggestion, but I'd really like to just set the daemon to run automatically10:06
Everything is working fine except for this10:06
Tried with cygwin and with sc, services are created but won't run10:06
→ diogenese joined10:06
selckin things usually give an error10:07
→ Murii joined10:07
→ kelvah joined10:07
← JeroenT left10:07
← tymczenko left10:09
→ tymczenko joined10:09
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 though10:11
*server = service10:11
osse that doesn't sound like a message git itself produces10:12
← zturner left10:14
→ h12o joined10:14
← Gloomy left10:14
→ ferr joined10:14
→ sbulage joined10:14
← Masber_080 left10:14
← Cabanossi left10:15
→ Tobbi joined10:16
→ Cabanossi joined10:16
← taoqy left10:18
← h12o left10:18
→ basiclaser joined10:19
SadAdmin The problem is not on git itself, but setting up the daemon command to start automatically in windows10:19
← tymczenko left10:19
SadAdmin Git is working, it just needs someone to run the daemon command so all devs can clone, push and do everything they should10:20
→ zturner joined10:20
← d^sh left10:20
← Acerific left10:21
← qt-x left10:22
→ d^sh joined10:22
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 problem10:23
← cads left10:23
_ikke_ btw, ssh is not only encryption, but also authentication10:24
→ ams__ joined10:24
← barbos left10:24
_ikke_ the git protocol is unauthenticated10:24
→ miczac joined10:25
gitinfo set mode: +v10:26
_ikke_ SadAdmin: How did you define the service?10:26
cbreak SadAdmin: both smb and the git protocol suck in their own ways10:27
_ikke_ SadAdmin: https://stackoverflow.com/a/13044820/2026110:27
→ barbos joined10:28
→ govg joined10:28
cbreak SadAdmin: as server, any unix should work well, mac os, linux, one of the bsds10:28
as long as it's not windows it should be fine :)10:28
← mda1 left10:28
cbreak just using a simple ssh server is probably the easiest, almost doesn't require any setup at all10:29
→ mda1 joined10:30
← Tobbi left10:31
← sbasso left10:32
← Guest67506 left10:32
→ h12o joined10:34
← leeN left10:35
→ BSaboia joined10:36
→ cads joined10:36
← a3Dman left10:36
← clickjack left10:37
← stoopkid left10:37
→ Tobbi joined10:39
← h12o left10:39
← theoceaniscool left10:40
→ JeroenT joined10:41
→ clickjack joined10:41
← JeroenT left10:42
→ leeN joined10:42
← ayogi left10:42
→ rchavik joined10:42
→ JeroenT joined10:42
→ sbasso joined10:43
→ a3Dman joined10:45
→ otiose joined10:45
← cagedwisdom left10:46
→ JeroenT_ joined10:46
→ rvgate joined10:46
← JeroenT left10:46
← sbasso left10:48
→ marianina8 joined10:48
→ sbasso joined10:48
→ murii_ joined10:49
→ rominron_ joined10:49
→ Gloomy joined10:49
← Murii left10:49
← MuffinMedic left10:49
→ freddy_ joined10:49
→ Ardethian joined10:49
← Tobbi left10:50
← Gloomy left10:50
← a3Dman left10:50
← dvaske left10:50
← otiose left10:50
← rominronin left10:51
← Ardethian\ left10:51
← cliluw left10:51
← Aljone left10:51
→ Guest67506 joined10:51
→ Aljone joined10:52
→ cliluw joined10:52
→ MuffinMedic joined10:52
← JeroenT_ left10:53
← marianina8 left10:53
→ JeroenT joined10:53
→ StormLrd joined10:54
→ slavking joined10:54
slavking hi I have a question10:54
→ IRQ` joined10:54
→ safe joined10:54
slavking I have a github account10:54
and I forked my friend's project10:55
→ h12o joined10:55
← sbasso left10:55
slavking how do I work on my end of the project without screwing with his project10:55
why is git so difficult10:55
tobiasvl slavking: your fork will not screw with his project at all10:55
→ watabou joined10:55
tobiasvl slavking: you clone your fork and do what you want with it10:55
slavking my fork is the same as his10:55
why can't they be in the same directory?10:56
tobiasvl I don't understand what you mean by that10:56
slavking my pull request destroyed his project10:56
tobiasvl then why did he accept it10:56
→ theoceaniscool joined10:56
slavking because he thought it wouldnt10:56
also how do I pull request to a different branch10:56
tobiasvl well that's on him then10:57
slavking i don't want to merge everything to master10:57
why can't the project have branches for the two of us10:57
tobiasvl you might want to head over to #github if you mostly have github questions10:57
but I don't understand what your problem is10:57
so maybe here is just as well10:57
← telephone left10:57
slavking also why does git rm delete files forever10:57
tobiasvl maybe start from the beginning, you've just rattled off a lot of issues10:57
slavking who thought that is a good idea10:57
tobiasvl git rm does not delete files forever10:58
they're still in the repo's history10:58
slavking how do I undo stuff?10:58
like git rm10:58
and unwinding commits10:58
tobiasvl slow down please10:58
and read a !book10: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 !parable10:58
slavking I suffer with git10:59
← jameser left10: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?10:59
→ tvw joined11:00
→ bitmod joined11:00
← h12o left11:00
← watabou left11: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 directories11:00
→ telephone joined11:01
← telephone left11:01
→ telephone joined11:01
tobiasvl switch directories? what do you mean by that?11:01
slavking yes11:01
i mean not having to do cd all the time11:01
→ theoceaniscool_ joined11:01
→ Gloomy joined11:01
→ opr joined11:01
→ dvaske joined11: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 original11:01
slavking osse, that's the thing!11:02
how do I do that?11:02
← theoceaniscool left11:02
→ sbasso joined11: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 joined11:02
slavking then it blows up11: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:02
slavking so first I have to fork11:03
I can't clone and work on it11:03
→ SteffanW joined11:03
osse you can work on the clone of his directly11:03
← xall_ left11:03
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 said11: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 push11:04
→ otiose joined11:04
slavking ok I did that11:05
how do I merge my fork to his original now11:05
cause my fork is screwed11:05
i just want to overrun my fork11:05
osse so I guess you mean the other way around, then.11:05
← telephone left11:05
slavking yes11:06
merge his original to my fork11:06
← Mogget left11:06
osse !merge_up11:06
!upstream11: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_upstream11: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 joined11:06
← telephone left11:06
→ telephone joined11:06
→ Mogget joined11:06
tobiasvl also you don't necessarily want to merge if you want to throw away your local stuff, you can use git reset instead11:06
← Snugglebash left11:07
tobiasvl "merge" means that you actually want the histories of both repos to mesh together11:07
slavking I want to overrun any local changes11:07
a clean start11:07
git fetch upstream11:07
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 it11:08
slavking okay finally11:08
now can I push this to my fork on github11:08
osse git push origin master11:08
slavking git push failed11:09
← otiose left11:09
slavking let me try git push origin master11:09
same11:09
updates were rejected11:09
beacsue the time of your11:09
current branch11:09
is behind its remote counterpart11:10
well I am onto something11:10
thanks guys11:10
osse slavking: since everything is fucked anyway I give you permission to use --force this one time11:10
→ a3Dman joined11:10
→ GingerGeek joined11:10
slavking force works11:10
← GingerGeek left11:10
→ GingerGeek joined11:10
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 joined11:11
tobiasvl ok you forced, that is fine11:11
→ TbobbyZ joined11:11
tobiasvl now your fork, clone and your friend's repo (well the master branch) are all in sync11:11
slavking how do I push changes to my fork and to his original?11:12
and how do I push changes to local ?11:12
I want a branch for myself11:12
osse you never push changes to local. that'11:12
slavking and a branch for him11:12
← kelvah left11:12
osse you never push changes to local. that's where you make the changes in the first place11:12
you push to your fork (ie. "origin"), then you make a pull request11:13
slavking so everything I locally do is not saved somewhere?11:13
osse it is saved on your hard drive11: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 example11:13
slavking can I change that stupid name, upstrea11:14
upstream to his name>11:14
and origin to my name?11:14
osse git remote rename foo bar11:14
slavking brb11:14
yesh!11:15
it work11:15
s11:15
→ h12o joined11:15
← TbobbyZ left11:16
→ re1 joined11:17
→ borkr joined11:18
← johnflux left11:18
→ ThomasLocke joined11:19
→ otiose joined11:19
→ sbasso_ joined11:19
← rchavik left11:19
← h12o left11:20
→ PHPanos joined11:20
← ankit01ojha left11:20
← Gloomy left11:21
→ sturner joined11:22
→ Tobbi joined11:22
← PHPanos left11:22
← sbasso left11:22
→ PHPanos joined11:22
← sturner_ left11:23
→ ayogi joined11:23
← otiose left11:24
→ Gloomy joined11:24
→ MineCoins joined11:25
← maroloccio left11:26
→ deronnax joined11:27
← ertes-w left11:27
deronnax hello11: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:27
→ ertes-w joined11: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
(I know I can reset and redo with git reset but that's not the method I would like to use)11:28
(imagine these 2 hunks are the result of a very tedious git add -p I don't want to redo again11:29
← freddy_ left11:29
→ maroloccio joined11:29
Vampire0 deronnax, !perfect should help11: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:30
← a3Dman left11:30
← Cabanossi left11:30
← safe left11:30
deronnax Vampire0, I'll have a look. git rebase -i is not needed because the commit is on top11:31
→ lipsumar joined11:31
← seveneve1 left11:31
← ertes-w left11:31
→ Cabanossi joined11:31
→ dglambert joined11:32
dglambert yo11:32
Vampire0 deronnax, should still apply accordingly, you just need to do a little transfer in mind :-)11:32
→ rchavik joined11:33
→ Levex joined11:33
← tarkus left11:33
→ seveneve1 joined11:33
→ ertes-w joined11:33
← borkr left11:33
← rominron_ left11:33
← StormLrd left11: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 pop11:34
← aavrug left11: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 in11:35
→ h12o joined11:35
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 again11:37
deronnax Vampire0, hmm, sounds nice, I'll give a try11:38
→ aavrug joined11:38
→ a3Dman joined11:39
→ tarkus joined11:39
← cads left11:39
→ caper joined11:40
→ bilal joined11:40
← h12o left11:40
← sbasso_ left11:41
← slavking left11:41
← bilal_ left11:42
→ bilal_ joined11:43
→ bsanford joined11:45
← plasticle left11:45
→ plasticle joined11:45
← bilal left11:46
← plasticle left11:46
→ bongo joined11:47
→ plasticle joined11:48
← soto_ left11:50
→ yohnnyjoe joined11:50
← raynold left11:50
← NeverDie left11:51
→ Spacew00t joined11:53
→ goTAN joined11:53
← marcogmonteiro left11:54
→ freddy_ joined11:54
→ marcogmonteiro joined11:54
← yohnnyjoe left11:54
→ h12o joined11:56
← ayogi left11:56
→ synthroid joined11:57
→ rnsanchez joined11:57
→ bronson joined11:58
→ ssmall joined11:59
→ Snugglebash joined11:59
→ synthroi_ joined11:59
← bongo left11:59
→ AndChat-484449 joined12:00
← Cabanossi left12:00
← wandering_vagran left12:00
← theoceaniscool_ left12:01
→ Cavallari joined12:01
→ Cabanossi joined12:01
← goTAN left12:02
→ PioneerAxon_ joined12:02
← bronson left12:02
← synthroid left12:02
← Tobbi left12:02
→ goTAN joined12:03
← dvaske left12:03
→ User458764 joined12:03
← PioneerAxon left12:03
← SteffanW left12:03
← seveneve1 left12:04
← iamasamosa left12:04
← Gloomy left12:04
← kurkale6ka left12:05
← rivarun left12:06
→ cads joined12:07
→ rivarun joined12:07
← ronskisika left12:07
← goTAN left12:07
→ amrits joined12:07
← m1dnight1 left12:07
← freddy_ left12:07
← seni left12:07
← marcogmonteiro left12:11
→ Sadeukko joined12:11
→ goTAN joined12:12
→ Gloomy joined12:13
← User458764 left12:13
→ jorj joined12:16
→ wandering_vagran joined12:17
→ theoceaniscool_ joined12:18
← tcorneli left12:18
→ circ-user-zNiD2_ joined12:19
← sbulage left12:21
→ aielima joined12:21
← ssmall left12: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 joined12:22
← onehrxn left12:22
→ m1dnight1 joined12:22
→ onehrxn joined12:23
→ masuberu joined12:23
→ kelvah joined12:23
→ redeemed joined12:24
Vampire0 circ-user-zNiD2_, did you enable two-factor authorization?12:25
circ-user-zNiD2_ no12:25
← sturner left12:25
→ Marquisk2 joined12:25
Vampire0 circ-user-zNiD2_, ok, so what was your question? how to use SSH keys instead of username / password?12:25
circ-user-zNiD2_ yes, where should I place them12:26
Vampire0 circ-user-zNiD2_, use the SSH URL for the remote instead of the HTTPS URL12:26
circ-user-zNiD2_ or check that they are in place12:26
Vampire0 SSH keys + HTTPS URL will not work12:26
→ courrier joined12:27
→ sevenever joined12:27
→ dvaske joined12:27
Marquisk2 → Sythrik12:28
← onehrxn left12:28
← chigang left12:29
← Marumarsu left12:30
→ sbasso joined12:30
circ-user-zNiD2_ It is ssh, yet password is asked.12:30
← MineCoins left12:31
← basiclaser left12:31
→ Sound joined12:31
← Sound left12:31
→ Sound joined12:31
← maroloccio left12:32
→ onehrxn joined12:32
← lipsumar left12:32
→ royal_screwup21 joined12:33
← alexandre9099 left12:33
← Gloomy left12:33
← Snugglebash left12:33
→ alexandre9099 joined12:34
tobiasvl it's not password, it's the ssh key's passphrase, surely12:35
→ Gloomy joined12:36
→ sbulage joined12:37
→ lipsumar joined12:37
← lipsumar left12:38
→ maroloccio joined12:38
← jeffreylevesque_ left12:39
→ kurkale6ka joined12:40
→ flaviodesousa joined12:42
_ikke_ if it asks for a password, it's a password12:42
← tarkus left12:44
→ dave0x6d joined12:45
← cads left12:45
→ lipsumar joined12:47
← lipsumar left12:47
← a3Dman left12:48
→ marianina8 joined12:50
← theoceaniscool_ left12:51
→ tarkus joined12:53
→ Snugglebash joined12:53
→ JeroenT_ joined12:53
→ roelmonn_ joined12:53
→ Gurkenglas_ joined12:53
→ zeroed_ joined12:53
→ perlpilot_ joined12:54
IanLiu → ian12:54
→ Cavallari1 joined12:54
→ jfr_ joined12:54
← aavrug left12:54
ian → Guest2635512:54
← marianina8 left12:54
Guest26355 → IanLiu12:54
→ kurkale61 joined12:55
→ nitemare joined12:55
← IanLiu left12:56
→ IanLiu joined12:57
→ watabou joined12:57
→ frobnic_ joined12:57
→ sea-gull1 joined12:57
← Aljone left12:58
→ Aljone joined12:58
→ sea-gull2 joined12:58
→ a3Dman joined12:59
← askb left12:59
← Sadeukko left12:59
→ sbasso_ joined13:00
→ kurkale62 joined13:00
← sbasso_ left13:00
← sbasso left13:00
→ m0f0x joined13:01
← m0f0x left13:01
→ m0f0x joined13:01
→ mniip_ joined13:01
→ pks_ joined13:01
→ wcstok joined13:01
→ jeffreylevesque joined13:02
→ [sarri] joined13:02
circ-user-zNiD2_ What if git log -S"a snippet" finds nothing? How can that code be in repository?13:02
← watabou left13:02
← kurkale61 left13:02
→ johnflux joined13:02
← johnflux left13:02
→ johnflux joined13:02
← dave0x6d left13:02
← kurkale6ka left13:02
← maroloccio left13:02
← kelvah left13:02
← m1dnight1 left13:02
← jorj left13:02
← Cavallari left13:02
← PHPanos left13:02
← ThomasLocke left13:02
← ok91 left13:02
← GingerGeek left13:02
← JeroenT left13:02
← ams__ left13:02
← d^sh left13:02
← chardan left13:02
← Lauven left13:02
← sarri left13:02
← achadwick left13:02
← Gurkenglas left13:02
← sea-gull_ left13:02
← sea-gull left13:02
← chu left13:02
← deronnax left13:02
← slidercrank left13:02
← zeroed left13:02
← chele left13:02
← jfr left13:02
← Gianormagantrous left13:02
← ogny left13:02
← roelmonnens left13:02
← Silmarilion left13:02
← rscata left13:02
← pks left13:02
← fluffystub left13:02
← mniip left13:02
← frobnic left13:02
← trobotham left13:02
← prg3 left13:02
← cust left13:02
← sparr left13:02
← idr0p left13:02
← perlpilot left13:02
← nanga left13:02
← M6HZ left13:02
← omnigoat left13:02
← ToeSnacks left13:02
← richardlitt left13:02
← teadrop_ left13:02
← twisted` left13:02
← mkoskar left13:02
← Arokh left13:02
Cavallari1 → Cavallari13:02
pks_ → pks13:02
m0f0x → nanga13:03
→ Marble68 joined13:03
nitemare → trobotham13:03
→ sbasso joined13:03
→ Stumbler joined13: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:03
→ d^sh joined13:04
→ netroxen joined13:04
Marble68 I branch off master, DevBranch- and over many days I make changes, commit and test, alter the smame files - commit test - etc13:04
→ dave0x6d joined13:04
→ jameser joined13:04
→ twisted` joined13: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” branch13:04
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 that13:05
→ ams__ joined13:05
Marble68 osse: Thank you! I will try that13:05
→ synthroid joined13:06
Marble68 Oh I think I see13:06
so I’m sitting on Dev, I branch it to “ToMerge”, then I reset ToMerge to master, keeping changes13:06
oh my gosh - it’s so simple when i see it. I’ve been trying to rebase and squash13:06
Thank you so much13:07
→ ok91 joined13:07
circ-user-zNiD2_ What if git log -S"a snippet" finds nothing? How can that code be in repository?13:07
→ sturner joined13:07
← synthroi_ left13:07
i7c What if you don’t repeat your question after five minutes?13:07
→ maroloccio joined13: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:08
← tarkus left13:08
→ m1dnight1 joined13:09
→ chardan joined13:09
→ chll__ joined13:09
→ ankit01ojha joined13:09
→ ThomasLocke joined13:09
→ rscata joined13:09
→ slidercrank joined13:09
→ achadwick joined13:09
→ Silmarilion joined13:09
→ M6HZ joined13:09
← maroloccio left13:10
→ maroloccio joined13:10
→ Gianormagantrous joined13:10
← chll_ left13:11
gitinfo set mode: +v13:11
← mda1 left13:11
perlpilot_ → perlpilot13:11
Vampire0 circ-user-zNiD2_, maybe the snippet is only present on another branch?13:12
→ mda1 joined13:12
→ ExoUNX joined13:13
→ chu joined13:13
← Faux left13:13
← holodoc left13:14
grumble → 14WAA001L13:14
→ GingerGeek joined13:14
→ chele joined13:14
→ fluffystub joined13:14
→ prg3 joined13:14
→ cust joined13:14
→ sparr joined13:14
→ idr0p joined13:14
→ omnigoat joined13:14
→ ToeSnacks joined13:14
→ teadrop_ joined13:14
→ richardlitt joined13:14
→ mkoskar joined13:14
→ TbobbyZ joined13:14
← sparr left13:14
← omnigoat left13:14
← mkoskar left13:14
→ sparr joined13:15
→ mkoskar joined13:15
→ omnigoat joined13:15
14WAA001L → grumble13:16
→ gaucheph joined13:16
← a3Dman left13:16
Gurkenglas_ → Gurkenglas13:17
→ tcorneli joined13:17
← cdown left13:17
← jstimm left13:17
→ circ-user-zNiD2 joined13:18
← masuberu left13:19
← TbobbyZ left13:19
← bilal_ left13:19
← jagob left13:19
← aax left13:19
→ stepho joined13:19
→ bilal joined13:20
← SadAdmin left13:20
← circ-user-zNiD2_ left13:21
→ relipse joined13:22
→ Arokh joined13:22
→ TheSimonator joined13:22
← dglambert left13:22
→ a3Dman joined13:23
→ Brski joined13:23
→ theoceaniscool_ joined13:23
← bilal left13:23
→ jstimm joined13:23
→ dglambert joined13:24
→ bilal joined13:24
→ CEnnis91 joined13:25
← CEnnis91 left13:26
← Arokh left13:26
← GingerGeek left13:26
← chele left13:26
← fluffystub left13:26
← prg3 left13:26
← cust left13:26
← idr0p left13:26
← ToeSnacks left13:26
← richardlitt left13:26
← teadrop_ left13:26
→ GingerGeek joined13:26
← GingerGeek left13:26
→ GingerGeek joined13:26
→ chele joined13:26
→ ToeSnacks joined13:26
← djb-irc left13:26
→ richardlitt joined13:27
→ CEnnis91 joined13:27
→ fluffystub joined13:27
→ teadrop_ joined13:28
→ borkr joined13:28
→ idr0p joined13:28
→ prg3 joined13:29
→ ResidentBiscuit joined13:29
← ok91 left13:29
← TomyLobo2 left13:29
→ MineCoins joined13:30
Blendify|afk → Blendify13:30
→ cust joined13:30
← dvaske left13:32
→ dfaught joined13:33
→ dvaske joined13:34
→ lipsumar joined13:34
→ ableto joined13:36
→ AaronMT joined13:36
Blendify → Blendify|afk13:37
← zeroed_ left13:38
→ zeroed joined13:38
→ _xor joined13:39
→ gugah joined13:39
← zerow left13:39
← Snugglebash left13:39
→ thiago joined13:42
← ResidentBiscuit left13:42
← johnflux left13:43
← lipsumar left13:43
← texasmynsted left13:44
← zturner left13:44
→ holodoc joined13:45
→ valize joined13:45
→ __xor joined13:45
→ lindenle joined13:45
→ robotroll joined13:45
← goTAN left13:46
→ texasmynsted joined13:46
← stepho left13:46
→ Snugglebash joined13:46
← kurkale62 left13:46
→ lipsumar joined13:47
→ kurkale6ka joined13:47
← D630 left13:47
→ jagob joined13:47
← _xor left13:48
← dersand left13:48
← dvaske left13:48
← MineCoins left13:48
← __xor left13:48
← lipsumar left13:49
ash_workz I seem to encounter broken syntax highlighting for php files on git... often.... recently13:50
anyone know what the deal is with that?13:50
← TheSimonator left13:51
← mostlybadfly left13:51
tobiasvl on git?13:51
you mean github?13:51
maybe ask in #github13:51
→ Es0teric joined13:52
Vampire0 or write a mail to their support, they are pretty responsive13:52
tobiasvl !sgc13:54
gitinfo For bug reports, feature requests, suggestions for improvement, or specific problems with an individual repo (or gist, etc.), please contact support via [email@hidden.address] or https://github.com/support - support tries to answer all questions within 24 hours, including weekends and holidays.13:54
→ zturner joined13:54
→ azerus joined13:54
→ kurkale61 joined13:55
→ PioneerAxon joined13:56
← PioneerAxon_ left13:56
→ lipsumar joined13:56
→ cdown joined13:56
← kurkale6ka left13:57
→ soto joined13:57
→ askb joined13:57
→ marcogmonteiro joined13:57
→ watabou joined13:58
← askb left13:58
→ bronson joined13:59
→ djb-irc joined13:59
→ rasto joined14:00
→ Qilibrun joined14:00
← Marble68 left14:00
→ ok91 joined14:01
← dec0n left14:02
← lipsumar left14:02
← watabou left14:03
← circ-user-zNiD2 left14:03
→ MineCoins joined14:03
← bronson left14:03
→ User458764 joined14:04
→ kelvah joined14:05
→ Tobbi joined14:05
← redeemed left14:06
← Guest67506 left14:06
→ roelmonnens joined14:06
→ JeroenT joined14:07
← JeroenT left14:07
→ JeroenT joined14:08
→ Wefhi joined14:08
← dglambert left14:08
→ polyrob_ joined14:08
← roelmonn_ left14:09
ash_workz Vampire0: tobiasvl thanks, I wrote in14:09
but can someone confirm that it's broken? Maybe it's just me? https://github.com/php-fig/http-message/blob/master/src/ServerRequestInterface.php14:09
← roelmonnens left14:10
← JeroenT_ left14:10
← polyrob left14:10
polyrob_ → polyrob14:10
→ Noldorin joined14:11
→ otiose joined14:11
← royal_screwup21 left14:12
Vampire0 ash_workz, well, the file ist not valid, is it? The php tag is not closed14:12
ash_workz Vampire0: that's valid14:12
← JeroenT left14:12
ash_workz Vampire0: ?> is optional and not recommended14:12
→ TbobbyZ joined14:13
→ royal_screwup21 joined14:13
Vampire0 Ah, ok, didn't know that14:13
ash_workz Vampire0: unless you which to switch out of php specifically14:13
Vampire0: like for a template14:13
Vampire0 Then I'd say yes, it is broken14:13
ash_workz yay @not just me!14:14
grawity it's not a template, it just has code14:14
DelTree characters between "?>" and EOF can be really annoying...14:14
grawity it's very common to omit ?> in files containing only code14:14
because otherwise you can accidentally add newlines or spaces after it14:14
→ stash_ joined14:14
ash_workz Vampire0: ^ that can break some require/include implemenatations, iirc14:15
grawity it doesn't break require/include itself, but it can screw up the final page output14:15
Vampire0 I see14:15
ash_workz ah14:15
grawity like, when you try to load a library using require(), you expect it to only load code and nothing else14:16
if it also accidentally outputs some text (even spaces), that'll cause problems with header(), and can corrupt the actual file your page is outputting14:17
ash_workz thanks for checking... I wasn't getting traction in #github14:17
Vampire0 In gist creation it highlights correctly. gist display is also wrong14:17
→ dglambert joined14:17
← sevenever left14:18
ash_workz yeah, but it doesn't seem to be a problem across the board14:18
→ sevenever joined14:19
ash_workz I think14:19
(reloading)14:19
my connection seems to be really slow14:19
okay14:19
https://github.com/PuristPHP/purist/blob/rework/web/index.php14:19
looks fine there14:19
gitinfo set mode: +v14:21
← User458764 left14: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&t=996s) but not other talks. Are they going to be available?14:21
← Junior left14:22
← ok91 left14:23
→ lipsumar joined14:25
→ letranger joined14:25
→ jnewt joined14:25
→ jim joined14:25
← Snugglebash left14:26
→ durham joined14:26
→ TheSimonator joined14:27
← ronny left14:27
← Wefhi left14:27
← elect left14:28
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:29
← kelvah left14:29
← lipsumar left14:30
grawity Git has tools to rewrite the history – clone the repo, use `git filter-branch --subdirectory-filter=...` in the new clone14:30
cbreak jim: if you want, you can keep the history, but it will have a different form14:30
→ aax joined14:31
avar stash_: judging from the upload date they're still uploading it actively14:31
stash_: see https://www.youtube.com/user/github/videos14:31
jim how would you characterize this different form?14:31
cbreak ^^14:32
← sevenever left14:32
cbreak as grawity said, it'd involve history rewriting14:32
stash_ avar: oh, ok, I just need to wait. Thanks14:32
cbreak see the man page for a description on how subdirectory-filter works14:32
→ sevenever joined14:32
→ stepho joined14:32
avar stash_: did you go to the conference?14:33
← manuelschneid3r left14:33
← Brski left14:33
jim where was it?14:33
→ rkazak joined14:33
avar this time in brussels, belgium14:33
they're alternating between the US & EU14:33
stash_ avar: nope, that's why I wanted to see the videos14:33
jim ahh14:33
avar "Scaling Mercurial at Facebook: Insights from the Other Side" was really interesting14:34
→ ok91 joined14:35
← oskarkv left14:36
→ mar77i_ joined14:36
← theoceaniscool_ left14:37
← stepho left14:37
→ dreiss joined14:38
stash_ avar: yeap, that's exactly what I'm interested in :)14:38
← letranger left14:39
← mar77i left14:39
→ zivester joined14:39
frobnic_ → frobnic14:39
← Es0teric left14:40
→ marianina8 joined14:40
← tcorneli left14:40
→ Es0teric joined14:41
→ kelvah joined14:41
← ok91 left14:41
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 about14:43
mm, not like there's active discussion here I'm interrupting14:44
-cut-14:44
For a topic list, I talked about:14:44
Scale:14:44
- Pushrebase – server side rebasing during push14:44
- Remotefilelog – on-demand downloading of file contents to the store14:44
- Infinitepush – redirecting certain pushes to be stored as bundles in a scalable blob store; and the ability to automatically push client commits to this store14:44
UX:14:44
- Smartlog – better default log UI that skips uninteresting commits14:44
- Absorb – automatic detection and amending of pending changes into a stack of commits14:44
- Sparse profiles – versions sparse configs that automatically apply as users move around the repo14:45
- ScmQuery – a Thrift service for answering source control questions14:45
→ ResidentBiscuit joined14:45
avar All of them except ScmQuery are available here: https://bitbucket.org/facebook/hg-experimental14:45
-cut-14:45
all very interesting stuff14:45
→ clickys joined14: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:45
← ThomasLocke left14: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 error14:46
avar how did you create user.name & user.email ?14:46
clickys $ git config --global user.name14:47
→ gareppa joined14:47
Vampire0 clickys, you didn't set a value, that is not helpful14:47
→ mizu_no_oto joined14:47
clickys i did set14:47
$ git config --global user.name "clickys"14:47
Vampire0 aah, ok14:48
clickys git config --global user.mail "mymail"14:48
← a3Dman left14:48
avar does 'git config user.name' & user.email return those values back to you?14:48
clickys no14:49
mnaybe i did something wrong with git remote ?14:49
← sbulage left14:49
Vampire0 clickys, this has nothing to do with the remote, it is a purely local problem14:50
→ spark` joined14:50
clickys i did use this git checkout -b new-dev origin/new-dev14:50
because when i clone my master branch i couldnt checkout to my working branch14:50
Vampire0 clickys, can you show the output of `git config -l`?14:50
clickys yes one sec pols14:51
← miczac left14:52
clickys https://gist.github.com/Clickys/ad37f94c31cd2ecb631f1e30f8c8494a14:52
Vampire0 clickys, and `git config user.name` does *not* return "clickys"? o_O14:53
clickys yes it does now14:53
Vampire0 clickys, now or not?14:54
clickys but still wont let me commit14:54
it does return clickys14:54
← dsdeiz left14:54
Vampire0 clickys, it lets you commit, it just tells you that some generated defaults are used14:54
clickys, how do you commit? !repro14: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 see14:54
← rscata left14:54
← TheSimonator left14:56
→ ertes joined14:56
→ TheSimonator joined14:56
clickys https://gist.github.com/Clickys/ad37f94c31cd2ecb631f1e30f8c8494a14:56
→ seveneve3 joined14:58
Vampire0 ah, ok, it actually really doesn't commit as it cannot make up an email address, never seen *that* before14:58
← kurkale61 left14:58
→ tnecniv joined14:58
clickys maybe its because i first clone the repo14:58
RichiH neithe14:58
RichiH r14:58
clickys did my changes14:58
add the changes and then created the user?14:58
Vampire0 clickys, what about `GIT_TRACE=1 git commit -m "Calendar Works"`?14:59
← sevenever left14:59
RichiH clickys: no, it's because you need to configure an email address14:59
→ watabou joined14:59
Vampire0 clickys, no, that would be fine14:59
RichiH, he did interestingly, we saw the git config -l output14:59
RichiH huh14:59
RichiH shuts up and grabs some popcorn14:59
RichiH carry on, folks14:59
→ notebox joined14:59
Vampire0 clickjack, I know it will also not work, but I want to see the output15:00
→ kurkale61 joined15:00
clickys ?15:00
→ a3Dman joined15:00
clickys git checkout remotes/origin/new-dev15:00
maybe this is wrong ?15:00
→ d10n-work joined15:01
← Silmarilion left15:01
← ertes left15:01
_ikke_ yes15:01
→ sbulage joined15:01
_ikke_ You do not want to directly checkout remote tracking branches15:01
← ertes-w left15: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 problem15:01
_ikke_ git checkout HEAD@{1}15:02
← stash_ left15:02
Vampire0 clickys, even if you are on a detached head, the commit should see your identity15:02
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:02
← seveneve3 left15:03
← robotroll left15:03
→ TomyLobo2 joined15:03
→ seveneve1 joined15:03
Vampire0 _ikke_, he checked out a local branch from the remote. He gave that command here before and the transcript also looks like that15:03
← Gloomy left15:03
← watabou left15: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:04
← thiago left15:05
Vampire0 clickys, ah, blind, now I see it15:05
clickjack, you configured user.mail instead of user.email15:05
clickys, of course, not clickjack15:06
clickys omg15:06
iam so stupid15:06
clickjack somebody called?15:07
← dreiss left15:07
Vampire0 clickjack, nope, wrong tab completion, sorry15: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
← sturner left15:07
Vampire0 clickys, !where15: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 !rtb15:08
← seveneve1 left15:08
clickjack no worries :)15:08
→ seveneve1 joined15:08
clickys i was doint git branch it was showing only the master15:08
i should have used the git checkout -b branchname origin/branchname ?15:08
← Es0teric left15:08
Vampire0 clickys, `git branch -a`15:09
→ peterbecich joined15:09
← wandering_vagran left15:09
clickys it was showing the master and remotes/origin/head / master / newDev15:09
Vampire0 clickys, you read the trigger I sent, didn't you?15:10
← kegster left15: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/branchname15:10
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 already15:11
← lordjancso left15:11
clickys ty so much vampire15:11
Vampire0 clickys, but doing it explicitly with `git checkout -b branch origin/branch` is also fine15:11
clickys, yw15:11
→ bronson joined15:12
← fluffystub left15:14
clickys to push my changes on github it should go git push origin new-dev ?15:14
← gareppa left15:14
→ madewokherd joined15:15
← kurkale61 left15:15
← Cabanossi left15:15
Vampire0 clickys, if your local branch has the remote branch set as upstream, `git push` is enough15:15
← Blendify|afk left15:15
clickys oki sir15:16
← synthroid left15:16
clickys <- noob15:16
→ seveneve2 joined15:16
Vampire0 clickys, no problem15:16
clickys, we all were15:16
← jstimm left15:17
← royal_screwup21 left15:17
→ Cabanossi joined15:17
→ royal_screwup21 joined15:18
→ dsdeiz joined15:19
← dsdeiz left15:19
→ dsdeiz joined15:19
← seveneve1 left15:19
→ dreiss joined15:21
→ ozcanesen joined15:22
← dreiss left15:22
← gaucheph left15:22
→ kegster joined15:22
← chele left15:23
→ elect joined15:23
← borkr left15:24
→ circ-user-zNiD2 joined15:24
→ borkr joined15:24
← borkr left15:27
→ borkr joined15:30
← Shock_ left15:30
← borkr left15:30
→ brent__ joined15:30
→ borkr joined15:30
← mattcen left15:31
← clickys left15:31
→ jagobdue joined15:31
← brent__ left15:32
→ gaucheph joined15:32
→ gugah_ joined15:32
→ brent__ joined15:32
→ dsdeiz_ joined15:33
→ mattcen joined15:33
→ sturner joined15:33
← gugah left15:34
← dsdeiz left15:34
← HoierM left15:35
theskillwithin blah I do git stash and it doesn't stash all the things!15:35
→ onehrxn_ joined15:37
_ikke_ git stash does not stash untracked files by default15:37
Vampire0 but you can tell it to do so15:37
← sea-gull1 left15:38
← sea-gull2 left15:38
→ synthroid joined15:38
← rkazak left15:38
theskillwithin Vampire0 how?15:38
← sbulage left15:39
Vampire0 theskillwithin, man git stash15:39
gitinfo theskillwithin: the git-stash manpage is available at https://gitirc.eu/git-stash.html15:39
theskillwithin thats what i have been looking at =X15:39
Vampire0 theskillwithin, -u I think15:39
← bronson left15:39
← onehrxn left15:39
Vampire0 theskillwithin, or --include-untracked in long15:39
theskillwithin :boom: thank you!15:40
Vampire0 theskillwithin, yw15: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:40
← neunon left15:41
theskillwithin Vampire0 thx15:41
← amrits left15:41
→ neunon joined15:42
→ dreiss joined15:42
← bilal left15:44
→ bilal joined15:44
→ Snugglebash joined15:45
→ rkazak joined15:45
→ HoierM joined15:46
→ jstimm joined15:47
← HoierM left15:47
→ HoierM joined15:47
← HoierM left15:48
→ HoierM joined15:48
← HoierM left15:49
← bilal left15:49
→ bilal joined15:49
→ HoierM joined15:49
→ Nilesh_ joined15:49
← HoierM left15:50
→ HoierM joined15:50
← HoierM left15:51
→ HoierM joined15:51
← gaucheph left15:52
← HoierM left15:52
→ HoierM joined15:52
← HoierM left15:53
← jozwior left15:53
← flaviodesousa left15:53
→ HoierM joined15:53
← borkr left15:54
← HoierM left15:54
→ HoierM joined15:54
← IRQ` left15:55
← HoierM left15:55
← durham left15:55
→ HoierM joined15:56
← Snugglebash left15:56
← HoierM left15:56
← peterbecich left15:56
→ warfront1 joined15:56
→ HoierM joined15:56
→ onehrxn joined15:57
← HoierM left15:57
warfront1 How would i add a log file formatted like this to my gitignore mylogs.log.2017-05-0315:57
→ borkr joined15:57
→ HoierM joined15:57
→ ShapeShifter499 joined15:58
Vampire0 warfront1, `mylogs.log.*`?15:58
← tnecniv left15:58
→ gaucheph joined15:58
← mikecmpbll left15:58
← HoierM left15:58
Vampire0 warfront1, or `mylogs.log.*-*-*`?15:58
→ HoierM joined15:58
Vampire0 warfront1, maybe adding a specific directory where it can occur like for the root directory `/mylogs.log.*-*-*`15:59
← HoierM left15:59
→ HoierM joined15:59
→ watabou joined15:59
→ thiago joined16:00
→ Stumbler_ joined16:00
← onehrxn_ left16:00
→ durham joined16:00
← murii_ left16:00
← HoierM left16:00
← ankit01ojha left16:00
→ HoierM joined16:01
← CarlFK left16:01
← Stumbler left16:01
→ mel00010 joined16:01
← HoierM left16:01
← gaucheph left16:02
warfront1 mylogs.log.*-*-* worked16:02
→ HoierM joined16:02
← HoierM left16:03
← robattila256 left16:03
→ HoierM joined16:03
← zturner left16:04
← HoierM left16:04
→ Starky joined16:04
Vampire0 warfront1, sure, it will exclude those files no matter where they occur16:04
warfront1 Exactly what I wanted, thanks!16:04
→ HoierM joined16:04
→ zturner joined16:04
→ Snugglebash joined16:05
warfront1 For some reason mylogs.log.* was not working16:05
But the second one you provided worked16:05
← HoierM left16:05
→ HoierM joined16:05
← warfront1 left16:06
← HoierM left16:06
← watabou left16:06
→ HoierM joined16:06
← Starky left16:07
→ qqx joined16:07
→ Starky joined16:07
← HoierM left16:07
Vampire0 couldn't be, but well, gone with the wind. !next16:07
gitinfo Another satisfied customer. NEXT!16:07
→ Shock_ joined16:08
→ HoierM joined16:08
← HoierM left16:09
→ Gustavo6046 joined16:09
→ HoierM joined16:10
← Starky left16:10
← HoierM left16:10
→ Starky joined16:10
← Starky left16:10
→ Starky joined16:10
→ HoierM joined16:11
← HoierM left16:11
→ robotroll joined16:11
→ HoierM joined16:11
← HoierM left16:12
→ HoierM joined16:12
← robotroll left16:13
← HoierM left16:13
→ boombatower joined16:14
← Snugglebash left16:15
← dsdeiz_ left16:17
→ justin2 joined16:17
mniip_ → mniip16:17
← Tobbi left16:18
→ fenikso joined16:19
← fenikso left16:20
← seni left16:20
← jameser left16:21
← nanga left16:21
→ nitric joined16:22
→ jozwior joined16:22
← rchavik left16:22
→ nanga joined16:22
← nanga left16:22
→ nanga joined16:22
← jstimm left16:22
→ fenikso joined16:23
→ jay-m joined16:23
→ gnixev joined16:23
← jozwior left16:24
← salamanderrake left16:24
← mattcen left16:24
← zeroed left16:24
← skered left16:24
← prg3 left16:26
→ synthroi_ joined16:27
→ tarkus joined16:28
← cstratak left16:29
→ prg3 joined16:29
← kelvah left16:29
← synthroid left16:30
→ skered joined16:30
← durham left16:30
→ mattcen joined16:32
← TomyLobo2 left16:34
→ Introoter joined16:34
→ Snugglebash joined16:34
→ TomyLobo2 joined16:34
→ svm_invictvs joined16:35
← royal_screwup21 left16:36
← MineCoins left16:36
← dreiss left16:37
→ royal_screwup21 joined16:37
→ King_Hual joined16:38
← zturner left16:38
← ferr left16:39
← barbos left16:39
← prg3 left16:40
→ barbos joined16:40
→ jstimm joined16:41
← madewokherd left16:42
← tvw left16:42
→ prg3 joined16:42
mar77i_ → mar77i16:42
← notebox left16:43
← netroxen left16:43
→ Murii joined16:46
← rkazak left16:47
→ dsdeiz joined16:47
← mizu_no_oto left16:47
← achadwick left16:47
→ YuGiOhJCJ joined16:48
→ MineCoins joined16:51
→ durham joined16:52
← dsdeiz left16:52
← jay-m left16:54
→ gopar joined16:57
← aboccia_ left16:59
→ TheMontyChrist joined16:59
→ aboccia_ joined16:59
← TheMontyChrist left16:59
→ TheMontyChrist joined16:59
← TheMontyChrist left16:59
→ TheMontyChrist joined16:59
TheMontyChrist test16:59
suppose I branch something. I add another project that's for debug. however, change code in the "main" project17:00
how do I merge in all the changes except my test project?17:00
← ableto left17:00
← TheSimonator left17:01
← ShapeShifter499 left17:01
← mda1 left17:02
→ GT4066 joined17:03
→ SteffanW joined17:03
← imack left17:03
→ mda1 joined17:03
→ durham_ joined17:04
→ overlord_tm joined17:04
→ zzz joined17:06
→ TheSimonator joined17:06
← durham left17:07
← marcogmonteiro left17:08
← aielima left17:08
Vampire0 TheMontyChrist, could you rephrase the question? What do you call a project?17:09
→ rkazak joined17:10
→ zturner joined17:11
← AndChat-484449 left17:12
← duderonomy left17:13
← Sound left17:13
TheMontyChrist main->project one17:14
mybranch(branch of main)->project one, project two17:14
I make a few hacks to project one, but I added project 2 for debug17:14
→ mostlybadfly joined17:14
TheMontyChrist I want to merge only those changes in project 1 back into "main"17:14
ugly hack is to remove project 2 commit merge, and put project 2 back17:15
→ NeverDie joined17:15
TheMontyChrist each project is it's own directory17:15
probably not possible17:16
Vampire0 TheMontyChrist, you cannot merge only parts of the repository files17:16
TheMontyChrist I didn't think so either.17:16
but I had to ask17:17
← durham_ left17:17
osse i would rewrite my branch to leave out the debug thingy before merging17:17
Vampire0 TheMontyChrist, you probably shouldn't have added project 2 to that repo actually, but use some of !subrepo17: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 all17:17
→ durham joined17:17
← barbos left17:18
→ circ-user-zNiD2_ joined17:18
← chardan left17:19
→ iamashishkebab2 joined17:19
o11c TheMontyChrist: cherry pick?17:19
← sbasso left17:19
← circ-user-zNiD2 left17:20
→ sbasso joined17:20
← bitmod left17:20
→ mizu_no_oto joined17:20
→ miczac joined17:22
gitinfo set mode: +v17:22
← matoro left17:24
→ User458764 joined17:24
→ matoro joined17:24
← sbasso left17:24
→ Gloomy joined17: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:25
osse texasmynsted: you mean they force-push so that origin/foo is changed?17:26
texasmynsted correct17:26
← bilal left17:26
← maroloccio left17:26
texasmynsted assuming I can not "prevent" them from doing this17:26
perlpilot complain to those people about their anti-social behavior17: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:26
texasmynsted changing their behavior is a more long term solution17:27
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/foo17:27
← Snugglebash left17:27
→ TomyLobo joined17: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.html17:28
→ hashpuppy joined17:28
← acetakwas left17:28
← Cabanossi left17:29
→ nixjdm joined17:29
← telephone left17:29
→ telephone joined17:31
← telephone left17:31
→ telephone joined17:31
→ Cabanossi joined17:32
→ foo joined17:32
← MineCoins left17:33
← iamashishkebab2 left17:33
→ iamashishkebab2 joined17:33
→ MDA2 joined17:34
→ TheSimon_ joined17:34
← TheSimonator left17:35
← gopar left17:35
→ bilal joined17:35
← elect left17:35
→ gopar joined17:35
← relipse left17:36
← mda1 left17:36
→ PettanShoutaKun_ joined17:37
→ jetole joined17:37
← pbandark left17:37
PettanShoutaKun_ git tag -a -m 'Auto-Tagged by Jenkins CI' .... fatal: too many params17:38
why :\17:38
is there some issue with the ' ?17:38
→ xall_ joined17:39
strayArc- → strayArch17:40
← mel00010 left17:40
← jetole left17:40
→ bronson joined17:40
→ jetole joined17:41
← gopar left17: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 joined17:41
→ maroloccio joined17:42
rwp jetole, git checkout filename17:42
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:42
jetole It says nothing to commit, working directory clean17: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:43
texasmynsted wow I had not seen that in the docs before17:44
thank you17:44
jetole nvm. I checked the wrong file into the repo17:44
Thanks rwp17:44
→ dreiss joined17:44
← jetole left17:44
← bronson left17:45
← romank left17:46
→ qpdb joined17:46
→ clickys joined17:47
rwp Glad to hear it worked out. :-)17:47
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 joined17:48
PettanShoutaKun_ yes.17:48
although technically it's being punched in by a gradle script17:48
→ grover joined17:48
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 joined17:49
→ salamanderrake joined17:50
clickys it will pull the master branch as well ?17:50
← jagob left17:51
← synthroi_ left17:52
← xall_ left17:52
clickys i just want to pull a certain branch17:52
→ misosoup joined17:52
clickys not all branches17:52
← gopar left17:54
← jeffreylevesque left17:54
← mikecmpbll left17:54
→ relipse joined17:55
→ gopar joined17:55
← _ADN_ left17:55
→ mikecmpbll joined17:55
o11c clickys: as a rule, you should always fetch (not pull) all enabled branches17:55
pull is just fetch + merge17:56
only the active branch can be merged17:56
clickys git pull origin <branch name > ?17:56
→ dsdeiz joined17:56
← dsdeiz left17:56
→ dsdeiz joined17:56
→ davimore joined17:56
→ cdg joined17:57
o11c clickys: that *exists*, but it's not necessary to use it17:58
→ durham_ joined17:59
← Nilesh_ left17:59
← ahrs left18:00
← dhollinger left18:00
→ MineCoins joined18:01
← User458764 left18:01
← dsdeiz left18:01
→ Sasazuka joined18:02
→ Es0teric joined18:02
Es0teric how do i undo a commit but keep the changes?18:02
_ikke_ git reset HEAD~18:02
→ dhollinger joined18:02
← durham left18:03
Es0teric _ikke_ git reset HEAD~?18:03
← sz0 left18:03
_ikke_ git reset HEAD~18:03
It resets the branch back one commit, but keeps the changes, just what you want18:03
→ acetakwas joined18:03
Es0teric perfect18:04
thanks!18:04
← sturner left18:04
← gopar left18:05
← slidercrank left18:05
→ gopar joined18:05
← TomyLobo left18:05
← najemnyvrah left18:06
→ synthroi_ joined18:06
→ cads joined18:08
→ Agjz joined18:09
← synthroid left18:09
← mquin left18:10
← tarkus left18:11
→ mquin joined18:11
← a3Dman left18:11
← qguv left18:12
→ sturner joined18:13
← gopar left18:13
← MineCoins left18:13
→ gopar joined18:14
→ Ryanar joined18:14
← mizu_no_oto left18:15
→ ahrs joined18:15
← clickjack left18:16
→ tarkus joined18:18
→ ClassyGrrrl joined18:18
→ User458764 joined18:18
← jstimm left18:18
→ a3Dman joined18:19
→ mizu_no_oto joined18:19
→ livingstn joined18:20
← Gloomy left18:20
→ bronson joined18:21
→ peterbecich joined18:22
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 joined18:24
← m4sk1n left18:25
gitinfo set mode: +v18:25
Hashtag Can someone help me with the error "fatal: Not possible to fast-forward, aborting."?18:25
I have sagemath installed and I'm just trying to upgrade it.18:26
← a3Dman left18: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 joined18:26
← gopar left18:27
← Bock left18:27
→ nascentmind joined18:27
→ gopar joined18:27
→ dilijev joined18:28
← nixjdm left18:29
← jagobdue left18:29
← Es0teric left18: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 joined18:30
← Cabanossi left18:31
→ Es0teric joined18:31
← foo left18:31
→ foo joined18:31
→ cagomez joined18:31
_ikke_ nascentmind: b1 is an ancestor of b218:31
→ Cabanossi joined18:31
_ikke_ What do you want to achieve?18:32
Hashtag It seems to be working after I checked out the develop branch...18:32
← gnixev left18:33
← User458764 left18:34
→ MineCoins joined18:34
nascentmind I want add my changes from b2 to b1.18:34
_ikke_, I want to add my changes from b2 to b1.18:34
← avar left18:35
→ gnixev joined18:35
→ synthroid joined18: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:35
_ikke_ then merge it18:36
← bronson left18:36
_ikke_ (it will result in a fast-forward merge)18:36
→ avar joined18:36
← avar left18:36
→ avar joined18:36
→ a3Dman joined18:36
← overlord_tm left18:36
→ _ADN_ joined18:36
nascentmind _ikke_, merge after I finish rebase, correct?18:37
← jnewt left18:37
_ikke_ nascentmind: There is nothing to rebase18:38
→ raijin joined18:38
_ikke_ nascentmind: the branch is already on that base if you follow me18:38
← synthroi_ left18:38
← chll__ left18:38
nascentmind _ikke_, I have commits in b2 and b1.18:38
← Introoter left18:38
→ Sound joined18:39
Sound → Guest8116318:39
← Guest81163 left18:39
nascentmind _ikke_, ah.. yes. Got it.18:40
→ manuelschneid3r joined18:40
← SteffanW left18:40
← durham_ left18:40
→ durham joined18:41
→ TomyLobo joined18:41
→ nixjdm joined18:42
← TomyLobo2 left18:42
→ Doginal joined18:43
→ cha1800 joined18:43
→ faisal joined18:43
← Gurkenglas left18:43
→ zeroed joined18:44
← zeroed left18:44
→ zeroed joined18:44
← faisal left18:44
← Hashtag left18:44
nascentmind _ikke_, If I have changes in both b1 and b2 then rebase should be the right approach?18:45
← Gustavo6046 left18:45
→ kexmex joined18:45
nascentmind _ikke_, changes/commits18:45
← ClassyGrrrl left18:45
_ikke_ Well, a rebase never adds changes to another branch, it just moves the rebase branch18:46
nascentmind: so you will have to always merge18:46
← rebrec left18:46
← cha18 left18:46
→ rebrec joined18:46
nascentmind _ikke_, Yes I understand merge after that but a rebase before a merge is compulsory, correct?18:47
_ikke_ no18:47
← djb-irc left18:48
_ikke_ it's optional18:48
← TheSimon_ left18:48
→ imack joined18:48
→ regedit joined18:48
← kegster left18:49
→ shgysk8zer0 joined18:49
← sturner left18:51
Soni how well does git work for BSON instead of JSON?18:52
_ikke_ will, I guess it does not diff well18:52
so merging etc is going to be hard18:52
but for the rest it should not be a problem18:52
Soni (I'd think it works about the same, even if BSON is binary, since BSON is uncompressed)18:52
→ shubhnik joined18:53
← Oatmeal left18:53
→ yohnnyjoe joined18:53
Soni _ikke_: I mean does the delta compression work?18:54
← iamashishkebab2 left18:54
→ planigan joined18:55
← gnixev left18:55
→ finalbeta joined18:56
_ikke_ I would expect so18:56
delta-compression does not care if data is binary or not18:56
→ gnixev joined18:57
← grover left18:57
→ D630 joined18:57
← gnixev left18:57
→ TheSimonator joined18:58
← yohnnyjoe left18:58
← nascentmind left18:58
← kexmex left18:59
→ Sound_ joined18:59
→ User458764 joined19:00
→ PaulCapestany joined19:00
← Cabanossi left19:01
→ Cabanossi joined19:01
← zeroed left19:02
→ ijafidnsfod joined19:03
→ kexmex joined19:03
→ MattMaker joined19:04
→ tyreld joined19:05
ash_workz fyi: github pushed a fix for the syntax highlighting issue19:05
← raijin left19:06
← cads left19:08
← PettanShoutaKun_ left19:08
→ Acerific joined19:08
← _ADN_ left19:09
_ikke_ what issue?19:10
Soni _ikke_: do Z-order curves delta compress better than linear and/or interlaced (uncompressed) images?19:12
→ LeBlaaanc joined19:12
_ikke_ Soni: I don't know that much about it19:12
← peterbecich left19:13
← Es0teric left19:14
→ Es0teric joined19:15
← finalbeta left19:15
→ finalbeta joined19:15
← caper left19:16
← dsdeiz left19:16
← Es0teric left19:17
→ Oatmeal joined19:17
→ Es0teric joined19:17
→ synthroi_ joined19:18
← synthroid left19:20
← h12o left19:20
← Sound_ left19:20
→ bilal_ joined19:21
← mostlybadfly left19:24
→ zeroed joined19:24
← bilal left19:24
← TomyLobo left19:25
→ fission6 joined19: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 branch19:25
how do i do that?19:25
grawity git checkout --theirs myfile19:25
← misosoup left19:26
fission6 grawity: you the man!19:27
← nixjdm left19:28
→ TomyLobo joined19:29
← Cabanossi left19:30
← Random832 left19:31
→ Cabanossi joined19:32
← cyphase left19:32
← Acerific left19:34
← sparr left19:36
→ sparr joined19:36
← _rgn left19:37
→ cyphase joined19:37
→ raynold joined19:38
← Stumbler_ left19:38
← TheSimonator left19:39
← MineCoins left19:41
fission6 how do i compare my local master to upstream, i want to do a diff, something is off19:41
← clickys left19:41
→ nixjdm joined19:41
oprypin fission6, git fetch; git diff origin/master19:41
→ chipotle joined19:42
→ Dougie187 joined19:42
→ Random832 joined19:42
→ _rgn joined19:43
fission6 that is making everything appear different?19:43
→ m4sk1n joined19:44
← royal_screwup21 left19:44
→ romank joined19:45
← tarkus left19:45
← cdown left19:46
→ royal_screwup21 joined19:46
→ dsdeiz joined19:46
← ijafidnsfod left19:46
grawity means it's in fact different19:47
maybe it differs in line endings (CRLF vs LF)19:47
→ h12o joined19:49
→ iamashishkebab2 joined19:50
← a3Dman left19:50
← dsdeiz left19:51
← cagomez left19:52
→ satifant joined19:52
→ cagomez joined19:52
→ hobodave joined19:54
← cagomez left19:56
→ Sound joined19:57
→ jen_ joined19: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:57
Sound → Guest8737019:57
Seveas jen_: crossposting is considered bad form :)19:58
→ TheSimonator joined19:58
oprypin git checkout a1b2c3d; do stuff; git checkout branch19:58
← King_Hual left19:59
jen_ Seveas: didn’t even realize there was a #git!20:00
ok sorry20:00
→ tnecniv joined20:00
← manuelschneid3r left20:02
← TomyLobo left20:02
→ manuelschneid3r joined20:02
→ Bennux joined20:03
← TbobbyZ left20:03
→ hobodave_ joined20:03
← manuelschneid3r left20:04
← synthroi_ left20:04
← hobodave left20:05
← circ-user-zNiD2_ left20:05
→ ijafidnsfod joined20:05
→ Tobbi joined20:06
→ a3Dman joined20:06
← schleppel left20:06
← jen_ left20:06
→ Guest50066 joined20:07
← hashpuppy left20:08
Guest50066 → gruetzkopf20:09
← shubhnik left20:10
← romank left20:10
← D630 left20:11
→ _noblegas joined20:11
← Murii left20:12
← navidr left20:13
→ plicki_ joined20:14
→ romank joined20:14
← Starky left20:16
← romank left20:16
→ ok91 joined20:16
→ Starky joined20:16
← Levex left20:17
→ romank joined20:17
→ cdown joined20:18
→ aielima joined20:18
→ chrisgeorge joined20:18
→ stoopkid joined20:18
→ otisZart joined20:18
← romank left20:18
otisZart is there a way to know which github repo was a project downloaded from, if it doesnt contain readme/license?20:18
so to get the original repo20:19
o11c otisZart: git remote20:19
← mizu_no_oto left20:19
grawity -v20:19
← NeverDie left20:19
o11c oh right20:19
← fission6 left20:20
otisZart o11c, and in the case git remove -v returns nothing?20:20
← zeroed left20:20
o11c s/remove/remote/20:21
← livingstn left20:21
otisZart ye, typo20:21
o11c otisZart: then you didn't clone a git repo20:21
→ dsdeiz joined20:21
otisZart o11c what if a user deleted the remote and removed readme/license and used it itself?20:21
grawity then you resort to googling20:22
otisZart so there's no actual way to know20:22
:/20:22
→ sitaram joined20:22
← sitaram left20:22
→ sitaram joined20:22
grawity well it's just a bunch of files, there are no other magic ties to the original repo20:23
I would suggest Github's own search but it's a bit awful20:23
otisZart ok I was curious about this case20:23
→ synthroid joined20:23
→ lipsumar joined20:26
← Guest87370 left20:26
← dsdeiz left20:26
→ Sound_ joined20:27
← MrWoohoo left20:27
← nixjdm left20:29
Vampire0 otisZart if the Readme was removed with a commit, you can simply look at the file in a previous commit20:29
→ peterbecich joined20:30
→ cagomez joined20:30
← Cabanossi left20:31
→ Cabanossi joined20:32
← Agjz left20:32
← BSaboia left20:35
← Bennux left20:35
← Ryanar left20:35
→ zeroed joined20:35
← rkazak left20:36
→ ngf joined20:36
→ bronson joined20:36
← mkoskar left20:37
← AaronMT left20:37
← ijafidnsfod left20:38
→ misosoup joined20:39
→ duderonomy joined20:40
← ExoUNX left20:41
← bronson left20:41
→ nixjdm joined20:41
← User458764 left20:42
← gugah_ left20:42
← Sasazuka left20:45
← Es0teric left20:46
← dglambert left20:46
→ Sasazuka joined20:47
← YuGiOhJCJ left20:49
← royal_screwup21 left20:50
→ iamasamosa joined20:50
← LeBlaaanc left20:50
← iamashishkebab2 left20:51
→ Es0teric joined20:51
← iamasamosa left20:51
→ iamashishkebab2 joined20:51
→ royal_screwup21 joined20:51
→ yqt joined20:52
→ TbobbyZ joined20:53
← synthroid left20:53
osse otisZart: There's a limit to however many "what if"s a git reoo can endure :P20:53
→ iamasamosa joined20:54
→ rkazak joined20:54
→ raijin joined20:56
→ dsdeiz joined20:56
← misosoup left20:56
← iamashishkebab2 left20:57
→ m0viefreak joined20:59
→ TikityTik joined21:00
← h12o left21:00
← chrisgeorge left21:00
← dsdeiz left21:01
← zivester left21:01
_ikke_ WHat's the upperbound?21:02
← zzz left21:02
→ livingstn joined21:02
Seveas 375891421:03
→ p14nd4 joined21:03
← TheMontyChrist left21:04
→ zzz joined21:05
← ozcanesen left21:05
← justin2 left21: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:06
grawity that's normal21:07
you can merge master back into br1, but why21: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:08
← cagomez left21:08
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 branch21:10
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 log21:13
← iamasamosa left21:13
← Cavallari left21:14
rwp p14nd4, Nope. ls -l .git/refs/heads/ and see that those branches are all separate files.21:14
→ askb joined21:15
grawity that has nothing to do with refs21:15
← tnecniv left21:15
grawity yes, you could rebase the feature branch like that21:15
← thiago left21:15
grawity annoys the users even more than merging master repeatedly, though21: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 branch21:17
that way, they'll get a nasty message21:17
→ Arokh joined21: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:18
→ tnecniv joined21:20
→ nevodka joined21:21
→ Levex joined21:21
← soto left21:21
← Levex left21:21
p14nd4 i think that git checkout br1; git merge --ff-only master ; git push gives me what i want21:22
doesn't appear to actually create a new commit, just updates the HEAD ref of br1 to point to master HEAD21:23
rwp That will sync br1 up with master at this moment. But the next commit to master will not appear on br1.21:23
← nixjdm left21:24
p14nd4 but after such a master commit, couldn't i do the same thing again?21:24
← rkazak left21:24
→ Snugglebash joined21:25
← Klumben left21:25
← NeXTSUN left21:25
→ HoierM joined21:26
← HoierM left21:26
← cdown left21:26
rwp Yes. You would need to do that *each and every time*. Is that what you want?21:26
→ HoierM joined21: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
← HoierM left21:27
→ Gurkenglas joined21:27
p14nd4 doesn't sound so bad :)21:28
← shgysk8zer0 left21: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 nail21:28
→ iamashishkebab2 joined21:29
→ justin2 joined21:29
← Es0teric left21: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-another21:29
doesn't go as planned.21:29
← Cabanossi left21:30
→ dsdeiz joined21:31
← dsdeiz left21:31
→ dsdeiz joined21:31
→ Klumben joined21:31
← iamashishkebab2 left21:32
→ kadoban joined21:32
→ Cabanossi joined21:32
→ iamashishkebab2 joined21:32
← ngf left21:33
← dsdeiz left21:35
p14nd4 Gurkenglas: https://try.github.io/levels/1/challenges/1 maybe?21:36
Gurkenglas Looks good, thanks.21:37
p14nd4 but google will be your friend21:37
→ NeXTSUN joined21:38
p14nd4 probably the 10,000th time this has been linked in here, but: https://xkcd.com/1597/21:38
← iamashishkebab2 left21:39
← Sythrik left21:39
oprypin - how i feel about perforce21:40
→ basiclaser joined21:40
← Spacew00t left21:41
← acetakwas left21:42
→ fqoh joined21:43
→ Spacew00t joined21:44
→ zedka joined21:44
→ roar joined21:44
← relipse left21:45
← roar left21:45
→ roar joined21:45
← Dougie187 left21:45
← Spacew00t left21:45
← dilijev left21:46
← dfaught left21:46
→ Spacew00t joined21:48
→ Darren_ joined21:49
← Sound_ left21:50
← grumble left21:50
→ Marumarsu joined21:50
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
← a3Dman left21:51
→ grumble joined21:51
→ h12o joined21:51
← MattMaker left21:54
← ski7777 left21:55
← h12o left21:56
← hobodave_ left21:58
→ masuberu joined21:58
← masuberu left21:58
← Cabanossi left22:00
→ a3Dman joined22:00
← lightstalker left22:00
← zeroed left22:00
→ jnewt joined22:00
→ Cabanossi joined22:01
→ lightstalker joined22:02
→ dsdeiz joined22:05
← dsdeiz left22:05
→ dsdeiz joined22:05
← livingstn left22:05
→ thiago joined22:07
← roar left22:08
→ roar joined22:09
→ raspado joined22:09
← dsdeiz left22:10
→ h12o joined22:11
→ robattila256 joined22:13
← brent__ left22:14
→ brent__ joined22:14
← h12o left22:16
← rnsanchez left22:16
← brent__ left22:23
Soni does git support "merge helpers" for binary files?22:23
say I have a binary format that supports merge metadata22:23
Seveas yes, git supports that22:24
see the 'Performing a three-way merge' section in man gitattributes22:24
gitinfo the gitattributes manpage is available at https://gitirc.eu/gitattributes.html22:24
→ Bucciarati joined22:26
Soni cool22:27
← NeXTSUN left22:27
→ sythe joined22:27
belak Is there a way to check out any files which were changed (and added to the index) into a separate directory?22:29
I found git-checkout-index but I'm not sure how to do it into a different directory22:30
→ oskarkv joined22: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:30
→ roelmonnens joined22: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:31
If there's a better way to do this, I'm all ears22:32
→ h12o joined22:32
← NightMonkey left22:34
o11c belak: can your linter operate on stdin?22:34
belak Uh, I'm not sure22:34
o11c are you assuming the real working tree has unstaged modifications that you *don't* want to link?22:34
← nevodka left22:35
← roelmonnens left22:35
← TheSimonator left22:35
belak Yes22:35
And yes22:35
→ Atm0spher1c joined22:36
→ safe joined22:36
← h12o left22:36
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 way22:37
o11c belak: I usually use `git diff --name-only` for this kind of things22:37
→ singlerider joined22:37
o11c doesn't remember which arguments to pass to get the difference between HEAD and index, etc22:37
belak I mean, I'd need the full contents of the file for linting though22:37
OH I see22:38
Using diff to get the file names22:38
o11c yeah, then whatever else to get the contents22:38
← apotry left22:38
← peterbecich left22:39
belak alternatively, git diff --name-only | git checkout-index --stdin22:39
With the proper options to git-diff22:39
Seveas and --prefix to make it spit the files in a separate directory22:39
belak Yep22:40
Cool22:40
→ dsdeiz joined22:40
← dsdeiz left22:40
→ dsdeiz joined22:40
← cdg left22:41
← Snugglebash left22:41
→ cagomez joined22:42
belak git diff --name-only --cached | git checkout-index --stdin --prefix=/tmp/belak-git-test/22:43
Worked amazing22:43
Thanks!22:43
← CEnnis91 left22:43
→ johnnyfive joined22:44
singlerider Any clues about how to sign a commit with a hardware token while dev22:44
eloping in a VM?22:44
← dsdeiz left22:45
Seveas singlerider: give the vm access to the usb port the token is on?22:46
singlerider Is that a thing that's possible on an AWS box?22:47
I could probably figure it out with VirtualBox, etc22:47
← gopar left22:48
→ gopar joined22:48
o11c singlerider: sshfs from the physical machine?22:49
Seveas sshfs for a usb device?22:50
← valize left22:50
← borkr left22:50
Seveas oh, I guess you mean mount the vm's filesystem via sshfs and sign locally22:50
← _noblegas left22:51
o11c I'd rather let the host access the vm than vice versa22:51
singlerider I'll lok into sshfs22:51
→ yohnnyjoe joined22:51
singlerider I meant isgning on the VM where I'm VIM-ing a file :p22:51
o11c I mean, the whole point of a VM is "no hardware"22:51
→ madewokherd joined22:52
o11c personally I don't see the point of signing individual commits though, just tgas22:52
you could always sign while rebasing though22:52
singlerider That's a good point22:52
→ h12o joined22:52
singlerider I was just wondering about the viability22:52
Thanks for the insight Seveas and o11c22:53
Seveas you're welcome22:53
← zzz left22:53
← ok91 left22:54
→ _ADN_ joined22:55
← Tobbi left22:56
← h12o left22:57
← re1 left22:59
→ peterbecich joined22:59
← gopar left23:00
← Cabanossi left23:01
→ gopar joined23:01
→ Cabanossi joined23:01
← fqoh left23:02
← Spacew00t left23:03
→ zzz joined23:03
← finalbeta left23:04
→ Spacew00t joined23:04
← gopar left23:05
→ NeverDie joined23:06
→ stepho joined23:07
← ams__ left23:09
→ gaucheph joined23:12
→ h12o joined23:13
← PaulCapestany left23:13
→ dsdeiz joined23:15
← dsdeiz left23:15
→ dsdeiz joined23:15
→ PaulCapestany joined23:15
← plicki_ left23:17
← h12o left23:18
← yqt left23:18
texasmynsted somebody linked a page about managing config files with git here… Anybody recall that?23:18
→ NightMonkey joined23:19
← johnnyfive left23:20
← satifant left23:20
← dsdeiz left23:20
← royal_screwup21 left23:22
→ gopar joined23:22
← PaulCapestany left23:22
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 ideas23:23
→ royal_screwup21 joined23:23
texasmynsted that is it. Thank you23:24
← aax left23:24
→ PaulCapestany joined23:24
→ ajayk joined23:24
← gaucheph left23:24
← cagomez left23:25
→ cads joined23:28
← gopar left23:28
← aielima left23:28
← zzz left23:30
← NeverDie left23:30
← kexmex left23:31
← nitric left23:32
→ druonysus joined23:33
→ h12o joined23:33
Vampire0 texasmynsted, yw23: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:33
texasmynsted Thank you Vampire023:34
← telephone left23:35
texasmynsted .karma Vampire023: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 joined23:35
→ telephone joined23:35
← telephone left23:35
→ telephone joined23:35
→ zulutango joined23:36
bremner .karma karma chameleon23:36
gitinfo the karma of the given users is shrouded in the mists of uncertainty.23:36
→ NeverDie joined23:36
← ajayk left23:37
→ cmyers joined23:37
cmyers I came here just to tell you guys that --allow-unrelated-histories is complete clowntown.23:37
and it is infuriating23:37
← Spacew00t left23:38
→ bronson joined23:38
← h12o left23: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 not23:38
old versions explode with it, new versions explode without it23:38
completely insane.23:38
→ Vivekananda joined23:38
cmyers ". As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."23:38
who is driving this car anyways?23:39
you might as well say "since we hate programmatic users of our tool, screw you."23:39
← bsanford left23:39
o11c cmyers: shouldn't you be using lower-level commands?23:40
← mikecmpbll left23:40
preaction nobody here can do anything about it, so i hope typing that all out is at least cathartic23: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-unrelated23:40
it is very cathartic, thank you =)23:40
preaction you should get a blog23:40
→ zzz joined23:41
→ Spacew00t joined23:41
bremner twitter is all the rage for rage23:41
→ ajayk joined23:41
← Spacew00t left23:42
← bronson left23:42
→ MattMaker joined23:42
← royal_screwup21 left23:46
→ royal_screwup21 joined23: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 usable23:47
→ watabou joined23:48
← zedka left23:48
← SCHAPiE left23:49
→ sostenuto joined23:49
→ dsdeiz joined23:49
← dsdeiz left23:49
→ dsdeiz joined23:49
cmyers figuring out what plumbing the merge command calls appears non-trivial23:50
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:50
→ kexmex joined23: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 it23:51
auv[work] → auv23:51
→ SCHAPiE joined23:51
→ Eugene joined23:51
→ Hurin joined23:52
→ h12o joined23:53
→ mel00010 joined23:54
← Vivekananda left23:54
← dsdeiz left23:54
← svm_invictvs left23:54
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 command23:55
preaction Gurkenglas: git commit --amend; git push --force23:56
o11c Gurkenglas: rewriting history is fine when you haven't submitted your changes yet23:58
← ajayk left23:58
← h12o left23:58
o11c in fact, often projects *require* you to rewrite history during code review23:59

Logs Search ←Prev date Next date→ Channels Documentation