IRCloggy #git 2024-01-23

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.

2024-01-23

→ delay joined00:00
← omero left00:07
→ omero joined00:09
← bf_ left00:09
→ Traneptora joined00:14
→ LuxuryMode_ joined00:16
← epony left00:21
← nyah left00:22
← umbramalison left00:23
← Vonter left00:23
→ Vonter joined00:24
→ umbramalison joined00:32
← avu left00:33
→ avu joined00:33
→ yoo joined00:39
→ raffaele__ joined00:52
← raffaele left00:54
← gchound left00:58
← jacobk left01:04
jb1277976 When you hard reset a commit and it says head is now pointing then it shows the hash id. do you go back to master and just start over or what does that mean ?01:08
weaksauc_ not sure i understand the question01:10
← yoo left01:11
← stuv left01:13
→ yoo joined01:15
→ _xor joined01:18
← sentriz left01:19
← navi left01:21
→ nivag_2c joined01:22
← qgnox left01:26
← SharpHammer left01:26
→ sentriz joined01:29
→ qgnox joined01:32
→ Lord_of_Life_ joined01:33
← Lord_of_Life left01:33
Lord_of_Life_ → Lord_of_Life01:34
← qgnox left01:36
← igemnace left01:36
→ qgnox joined01:49
→ ubiquituum joined01:50
← ubiquituum left01:50
→ ubiquituum joined01:50
← xx left01:51
← nivag_2c left01:54
→ kurahaupo_ joined01:57
← kurahaupo left01:57
kurahaupo_ → kurahaupo01:57
← ubiquituum left02:01
← delay left02:02
← tirnanog left02:06
→ nivag_2c joined02:08
← qgnox left02:10
jb1277976 Oh.. so when you heard reset a commit does it automatically get deleted and you start over ?02:11
nedbat jb1277976: you're using words a bit differently. You don't "hard reset a commit". You can hard reset a branch to a commit.02:14
weaksauc_ a hard reset to a commit points the branch you are on to the commit you specify and wipes away any changes you had in the working directory02:14
it's one of the few dangerous commands to use in git where there might be data loss02:14
jb1277976 Yea, i was reading abour soft and hard.. no pun intended02:20
→ Gary_Sinise joined02:22
← LuxuryMode_ left02:26
← nhartman left02:26
← jottr left02:28
→ ubiquituum joined02:32
→ Guest55 joined02:33
← Guest55 left02:33
← ubiquituum left02:37
→ jottr joined02:40
← jottr left02:48
→ jottr joined02:53
→ lmat joined02:57
← lmat left02:57
→ lmat joined02:57
← jottr left02:57
lmat I forgot I was rebasing and moved the branch I was rebasing to the current branch. Now when I `git status`, "Last commands done (6 commands done):... No commands remaining. You are currently editing a commit while rebasing branch ..." Then git rebase --continue; says "error: update_ref failed for ref 'refs/heads/......': cannot lock ref 'refs/heads/...': is at 300187... but expected 219ad965..." And that's it.02:58
Oh, git reset --hard <expected commit> && git rebase --continue; seems to have fixed it. Thanks, guys!02:59
→ gsi_ joined03:01
← hussein1 left03:02
← bindu left03:03
→ bindu joined03:03
→ hussein1 joined03:04
← gsi left03:05
→ bf_ joined03:08
→ jottr joined03:09
← nicos left03:10
← jottr left03:16
→ lostbeard_ joined03:16
← lostbeard left03:17
← yoo left03:18
→ hbautista_ joined03:19
← kurahaupo left03:21
← bf_ left03:24
→ nicos joined03:25
→ jottr joined03:29
← cpackham left03:33
← jottr left03:34
→ epony joined03:43
→ jottr joined03:46
← hussein1 left03:49
← jottr left03:51
← nivag_2c left03:51
→ memset joined03:51
→ hussein1 joined03:51
← z1haze left03:53
→ monkeyPlus joined03:53
monkeyPlus hey. Ive created a new repository on github, using www, and i git clone it...then push it..it didnt ask me password or authentication..is this normal?03:53
b0nn it depends03:54
have you set up a ssh key with your account?03:54
monkeyPlus no i dont think so03:55
let me view repo settings to be sure03:55
b0nn account settings*03:56
monkeyPlus nope03:57
ok..so i deleted it03:57
now i want o create it again, with password03:57
← akibageek left03:57
monkeyPlus ok..on "clone" i used https03:57
but other users can do the same?!03:58
didnt ask me anything03:58
larryv have you ever authenticated to github before? maybe another credential manager cached your credentials04:01
monkeyPlus ah..well what i did. Created a repo on www site of github. Clone it like "git clone github.com" and then git add . , then git commit -m "whatever", then git push it..didnt ask me anything04:01
how does it know it was me?!04:02
anyone can do it04:02
also...instead of README.md i want a README.txt04:02
→ jottr joined04:03
→ nivag_2c joined04:04
monkeyPlus damn..have a ssh key :)04:07
← jottr left04:08
→ jottr joined04:19
← SuperLag left04:22
→ SuperLag joined04:22
← SuperLag left04:22
→ SuperLag joined04:22
← jottr left04:24
monkeyPlus hey, how can i use a plain text on README?04:25
or i cannot?!04:25
my indentation is bad04:26
larryv what do you mean04:26
if you want README.txt just create one and delete README.md or whatever04:26
monkeyPlus will it display on main page or repo?04:27
larryv or rename README.md to README.txt, same difference04:27
yes04:27
monkeyPlus ah ok cool04:27
thks04:27
← memset left04:29
→ memset joined04:29
→ h-erectus joined04:40
→ jottr joined04:41
← jottr left04:46
→ jottr joined04:58
← jottr left05:03
← memset left05:06
← Betal left05:07
→ memset joined05:09
→ jottr joined05:14
← memset left05:16
→ memset joined05:16
← sentriz left05:17
← nivag_2c left05:17
← jottr left05:20
← Gary_Sinise left05:22
→ sentriz joined05:26
← fossdd left05:28
→ jottr joined05:28
← monkeyPlus left05:28
→ igemnace joined05:30
→ vysn joined05:32
→ fossdd joined05:33
← jottr left05:40
→ Chaser joined05:40
→ ossifrage joined05:42
→ Ox7C5_ joined06:02
→ sreve joined06:05
← memset left06:05
→ memset joined06:06
← twice left06:07
← memset left06:07
→ jottr joined06:08
→ twice joined06:08
→ memset joined06:11
← caef^ left06:13
← jottr left06:15
rkta Is there a git checkout -p like interfaces for merge conflicts? I want to have a quick look at the conflict and than pick one side with just a key press. No manual editing.06:22
← LiENUS left06:22
→ duxsco joined06:23
ikke rkta: you have merge conflict editors06:25
if you use vscode, it has a good one built-in06:25
rkta I'm a vim user and have it configured as a merge tool. But that's not what I'm looking for. Show me the conflict, let me say ours or theirs and show me the next conflict.06:27
ikke There is not something like that06:27
rkta that's a shame06:28
→ jottr joined06:32
← duxsco left06:34
← larryv left06:36
gsish got a feeling that lazygit is doing a lot for you, could not follow the author's video due to not being familiar with the tool :) can't tell if that's a candidate to look at when fugitive doesn't provide what you are looking for (neither am using that tool, only dropping names here)06:37
the third name that crosses the mind would be tig06:38
← jottr left06:38
gsish am mentioning tig because of its user configurable mappings, and one button stage construction (interactive add) that I've seen06:42
even got an alias so that muscle memoried "git tig" commands work transparently :)06:43
← hbautista_ left06:46
rkta I'll keep that in mind. For now I went with git merge -Xours and now doing a git checkout -p @~1 because the merge gave some strange results. Let's see how well this goes.06:47
→ CrunchyFlakes joined06:55
pikapika → militantorc06:58
← thiago left07:01
→ stolen joined07:02
→ rfuentess joined07:05
← CrunchyFlakes left07:05
→ CrunchyFlakes joined07:07
→ jottr joined07:07
→ ssserpent joined07:08
→ jklfds joined07:09
→ Guest60 joined07:09
← Guest60 left07:11
← jottr left07:12
← jklfds left07:18
← ryjen left07:18
→ ryjen joined07:18
→ cpackham joined07:20
→ rainystorm joined07:25
→ jottr joined07:25
→ rosco joined07:26
← h-erectus left07:30
← jottr left07:33
← ryjen left07:49
→ ryjen joined07:50
← ryjen left07:53
← skapata left07:53
→ ryjen joined07:53
← ryjen left07:54
→ ryjen joined07:54
← ryjen left07:55
→ ryjen joined07:55
→ coot joined07:56
→ gandhibobandhi_ joined07:57
← ryjen left07:57
← cpackham left07:57
→ ryjen joined07:58
← ryjen left07:59
→ ryjen joined08:00
→ jottr joined08:00
→ MGF_Fabio joined08:00
→ vladoski joined08:06
→ XorMan joined08:06
← jottr left08:07
← XorMan left08:10
→ danse-nr3 joined08:12
← danse-nr3 left08:14
→ danse-nr3 joined08:15
→ jottr joined08:22
← m1dnight left08:26
→ m1dnight joined08:27
← jottr left08:27
← R2robot left08:31
→ ipynb joined08:34
← ryjen left08:34
→ ryjen joined08:35
→ jottr joined08:39
→ R2robot joined08:40
← jottr left08:45
→ jottr joined08:50
← Misotauros left08:51
← ryjen left08:54
→ john_johnk joined08:54
→ ryjen joined08:54
→ schne1der joined08:55
← TomyWork left08:55
→ TomyWork joined08:55
← jottr left08:59
→ RiFo joined09:04
→ Misotauros joined09:05
← Flow left09:05
→ stuv joined09:07
→ jottr joined09:12
→ Flow joined09:12
→ theoceaniscool joined09:17
← stolen left09:22
← jottr left09:23
→ plugwash joined09:26
plugwash is there a tool that given a tree of code will tell me which git commit it matches most closely?09:28
selckin tree of code?09:29
b0nn plugwash: what exactly are you trying to solve?09:31
It sounds like you want to find when a change was made?09:31
plugwash Some code was copied from one project to another, I want to know which version it was copied from.09:32
→ xx joined09:33
→ jottr joined09:36
→ gandhibobandhi__ joined09:39
b0nn hmm, I can only think of ways to say "the code changed to X in this commit"09:40
eg. git log --follow -p <file>09:40
← gandhibobandhi_ left09:42
← jottr left09:45
← zulutango left09:46
← riposte left09:50
← danse-nr3 left09:52
← polyrob left09:53
→ polyrob joined09:53
← very_sneaky left09:54
→ OnkelTem joined09:54
→ very_sneaky joined09:56
→ jottr joined09:56
→ danse-nr3 joined09:58
→ daniel3 joined10:00
→ sahil_ joined10:00
← ipynb left10:00
→ tirnanog joined10:00
← jottr left10:01
← sahil_ left10:07
← nicos left10:14
→ riposte joined10:16
→ nicos joined10:20
osse plugwash: I don't know of such a tool, but it's possible to script one yourself. Make a fake commit/tree from the code you have, then diff that against all other commits10:22
And find the closest10:22
Helps if you have an approximate date to narrow it down10:22
← john_johnk left10:25
ikke A user called Ali1234 here created something like that10:28
← nicos left10:34
→ nicos joined10:35
hexnewbie With git diff --cached starting a pager (closing which closes the text), how is one supposed to know what to write in the commit message on the command line after that. LOL10:42
nullie you can disable the pager10:44
or you can just add -v to git commit10:45
hexnewbie Hmm, thanks, git commit -v sounds appearling10:46
appealing10:46
→ vlado joined10:47
← vladoski left10:49
→ jottr joined10:51
← daniel3 left10:55
→ EvgenyK joined10:56
← jottr left10:56
→ nivag joined11:05
→ delay joined11:09
→ jottr joined11:09
← danse-nr3 left11:10
→ danse-nr3 joined11:10
← nicos left11:11
→ nicos joined11:11
← delay left11:13
← jottr left11:14
→ jottr joined11:15
← RetroPunk left11:18
→ RetroPunk joined11:18
← RetroPunk left11:18
← rosco left11:19
→ RetroPunk joined11:19
→ esc4rg0t_ joined11:20
← esc4rg0t left11:20
← jottr left11:22
← dsimic left11:28
→ dsrt^ joined11:28
→ dsimic joined11:30
← nicos left11:31
→ jottr joined11:34
← jottr left11:40
→ nicos joined11:45
← FH_thecat left11:48
→ EvgenyK_ joined11:51
→ jottr joined11:51
→ navi joined11:53
← EvgenyK left11:53
→ john_johnk joined11:55
← EvgenyK_ left11:55
← jottr left11:55
→ EvgenyK joined11:56
→ rosco joined11:59
← thelounge68 left12:00
→ thelounge68 joined12:01
← navi left12:01
→ FH_thecat joined12:02
← danse-nr3 left12:07
→ jottr joined12:07
→ kurahaupo joined12:08
← jottr left12:13
→ jottr joined12:15
← Ox7C5_ left12:17
← jottr left12:22
→ jottr joined12:34
→ qgnox joined12:38
→ danse-nr3 joined12:39
→ stolen joined12:39
← jottr left12:41
→ LiENUS joined12:42
← nicos left12:45
→ nicos joined12:45
← OnkelTem left12:47
← plugwash left12:47
→ akibageek joined12:47
← epony left12:52
← EvgenyK left12:53
→ jottr joined12:53
→ OnkelTem joined12:54
→ epony joined12:54
→ TeXMaster joined13:00
← Oblomov left13:01
← MGF_Fabio left13:02
← nicos left13:02
→ gasbag joined13:02
→ nicos joined13:03
→ plugwash joined13:04
← jottr left13:10
← gasbag left13:15
← qgnox left13:18
→ qgnox joined13:21
← qgnox left13:26
→ EvgenyK joined13:27
← madduck left13:28
→ Rashad joined13:31
← EvgenyK left13:35
→ tennisanders joined13:36
→ jottr joined13:37
→ qgnox joined13:38
→ delay joined13:44
→ EvgenyK joined13:44
→ ferdna joined13:47
→ miigotu joined13:49
← EvgenyK left13:49
→ navi joined13:53
→ delay_ joined13:53
← delay left13:56
→ Minvera joined14:01
← john_johnk left14:07
← guideX left14:09
→ cloaker joined14:26
→ masber joined14:27
← Chaser left14:27
masber hi, I have a question14:28
I have a github merge request and github tells me to fix that using command line interface because the conflicts are too complicated to solve them through the web interface14:28
← sentriz left14:28
masber it then gives me the commands I need to run14:28
I ran the commands which basically are clone, checkout the branch trying to merge, then pull14:29
I don't understand when I merge, git in my local repo does not complain, there are no conflicts14:29
why is that?14:29
I did merge the right branch14:29
→ bn_work joined14:30
masber why github complains about the merge request conflict but locally everything is fine?14:30
lmat masber: I'm not sure why Microsoft Github complains when git doesn't. You should rebase so that Microsoft Github can do it. git checkout <feature branch> && git rebase origin/master && git push -f origin;14:32
selckin you should use Software Freedom Conservancy gnu/git14:33
masber yeah my local computer runs linux14:35
ok, but has anyone experience something like this before?14:35
→ Ox7C5_ joined14:36
→ john_johnk joined14:39
→ sentriz joined14:39
← igemnace left14:40
→ SharpHammer joined14:46
→ madduck joined14:54
→ daniel3 joined14:57
← cdown left14:57
← rovanion left14:58
→ igemnace joined14:58
→ cdown joined14:59
→ thiago joined15:01
→ rovanion joined15:04
← akibageek left15:05
→ akibageek joined15:05
← tennisanders left15:07
→ bkircher joined15:12
← m1dnight left15:15
← jottr left15:15
→ m1dnight joined15:15
← m1dnight left15:22
→ m1dnight joined15:22
→ bf_ joined15:27
→ jottr joined15:28
→ warmana joined15:30
← qgnox left15:33
← jottr left15:37
← bf_ left15:37
← stolen left15:39
→ jottr joined15:40
← danse-nr3 left15:42
→ hbautista_ joined15:42
duszek how did people work with back then over their 56k connections?15:44
← warmana left15:44
masber at that time a 10MB file was a big think15:44
→ skapata joined15:45
masber I remember I once had to download metal slug game ROM for MEME emulator and it took a several hours15:45
duszek masber: that was a big problem but i heard it required an internet connection to do anything15:45
masber yeah15:45
→ z1haze joined15:46
huf duszek: we had smaller files15:47
← jottr left15:48
← daniel3 left15:48
← ferdna left15:48
← NightMonkey left15:52
← epony left15:53
→ epony joined15:54
→ danse-nr3 joined15:56
← sreve left15:57
→ NightMonkey joined15:58
→ Gary_Sinise joined16:00
→ Pixi` joined16:01
→ cdown_ joined16:01
→ hamster joined16:01
→ kostkon_ joined16:01
→ esc4rg0t__ joined16:02
[twisti] i have a repository that used to contain a submodule but doesnt anymore. yet when cloning, i get an error because i have no permission to access the submodule. is that expected, and is there a way around that ?16:02
→ raffaele joined16:02
→ KnoP_ joined16:02
→ aristaware4439 joined16:02
→ piwu11 joined16:02
→ brw5 joined16:02
→ Jck_true2 joined16:02
→ omnigoat3 joined16:02
→ liefer39601 joined16:02
→ pounce_ joined16:03
→ rishi`` joined16:03
→ majors joined16:03
→ bin101_ joined16:03
→ kiruny_ joined16:03
→ soifou_ joined16:03
→ cptaffe` joined16:03
→ m_ueberall joined16:03
→ n-st- joined16:03
→ nitrix_ joined16:03
→ Quaack joined16:03
→ gordonfish- joined16:03
→ swistak- joined16:03
lmat masber: "has anyone experience something like this before?" yes16:03
← KnoP_ left16:03
→ reprazent_ joined16:03
lmat masber: Several times.16:03
→ m_antis- joined16:04
← SharpHammer left16:04
→ qgnox joined16:04
→ totemizer joined16:04
→ YoungFrawg joined16:04
→ SharpHammer joined16:04
→ troyt joined16:05
← SharpHammer left16:05
→ tejr_ joined16:05
→ tennisanders joined16:05
→ dsimic_ joined16:05
→ SharpHammer joined16:05
→ buffet2 joined16:05
→ b0nn_ joined16:06
→ axisys_ joined16:06
→ qqq_ joined16:06
→ omero_o1 joined16:06
→ osse1 joined16:06
→ very_sneaky_ joined16:06
← fossdd left16:07
→ tcurdt- joined16:08
← kurahaupo left16:08
← bin101 left16:08
← tcurdt left16:08
← n-st left16:08
← majors_ left16:08
← KnoP left16:08
← thuna` left16:08
← swistak left16:08
← akibageek left16:08
← dsimic left16:08
← buffet1 left16:08
← troyt_ left16:08
← cptaffe left16:08
← kiruny left16:08
← ueberall left16:08
← pounce left16:08
← cdown left16:08
← dsrt^ left16:08
← esc4rg0t_ left16:08
← raffaele__ left16:08
← omero left16:08
← reprazent left16:08
← jas-maelstrom left16:08
← axisys left16:08
← Jck_true left16:08
← qqq left16:08
← kostkon left16:08
← piwu1 left16:08
← ham left16:08
← osse left16:08
← b0nn left16:08
← gordonfish left16:08
← YoungFrog left16:08
← m__antis left16:08
← aristaware443 left16:08
← ashnur left16:08
← omnigoat left16:08
← brw left16:08
← nitrix left16:08
← Pixi left16:08
← alephnull left16:08
← peter253545 left16:08
← Quack left16:08
← very_sneaky left16:08
← soifou left16:08
← rishi` left16:08
← tejr left16:08
← liefer3960 left16:08
cptaffe` → cptaffe16:08
reprazent_ → reprazent16:08
Jck_true2 → Jck_true16:08
brw5 → brw16:08
omnigoat3 → omnigoat16:08
piwu11 → piwu116:08
totemizer → ashnur16:08
nitrix_ → nitrix16:08
cdown_ → cdown16:08
← tirnanog left16:08
tejr_ → tejr16:08
gordonfish- → gordonfish16:08
n-st- → n-st16:08
pounce_ → pounce16:08
liefer39601 → liefer396016:08
YoungFrawg → YoungFrog16:08
aristaware4439 → aristaware44316:08
→ dsrt^ joined16:08
← RiFo left16:09
m_ueberall → ueberall16:09
→ akibageek joined16:09
→ tirnanog joined16:09
← epony left16:09
← tennisanders left16:10
→ epony joined16:10
→ tennisanders joined16:10
→ fossdd joined16:12
← synapse left16:13
← rfuentess left16:15
← epony left16:15
→ DaTa joined16:15
→ jottr joined16:16
→ synapse joined16:16
→ alephnull joined16:17
→ epony joined16:17
← memset left16:19
→ memset joined16:20
← nicos left16:20
← jottr left16:22
duszek huf: yeah i know16:22
why the file is still inside `git status` after i add a file and checkout a new branch?16:22
ikke duszek: what does git diff show?16:23
→ nicos joined16:27
← tennisanders left16:30
← nivag left16:30
j416 duszek: because you didn't commit it16:31
← qgnox left16:31
→ tennisanders joined16:32
→ jottr joined16:34
← tirnanog left16:35
→ bowlinggurra joined16:37
← tennisanders left16:37
← bowlinggurra left16:37
← nicos left16:37
→ bowlinggurra joined16:38
← jottr left16:39
← bowlinggurra left16:39
→ Guest44 joined16:40
duszek j416: it's a change that i'd like not to commit yet16:42
ikke Uncommitted changes do not belong to any branch16:42
So they don't disappear when you switch to another branch16:42
fyi, it's perfectly fine to commit that change in the intended branch and later amend that commit16:42
→ tennisanders joined16:43
← bloody left16:47
← tennisanders left16:49
→ tennisanders joined16:50
→ EvgenyK joined16:51
→ jottr joined16:52
← xx left16:52
→ xx joined16:52
← SharpHammer left16:53
→ SharpHammer joined16:54
→ nicos joined16:55
← tennisanders left16:55
→ jfsimon1981 joined16:57
← jottr left16:57
← john_johnk left16:57
← masber left17:02
← danse-nr3 left17:02
← hbautista_ left17:05
→ jas-maelstrom joined17:05
← gandhibobandhi__ left17:06
→ m257 joined17:07
→ jmd joined17:08
→ jottr joined17:09
→ bloody joined17:09
← memset left17:10
→ jfsimon1981_b joined17:12
→ memset joined17:12
← jfsimon1981 left17:12
← memset left17:14
→ memset joined17:17
← Rashad left17:18
← jottr left17:19
← memset left17:20
→ Guest37 joined17:20
← Guest37 left17:20
→ jfsimon1981 joined17:22
→ memset joined17:23
← jfsimon1981_b left17:24
→ vvn joined17:25
vvn hi there -- do you guys sometimes share parts of the repo config? I was thinking of having a file created with git config --file ./.gitconfig or ./some.cfg and having a script in the repo to merge that into the local config17:27
← memset left17:27
→ memset joined17:28
ikke I've never had the need for that17:31
waterkip why would you do that?17:32
or need that?17:32
(aka, never)17:32
ikke Custom diff / merge drivers?17:32
→ Rashad joined17:33
jb1277976 Let me tell you my workflow and please tell me or help me understand it. So I'm using dwm right. Whenever I apply a patch I create a new branch git add thefiles then git commit. Then I checkout master then merge that branch then compile and restart and everything is working. Question why do I have to merge to master id all my changes are on that branch? What's the point of merging to master if I will be using the same code ?17:33
vvn I need to keep track of a few upstream remotes and sharing that config bits would help17:33
→ dirtbound joined17:34
jb1277976 Sorry I typed this on a phone17:34
← rainystorm left17:34
← delay_ left17:34
→ duxsco joined17:34
waterkip I think it is more usefull to tell people which remote they need to add in that case17:34
→ jfsimon1981_b joined17:35
→ ___nick___ joined17:36
← jfsimon1981 left17:36
waterkip and why, but you can also tell people to do something like this: https://paste.debian.net/1305063/17:36
vvn waterkip: it's documented on a file containing "<name> <url>" lines, but it'd be nice to provide an helper to add them, then I thought about versioning the porting of .git/config containing the related [remote] entries17:37
waterkip that way you don't need to merge the config, you just include it17:37
← davidsenk left17:38
vvn waterkip: following your snippet, the idea would be to have myproject.config versioned in the repo itself, since it is meant to be shared17:38
waterkip yeah17:38
→ jottr joined17:40
→ nhartman joined17:40
waterkip the way i snippet'ed it is that people can put it in their global gitconfig, but you can also ask to just [include] it, eg: git config include.path $(pwd)/foo.config17:41
← cdown left17:41
jb1277976 Also isn't master independent of a branch unless you merge that branch into master ?17:41
vvn waterkip: I know it's kinda niche but I have a usecase for having distincts remotes (not the same project) within the same repo and then juggling between (remote) branches and refs17:43
← rosco left17:43
← jfsimon1981_b left17:44
waterkip I understand, i just think using the include method is a nicer way than merging it17:45
vvn completely agree17:46
← jottr left17:46
← rahl left17:46
← donofrio left17:48
vvn and actually, if it is shared with an optional script, we don't even need to include it, I could suggest to run git remote update -p and specify the shared remotes.cfg config file fragment somehow17:48
→ hbautista_ joined17:49
← m257 left17:52
vvn is there a way to do `git remote add ...` but point the config to a local remotes.cfg fragment instead of the local config?17:52
→ m257 joined17:53
ikke Not with git remote add17:54
You can with git config17:54
← m257 left17:54
vvn I guess I have no way but to include the fragment then17:55
and manually moving config sections to it17:55
→ m257 joined17:56
→ davidsenk joined17:57
→ Guest66 joined17:57
← hbautista_ left17:58
→ qgnox joined17:58
→ delay joined17:58
→ jottr joined17:58
← bin101_ left17:58
→ bin101 joined17:58
← qgnox left18:03
← EvgenyK left18:03
← jottr left18:04
← m257 left18:05
← Guest44 left18:08
← SharpHammer left18:08
→ SharpHammer joined18:09
→ peter253545 joined18:10
→ qgnox joined18:15
← itaipu left18:15
→ itaipu joined18:16
← JanC left18:20
→ JanC joined18:22
← xx left18:22
→ xx joined18:23
← chemsmith left18:23
← Guest66 left18:24
→ chemsmith joined18:24
← hololeap left18:25
→ hololeap joined18:26
← theoceaniscool left18:26
→ Guest44 joined18:27
← Rashad left18:31
← delay left18:31
→ jottr joined18:32
← jottr left18:41
→ hbautista_ joined18:43
j416 vvn: you might also consider whether the setup is too complex to begin with -- can you remove the problem rather than trying to solve it?18:45
I don't know your environment so obviously I can't tell you what to do, but worth exploring in case you haven't18:45
TeXMaster → Oblomov18:46
← JayBeeFOSS left18:48
→ JayBeeFOSS joined18:49
← Traneptora left18:49
← hbautista_ left18:51
← LiENUS left18:52
→ LiENUS joined18:53
← demonspork left18:55
→ larryv joined18:55
→ m257 joined18:58
← vlado left19:00
→ demonspork joined19:00
← miigotu left19:03
→ miigotu joined19:03
b0nn_ → b0nn19:04
→ jottr joined19:09
→ raffo joined19:11
← crabbedhaloablut left19:11
→ cabazon63 joined19:12
← travisghansen left19:14
→ cpackham joined19:15
→ LuxuryMode_ joined19:15
← ssserpent left19:15
→ travisghansen joined19:15
← Woundheir left19:16
→ crabbedhaloablut joined19:17
→ Woundheir joined19:17
← m257 left19:24
→ tennisanders joined19:29
→ gryffus joined19:35
← szkl left19:38
← duxsco left19:40
→ jmd` joined19:48
← nicos left19:49
→ cdown joined19:51
← jmd` left19:51
← Guest44 left19:53
→ Zmzi joined19:58
vvn j416: I have a few remote branches to track and cherry-pick things from and submodules are too cumbersome and subtree aren't suitable as they mix their history (requires commits). adding remote and fetching what I need from the remote branches is more convenient19:58
← tennisanders left20:02
← Zmzi left20:03
→ nicos joined20:08
anddam is there a way to run commit --patch with a VSCode extension?20:12
x/commit/ c/add/20:14
→ jinsun joined20:14
→ delay joined20:14
← gryffus left20:15
→ gryffus joined20:15
← delay left20:19
← jdek left20:20
→ Guest44 joined20:23
← jinsun left20:24
← jottr left20:25
← cabazon63 left20:25
← Gary_Sinise left20:25
→ HelloShitty joined20:26
→ Gary_Sinise joined20:26
→ duxsco joined20:27
→ nhartman_ joined20:33
← duxsco left20:33
← krumelmonster left20:35
← cpackham left20:35
→ cpackham joined20:36
→ Artea joined20:36
→ jottr joined20:37
← nhartman left20:37
← jmd left20:39
→ jmd joined20:40
← jottr left20:43
← duszek left20:45
→ mooz joined20:45
→ duszek joined20:45
→ sa0 joined20:45
← DaTa left20:47
→ krumelmonster joined20:47
→ delay joined20:50
← ___nick___ left20:54
kostkon_ → kostkon20:55
→ ___nick___ joined20:56
← mooz left20:56
← miigotu left20:56
← ___nick___ left20:56
→ miigotu joined20:57
→ mooz joined20:57
→ jottr joined20:58
→ ___nick___ joined20:58
← mingdao left20:58
jb1277976 if im working in a directory and modify lets say 3 files after i commit it its basically a snapshot of what i did and then i can contiune working on it and just commit again when done ? commiting is basically just a momment in time. does that sound right ?21:01
weaksauc_ yes every time you commit it's a snapshot of what you commit at that point21:02
→ mingdao joined21:03
← Ox7C5_ left21:03
← jottr left21:04
← ___nick___ left21:04
→ SharpHammer57 joined21:06
← SharpHammer57 left21:08
← SharpHammer left21:09
→ SharpHammer joined21:09
← cpackham left21:10
← igemnace left21:14
← jmd left21:15
← nicos left21:20
← delay left21:23
← LuxuryMode_ left21:24
→ nicos joined21:25
jb1277976 weaksauc_: by that logic i can stay working on something in master and if i need to do some testing bugfixes i can create a branch test till everytrhing works then when its ready merge to master and im good i can delete the testing branch ?21:27
if thats true then git makes so much sense to me21:28
trial and error i guess21:28
← schne1der left21:28
→ jdek joined21:30
→ irrgit joined21:31
← crabbedhaloablut left21:33
→ crabbedhaloablut joined21:34
→ jottr joined21:34
← jdek left21:37
← jottr left21:40
→ EvgenyK joined21:41
→ euouae joined21:42
euouae Hello is there some way to search for the commit where a file introduced with given SHA1 was?21:42
← EvgenyK left21:47
euouae I found some tricks, there's a script <https://xai.sh/2019/03/13/Find-file-in-git-by-hash.html> here that doe sit21:50
I'm going to rewrite it21:50
in Python21:50
→ jottr joined21:53
← epony left21:55
← jottr left21:55
→ nyah joined21:56
← gryffus left21:59
← nhartman_ left22:00
→ epony joined22:03
← SharpHammer left22:09
← bn_work left22:09
→ Traneptora joined22:12
→ EvgenyK joined22:12
→ cpackham joined22:12
← miigotu left22:13
→ miigotu joined22:14
← qgnox left22:16
← bloody left22:18
← EvgenyK left22:20
→ nhartman_ joined22:22
← nhartman_ left22:22
→ nhartman_ joined22:22
→ delay joined22:26
← nicos left22:27
← miigotu left22:28
← causasui left22:34
→ nicos joined22:35
→ causasui joined22:38
← delay left22:44
→ delay joined22:44
← vysn left22:54
→ qgnox joined22:57
→ miigotu joined23:00
← agd851201010224 left23:04
← z1haze left23:06
→ agd851201010224 joined23:08
← qgnox left23:09
← causasui left23:10
← delay left23:11
← Gary_Sinise left23:12
← Guest44 left23:12
→ nivag joined23:18
← epony left23:23
→ delay joined23:42
← thiago left23:53
← crabbedhaloablut left23:55
→ crabbedhaloablut joined23:57
← nivag left23:58

Logs Search ←Prev date Next date→ Channels Documentation