IRCloggy #git 2020-10-12

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.

2020-10-12

← null1337 left00:00
← donofrio left00:01
← tiin57 left00:08
← OnkelBlade left00:09
← Kaedenn left00:10
→ tiin57 joined00:11
← noonien left00:12
→ voidSurfr joined00:13
→ royal_screwup21 joined00:17
← royal_screwup21 left00:21
sgn_ → sgn00:21
→ Newami joined00:28
← Newami left00:30
← tiin57 left00:37
→ mat001 joined00:39
→ tiin57 joined00:40
→ R2robot joined00:43
← thiago left00:44
→ thiago joined00:45
→ jaziz joined00:49
→ Kaisyu7 joined00:59
← gast0n left01:01
→ aw1_ joined01:01
← aw1 left01:03
← tiin57 left01:07
→ umask077 joined01:08
← umask077 left01:08
→ umask077 joined01:08
← umask077 left01:08
→ umask077 joined01:09
→ tiin57 joined01:11
→ alexeightsix joined01:13
← mat001 left01:15
→ mat001 joined01:23
← alexeightsix left01:33
→ donofrio joined01:34
← shush left01:36
→ shush joined01:36
← tiin57 left01:37
← shush left01:37
→ shush joined01:38
← nomadicmathmo left01:39
← Gurkenglas left01:40
→ tiin57 joined01:40
→ sunri5e_ joined01:44
← sunri5e left01:45
← shush left01:46
→ shush joined01:47
← shush left01:47
→ shush joined01:48
← mat001 left01:48
← davispuh left01:53
← arcatech left01:56
→ justanotheruser joined02:03
← Xenguy left02:07
← tiin57 left02:07
→ tiin57 joined02:11
lagothrix → Guest5939302:14
← Guest59393 left02:14
→ lagothrix joined02:14
→ royal_screwup21 joined02:17
← voidSurfr left02:20
← palooka-jock left02:22
← royal_screwup21 left02:22
→ palooka-jock joined02:24
← Wetmelon left02:29
→ mirrorbird joined02:31
← tiin57 left02:37
→ Wetmelon joined02:38
→ unihernandez22 joined02:40
→ arcatech joined02:40
→ tiin57 joined02:41
→ nomadicmathmo joined02:48
→ mat001 joined02:49
← mirrorbird left02:51
← mat001 left02:53
→ ferdna joined02:54
← cbreak left02:54
→ cbreak joined02:56
← nomadicmathmo left02:57
← eb0t left02:57
← eblip left02:57
→ eblip joined03:02
→ eb0t joined03:04
← shush left03:07
← tiin57 left03:08
→ tiin57 joined03:10
→ macrover joined03:17
→ blahboybaz joined03:17
blahboybaz Soemthing I read made me curious if it's what they were eluding to. So if I'm in detached head state (maybe I checked out a commit using its sha-1) I can make chenges? Commit those changes? And what happens when I return to some branch (leave detached head state)? The commits I made while in detached head state simply vanish? The do not persist? If that's right this could be a useful operation at times but I want to make sure03:20
that's really how it works03:20
Is this how we get what they call a "dangling commit"? It exists but you can't reach it again?03:23
If so I'm guessing the git gc (or maybe prune?) would / could clean up the mess if you didn't want it anymore?03:24
→ mat001 joined03:25
→ drbean joined03:29
← kupi left03:34
Chipzz you can reach that commit again, remember how you previously got to it with its sha-1?03:37
whethet or not detached heads are retained depends on your git gc settings, but by default I believe they are03:38
← tiin57 left03:38
Chipzz and yes you can commit on a detached head; that's what happens if you edit a commit with git rebase -i for example03:39
→ igemnace joined03:40
→ tiin57 joined03:41
Chipzz blahboybaz: the detached head state used to scare me a lot more than it does now; what it essentially means is HEAD does not point to a branch03:41
which is usually not a bad thing03:42
the commit in a detached head state aren't necessarily unreachanle (even by your flawed definition): consider for example git checkout HEAD^03:43
outside of an interactive rebase your commits will happen on an unnamed branch, thse objects persist, but you better note down their sha-103:44
→ mirrorbird joined03:44
Chipzz but you can make a branch point to those changes too by simple doing git checkout -b newbranch03:45
← mirrorbird left03:46
← Aquazi left03:57
blahboybaz Chipzz: I thought there was on ly one head (HEAD) which can be made to point at differnt things (branches, tags, commits). Is there somehow more than one head?03:58
← Betal left03:58
blahboybaz "whethet or not detached heads are retained ..."03:59
← mat001 left03:59
→ Guest20 joined04:00
← mowcat left04:01
← proxxz left04:01
→ proxxz joined04:01
→ Betal joined04:02
→ mat001 joined04:02
← Betal left04:04
← JanC left04:06
← tiin57 left04:07
→ nomadicmathmo joined04:09
→ JanC joined04:09
→ tiin57 joined04:11
← cd left04:13
← irc_user left04:16
← macrover left04:16
← nomadicmathmo left04:19
← unihernandez22 left04:26
← justanotheruser left04:31
← tiin57 left04:38
→ tiin57 joined04:41
← h3ck left04:45
→ shush joined04:53
→ mightyjens joined04:59
← AnAverageHuman left04:59
← sudoforge left04:59
Chipzz blahboybaz: I think you're confusing terminology (or maybe I am): there is only one HEAD (the one you're talking about), but "a head" is defined as the tip of a series of commits05:07
← Wetmelon left05:07
← tiin57 left05:07
→ justanotheruser joined05:08
← arcatech left05:08
Chipzz "whether or not 'dangling commits' are retained ..."05:08
blahboybaz Chipzz: I see (I forgot there was more than one usage of the terminology). Thanks05:10
→ ColdKeyboard joined05:10
→ tiin57 joined05:11
← milkt left05:13
→ milkt joined05:14
← milkt left05:20
← friki left05:22
→ friki joined05:23
← tiin57 left05:37
→ chele joined05:38
→ Shentino_ joined05:38
← shush left05:39
← Shentino left05:39
→ tiin57 joined05:41
← Shentino_ left05:51
→ shush joined05:52
← shush left05:52
→ shush joined05:52
← shush left05:58
→ Shentino joined06:01
← yuriii left06:05
← tiin57 left06:07
← cYmen left06:07
← paintedindigo left06:08
← sven^ left06:08
← ferdna left06:08
→ OnkelBlade joined06:09
← Goplat left06:10
→ tiin57 joined06:10
→ cYmen joined06:12
→ yuriii joined06:16
→ royal_screwup21 joined06:19
→ chele_ joined06:23
← chele left06:24
← royal_screwup21 left06:25
← tsujp left06:30
→ tsujp joined06:32
→ shush joined06:32
← shush left06:37
← tiin57 left06:37
→ LetoThe2nd joined06:37
→ tiin57 joined06:41
← lankanmon left06:44
← thiago left06:54
← hussam left06:57
← astronavt left06:58
→ Gurkenglas joined06:59
→ Haohmaru joined06:59
→ chele joined06:59
← chele left07:00
→ chele joined07:00
← unluckyshrubbery left07:01
→ a-l-e joined07:01
← chele_ left07:02
→ mat001_ joined07:02
← mat001 left07:05
→ nomadicmathmo joined07:05
→ darkbit joined07:06
← durham left07:06
← tiin57 left07:07
→ shush joined07:09
→ rfuentess joined07:10
→ tiin57 joined07:11
← shush left07:13
← nomadicmathmo left07:14
Haohmaru what's gonna happen if i erase the hidden .git folder?07:15
→ HumanG33k joined07:15
Haohmaru besides getting chased by the GIT-POLICE and jailed07:15
osse The repo is deleted07:16
← HumanG33k left07:17
→ HumanG33k joined07:18
→ PJBoy joined07:26
← blahboybaz left07:29
← opal left07:31
→ opal joined07:33
→ paws_ joined07:35
← tiin57 left07:37
→ feriman joined07:38
← Lunatrius left07:40
→ Lunatrius` joined07:41
→ tiin57 joined07:41
→ tmm88 joined07:41
Lunatrius` → Lunatrius07:41
→ benfelin joined07:43
→ nomadicmathmo joined07:45
→ oxymoron93 joined07:45
← cbreak left07:46
→ durham joined07:47
→ cbreak joined07:50
← durham left07:52
← nomadicmathmo left07:58
→ mikecmpbll joined08:01
← jaziz left08:02
→ calcul0n joined08:06
← tiin57 left08:07
→ tiin57 joined08:11
→ stitched_unicorn joined08:13
← stitched_unicorn left08:16
→ nomadicmathmo joined08:17
← drbean left08:21
→ mobidrop joined08:26
← nomadicmathmo left08:33
→ unluckyshrubbery joined08:36
← tiin57 left08:37
→ tiin57 joined08:40
→ royal_screwup21 joined08:44
← shored left08:53
→ shored joined08:54
mgedmin galaxy brain: instead of using submodules/subtrees why not hard-link the shared files in all the repositories?08:55
← tmm88 left08:55
← proxxz left08:56
→ asrob joined08:59
← aw1_ left09:03
→ n001g joined09:03
→ aw1 joined09:05
← n000g left09:05
n001g → n000g09:05
← tiin57 left09:07
← hnOsmium0001 left09:08
→ shush joined09:10
→ lankanmon joined09:10
→ tiin57 joined09:11
→ raub joined09:12
← Jookia left09:14
→ Jookia joined09:14
← shush left09:15
→ totte joined09:24
→ dionysus69 joined09:25
→ Betal joined09:35
← tiin57 left09:37
→ tiin57 joined09:40
→ inkbottle joined09:54
← zebrag left09:54
→ zebrag joined10:00
→ def_jam joined10:01
← clime left10:01
→ eb0t_ joined10:01
← inkbottle left10:01
← eblip left10:02
← asrob left10:02
← eb0t left10:03
← mikecmpbll left10:04
→ mikecmpbll joined10:07
← tiin57 left10:07
→ tiin57 joined10:11
→ FabioP joined10:12
→ clime joined10:14
→ bolovanos joined10:16
← clime left10:16
→ dudek joined10:17
→ clara97 joined10:26
→ faceface joined10:29
← Technodrome left10:34
← tiin57 left10:37
→ tiin57 joined10:40
→ asrob joined10:42
→ PaulePanter joined10:43
→ pertj joined10:44
→ ShapeShifter499 joined10:48
pertj hi, is there a way to use repo root with :(exclude) pathspec? e.g. `:/*.json` means all json files from the repo root when pwd is a subdirectory, and `:(exclude)*.json` only search from pwd. but `:/:(exclude)*.json` or `:/(exclude)*.json` does not search from the repo root. any ideas?10:49
→ durham joined10:49
osse pertj: try: ':(top,exclude)*.json'10:52
mgedmin surprise: if I have a bunch of changes staged and I do git commit --amend --no-edit -p, the -p gets ignored and all my staged changes get amended onto the previous commit10:53
osse or git ... -- :/ '!*.json' (ie. two separate args)10:53
pertj osse: thanks a bunch! :)10:53
← durham left10:54
mgedmin curses, what's the spelling for ressetting my HEAD from reflog without accidentally wiping out all the other changes?10:54
osse mgedmin: sounds like git reset without --hard10:55
or perhaps with --soft10:55
mgedmin thanks!10:56
mgedmin creates an alias git undo = git reset HEAD@{1}10:56
← rustyshackleford left10:59
osse pertj: did the first one work?11:01
pertj yup the first one worked, and i like the syntax. TIL11:01
btw, second one did not work for some reason.11:02
← gxt left11:04
← crose left11:05
← tiin57 left11:08
→ aliss joined11:08
→ T_UNIX joined11:08
→ shush joined11:10
→ tiin57 joined11:11
→ wrobinson joined11:12
← wrobinso1 left11:14
← shush left11:16
→ Eryn_1983_FL joined11:17
→ NasrHassanein joined11:20
← feriman left11:25
← ghost43 left11:29
→ ghost43 joined11:29
← ninjin_ left11:30
→ ninjin_ joined11:32
← NasrHassanein left11:35
→ fstd_ joined11:36
← tiin57 left11:37
→ Tobbi_1 joined11:39
← fstd left11:40
fstd_ → fstd11:40
→ tiin57 joined11:41
← Tobbi_ left11:41
Tobbi_1 → Tobbi_11:41
→ sgn1 joined11:42
→ dmlloyd joined11:42
← sgn left11:45
sgn1 → sgn11:45
→ bolovanos_ joined11:48
← bolovanos left11:51
← ShapeShifter499 left12:04
→ ShapeShifter499 joined12:05
← ShapeShifter499 left12:05
← tiin57 left12:07
← mikecmpbll left12:08
→ tiin57 joined12:10
→ mikecmpbll joined12:11
← BSaboia left12:16
← jstimm left12:21
→ Jonopoly joined12:29
→ BSaboia joined12:33
← clara97 left12:36
← tiin57 left12:37
Jonopoly When i create a branch of origin/v.0.0.1 for my task we're told to untick Tracking12:40
is tracking something that isn't really required?12:40
→ Flaghacker joined12:41
→ tiin57 joined12:41
ikke Jonopoly: 1) tracking is not required, no 2) It's kind of strange to manually create a branch called origin/v0.0.112:41
GyrosGeier that should probably be a tag12:41
unless you are planning to prepare the 0.0.1.1 and 0.0.1.2 releases on that branch12:41
oh, also you shouldn't create remote-tracking branches yourself12:42
ikke The thing is12:42
if you create a branch called origin/foo, it's really: refs/heads/origin/foo12:43
GyrosGeier there are three kinds of "tracking"12:43
ikke The remote tracking branch would be: refs/remotes/origin/foo12:43
But the abbreviation of both is the same12:43
so you cause ambiguity12:43
GyrosGeier yes12:43
and that is different than a local branch tracking a remote branch12:44
→ gxt joined12:44
GyrosGeier so I think we have to be careful with terminology here12:44
Jonopoly Ah like atm i create a branch do my changes submit PR etc..12:44
GyrosGeier yes12:44
→ Maxattax joined12:44
Jonopoly but i do the whole " git push --set-upstream origin " before i push for PR12:44
but when i was reading tracking it said something about a direct relationship that it would push straight to origin?12:45
GyrosGeier if you create the branch off a remote-tracking branch, it will set the upstream automaticall12:45
y12:45
ikke or when you push with --set-upstream12:45
like you said12:45
GyrosGeier --set-upstream origin should resolve to origin/HEAD12:45
Jonopoly Ah but in Visual Studio code you can uncheck 'tracking'12:45
ikke Jonopoly: basically that would omit '--set-upstream'12:45
GyrosGeier indeed12:46
ikke That's not wrong, but there is little reason not to do it12:46
GyrosGeier that is a different kind of "tracking" than what a remote-tracking branch is12:46
Jonopoly Ahh okay12:46
← OnkelBlade left12:46
GyrosGeier i.e. you normally have branches in .git/refs/remotes, which correspond to what the other side has, and these get updated automatically12:47
these are called "remote-tracking" branches12:47
when you create a new local branch from one of these, you get an entry in the git config that says "the new branch is derived from that other branch"12:48
Jonopoly Ah okay12:48
GyrosGeier that is also called "tracking" :/12:48
Jonopoly haha12:48
GyrosGeier the latter is what --set-upstream does12:48
but "git branch feature origin" is sufficient as well IIRC12:48
Jonopoly yeah i usually like to just "git checkout -b issue-34343"12:49
then do the --set-upstream12:49
GyrosGeier (if origin/HEAD exists, otherwise you need to say "origin/main" or whatever they use as default branch12:49
)12:49
yes12:49
that derives from the current HEAD12:49
you can also add "origin" at the end of that checkout and get the --set-upstream for free12:50
← Flaghacker left12:50
GyrosGeier but it will base the branch on the current origin/HEAD, not current HEAD that way12:50
Jonopoly ah okay so i could do "git checkout -b issue-334 origin"12:50
GyrosGeier if you just pulled, then these will be the same12:50
← txtsd left12:51
Jonopoly yeah well i usually do a fetch so i get latest of origin/v.0.0.1"12:51
then my branch is a task regarding that feature12:51
version12:51
GyrosGeier ah, so v.0.0.1 is really a proper branch12:51
← aliss left12:52
Jonopoly yeah it's our "main/master"12:52
but before it goes into there we push our branch and do a pull request12:53
→ jaziz joined12:55
← Muimi left12:55
→ Flaghacker joined12:56
← ninjin_ left12:58
→ ninjin_ joined13:01
← tiin57 left13:07
← Eryn_1983_FL left13:09
→ tiin57 joined13:10
← Guest20 left13:11
← asrob left13:12
→ Eryn_1983_FL joined13:16
← Betal left13:20
→ Betal joined13:21
→ txtsd joined13:26
← HumanG33k left13:29
→ HumanG33k joined13:30
← tiin57 left13:37
← wrobinson left13:37
→ Guest20 joined13:38
→ wrobinson joined13:38
→ tiin57 joined13:41
→ SerialSmile joined13:42
→ CodeSlingerPaul joined13:51
← xelxebar left13:52
← Thorn left13:52
→ xelxebar joined13:53
→ Thorn joined13:53
← paws_ left13:54
→ jimklimov1 joined13:57
← jimklimov left13:58
→ feriman joined14:01
→ Wetmelon joined14:02
→ aliss joined14:02
← Flaghacker left14:03
← tiin57 left14:07
→ tiin57 joined14:11
← txtsd left14:20
← royal_screwup21 left14:21
→ txtsd joined14:21
→ royal_screwup21 joined14:21
← HumanG33k left14:24
← SerialSmile left14:24
→ HumanG33k joined14:25
→ Flaghacker joined14:25
← royal_screwup21 left14:26
← cbreak left14:30
→ cbreak joined14:31
← feriman left14:31
→ rsx joined14:32
← xelxebar left14:32
← luke-jr left14:32
→ xelxebar joined14:32
← tiin57 left14:37
nitrix → nitrix-or-treat14:37
← HumanG33k left14:37
→ luke-jr joined14:38
→ tiin57 joined14:40
← darkbit left14:40
← Guest20 left14:41
← sweatsuit left14:41
→ clara97 joined14:41
→ gast0n joined14:42
→ darkbit joined14:42
→ feriman joined14:43
← bolovanos_ left14:44
→ OnkelBlade joined14:48
→ das joined14:50
das Hello. In 2.28.0 (and below) I've got random segfaults when doing git grep on large repos, is this a known bug?14:51
→ sweatsuit joined14:51
→ thiago joined14:53
→ royal_screwup21 joined14:54
→ Guest20 joined14:55
→ cdown_ joined14:59
← sunri5e_ left15:00
← ghost43 left15:01
← cdown left15:01
cdown_ → cdown15:01
→ ghost43 joined15:01
→ sunri5e joined15:02
← Guest20 left15:03
← oxymoron93 left15:03
← mightyjens left15:03
← Jonopoly left15:04
→ bitnoize joined15:06
← tiin57 left15:07
← shicks2525 left15:08
← powerhouse left15:10
→ driador joined15:10
→ biryukov joined15:11
→ tiin57 joined15:11
bremner das: how large is large?15:11
I have never had git grep segfault on me15:12
das a few GB worth of data15:12
→ shicks2525 joined15:12
Haohmaru is someone using git for 4K movies?15:12
biryukov Hi. I just used git replace --graft and git filter-repo --force. And I am left with lots of refs like refs/replace/*. Is there a way to clear all these replace refs quickly? Removing them one by one takes quite some time.15:12
das and the segfaults are random, rerunning the same command twice may have different results15:12
→ shush joined15:13
bremner das: is it a low memory machine? Windows?15:14
das tried on a VM and a native Linux with 64GB, same erratic behaviour15:14
currently trying to recompile with symbols ...15:15
bremner huh. I guess I got nothing.15:15
→ sudoforge joined15:15
das is there a .configure option for debug?15:16
← shush left15:18
← mobidrop left15:20
→ p-core joined15:20
← mat001_ left15:22
→ shush joined15:23
← shicks2525 left15:23
← darkbit left15:23
← shush left15:25
→ shicks2525 joined15:25
→ shush joined15:27
← justanotheruser left15:29
← BSaboia left15:34
→ powerhouse joined15:35
→ BSaboia joined15:36
← tiin57 left15:37
← gadget left15:37
ikke make CLFAGS="-g -O1 -Wall"15:37
→ masber joined15:37
das thanks did -ggdb3 -17:31 < das> jsais pas si c'était Ruff qui me disait "c'est des commerciaux qui viennent vendre de la sécu et qui ont pas un échantillon sur eux" xd15:38
fak15:38
masber hi, I created a new project in gitlab and deleted the readme file from the web gui. Now I am trying to push my local folder but remote tells me I am behind...15:38
so, how can I tell git to ignore remote and just push my local?15:38
ikke git push -f15:39
das did "-ggdb3 -O1"15:39
→ tiin57 joined15:41
→ cyberpear joined15:42
biryukov is there something faster than git update-ref -d to remove refs in bulk quicker?15:42
← rsx left15:42
biryukov can you just remove replace refs from info/refs in the bare repo?15:45
→ durham joined15:45
→ rustyshackleford joined15:46
ikke biryukov: git update-ref --stdin15:46
biryukov: refs don't necessarily need to be files15:46
there can also be packed-refs15:46
and in the future, git will probably move refs to some kind of database15:47
so manipulating files directly is not recommended15:47
biryukov @ikke, thanks a lot. I should prepare a file with lines of the form delete SP <ref>15:49
what is SP?15:49
← aliss left15:51
biryukov just a space I guess15:52
→ blahboybaz joined15:55
→ arcatech joined15:57
← sostenuto left15:57
→ sostenuto joined15:57
blahboybaz Haohmaru: If you delete the .git folder you will no longer have a git repsitory at that location. Everthing that makes a git repository exist at that location is in that directory. Unless you have another copy somewhere (a remote server, your friend's computer, a thumb drive, whatever) then you will lose that repository and all that it entails.15:58
← FabioP left15:58
GyrosGeier large files should go into git-lfs15:59
we have a few large files in regular git at $orkplace15:59
and it's annoying15:59
← sostenuto left16:00
→ sostenuto joined16:00
← AlexMax left16:00
← sudoforge left16:01
blahboybaz GyrosGeier: What you need to do is..16:02
← rfuentess left16:02
← durham left16:02
blahboybaz go pumch the manager's lights out in front of everyone and tell him that in no uncertain terms will you or anyone else work under these squalid cinditions anymore16:03
→ durham joined16:03
blahboybaz ^ I'm kidding, its a joke :p16:03
biryukov what's SP in git?16:03
blahboybaz what's up in gitland ya'all! ):16:03
:) <-- I mean16:03
his lips are on his forehead and his eyes are on his chin16:04
→ monr0e joined16:04
sostenuto → joder16:06
← tiin57 left16:07
← durham left16:07
← OnkelBlade left16:07
→ tiin57 joined16:10
→ OnkelBlade joined16:12
← Haohmaru left16:12
← joder left16:13
→ Technodrome joined16:13
→ sostenuto joined16:13
sostenuto → joder16:14
→ alexeightsix joined16:16
→ noonien joined16:17
← nedbat left16:18
→ voidSurfr joined16:18
→ calcul0n_ joined16:19
← calcul0n left16:20
→ nedbat joined16:20
← BSaboia left16:21
→ justanotheruser joined16:21
← masber left16:22
← Gurkenglas left16:26
← Flaghacker left16:26
→ BSaboia joined16:27
→ Aquazi joined16:29
← DiffieHellman left16:32
→ DiffieHellman joined16:32
→ mat001 joined16:33
driador morning, any gitolite users/admins here? If so, can anyone tell me if ADC (admin defined commands) are obsolete or deprecated? I don't see them under the contrib directory of the repo.16:34
← disi left16:34
→ disi joined16:35
→ Guest20 joined16:36
← tiin57 left16:37
← driador left16:37
→ tiin57 joined16:41
→ howdoi joined16:41
← chele left16:45
→ hussam joined16:52
→ ash_worksi joined16:54
ash_worksi what's the best way to show just the latest commit hash?16:54
what's the best way to show just the latest commit hash? *(in case I sent it too fast)16:55
ikke git rev-parse HEAD16:55
ash_worksi thanks ikke16:55
ikke for some definitions of 'latest'16:55
ash_worksi thanks again :)16:56
← mfiano left16:56
← is_null left16:57
← clara97 left17:00
→ mfiano joined17:03
← qqx left17:03
→ qqx joined17:03
← chamunks left17:05
biryukov update-ref stdin does not seem to work for me. I am trying to put this on stdin: delete refs/replace/01d83142bf60ee5f9e62e9d73f857812dbc03d4117:05
→ gadget joined17:06
← biryukov left17:06
← tiin57 left17:07
← aw1 left17:08
← BSaboia left17:09
→ aw1 joined17:09
→ tiin57 joined17:10
→ orbyt_v7 joined17:14
→ cd joined17:15
→ HumanG33k joined17:15
→ cdown_ joined17:15
← axisys left17:17
← cdown left17:18
→ mat001_ joined17:18
→ axisys joined17:18
cdown_ → cdown17:18
← Guest20 left17:20
← mat001 left17:21
← gordonfish left17:25
→ relipse joined17:26
→ darkbit joined17:29
→ gordonfish joined17:30
← Spooktober left17:31
← acetakwas left17:33
→ Human_G33k joined17:33
← pikapika left17:33
← HumanG33k left17:33
← luke-jr left17:34
← Guest4231 left17:35
← LetoThe2nd left17:35
→ pikapika joined17:36
→ snits joined17:36
← opal left17:36
→ POQDavid joined17:36
← Human_G33k left17:36
→ luke-jr joined17:36
← pikapika left17:36
→ Human_G33k joined17:37
→ acetakwas joined17:37
← tiin57 left17:37
→ opal joined17:37
← acetakwas left17:37
← POQDavid left17:37
→ davispuh joined17:37
→ pikapika joined17:38
→ grumboo joined17:39
← pikapika left17:39
→ BSaboia joined17:40
→ POQDavid joined17:40
→ tiin57 joined17:41
← POQDavid left17:41
→ nikivi joined17:41
→ pikapika joined17:42
→ POQDavid joined17:42
→ HumanG33k joined17:43
← POQDavid left17:45
← Human_G33k left17:45
→ POQDavid joined17:45
← pikapika left17:46
← nikivi left17:46
← POQDavid left17:46
→ pikapika joined17:48
→ nikivi joined17:48
→ POQDavid joined17:48
← pikapika left17:48
← nikivi left17:49
→ pikapika joined17:49
→ nikivi joined17:50
← POQDavid left17:50
← pikapika left17:50
← nikivi left17:50
→ pikapika joined17:50
← pikapika left17:51
→ POQDavid joined17:51
→ nikivi joined17:52
→ astronavt joined17:53
← POQDavid left17:53
→ POQDavid joined17:55
← aw1 left17:58
→ acetakwas joined17:59
→ aw1 joined17:59
← OnkelBlade left17:59
→ is_null joined18:00
← tiin57 left18:07
→ pikapika joined18:09
→ Human_G33k joined18:09
← Human_G33k left18:09
← Jookia left18:09
→ Jookia joined18:09
→ Human_G33k joined18:10
→ tiin57 joined18:10
← p-core left18:11
← HumanG33k left18:11
→ p-core joined18:12
← ash_worksi left18:15
← pikapika left18:16
→ pikapika joined18:16
← Human_G33k left18:18
→ clara97 joined18:20
← POQDavid left18:21
← pikapika left18:21
→ pikapika joined18:22
→ POQDavid joined18:22
← nikivi left18:23
← pikapika left18:23
→ nikivi joined18:23
→ pikapika joined18:23
← POQDavid left18:23
← BSaboia left18:24
← acetakwas left18:24
← pikapika left18:24
→ POQDavid joined18:25
← nikivi left18:25
→ pikapika joined18:25
→ acetakwas joined18:25
→ nikivi joined18:25
→ jab416171 joined18:27
← Sauvin left18:28
→ BSaboia joined18:28
← BSaboia left18:32
→ hnOsmium0001 joined18:32
→ BSaboia joined18:33
→ lungaro joined18:35
← justanotheruser left18:37
← tiin57 left18:37
← BSaboia left18:37
← cliluw left18:40
→ tiin57 joined18:40
→ cliluw joined18:41
→ bolovanos_ joined18:42
← pikapika left18:42
← POQDavid left18:42
→ pikapika joined18:43
→ POQDavid joined18:43
← palooka-jock left18:43
← blahboybaz left18:43
← pikapika left18:45
→ pikapika joined18:46
← nikivi left18:46
→ nikivi joined18:46
← pikapika left18:47
→ sudoforge joined18:47
→ pikapika joined18:47
→ wootehfoot joined18:50
→ Goplat joined18:58
ThiefMaster do i really need to manually remove submodule entries from .git/config? there's no `git submodule` subcommand that cleans this for me? (in fact, the repo doesn't even have a .gitmodules anymore since we stopped using submodules a while ago)19:01
← mns left19:03
mgedmin git submodule deinit19:06
← tiin57 left19:07
ThiefMaster first thing i tried..19:09
[adrian@blackhole:~/dev/indico/src:master $]> git submodule deinit --all19:09
[adrian@blackhole:~/dev/indico/src:master $]> grep submodule .git/config | wc -l19:09
2519:09
→ tiin57 joined19:11
mgedmin I think you're supposed to invoke deinit before you remove the .gitmodules file19:15
← peregrinator left19:16
← nilsirl[m] left19:16
← leibniz[m] left19:16
← tomm1e left19:16
← cpackham left19:16
← cerna left19:16
← ForeverNoob[m] left19:16
← loadout[m] left19:16
← morguldir left19:16
← hsiktas[m] left19:16
← das-g[m] left19:16
← ChrisLane left19:19
← bolovanos_ left19:21
→ ChrisLane joined19:22
→ biryukov joined19:22
→ morguldir joined19:26
→ paws_ joined19:31
→ danisanti joined19:31
danisanti Does anyone know how I can obey to the 50/72 commit message using vim? I only know about :set textwidth=72 and have no rule for the 50 title :/19:32
osse danisanti: if the filetype is gitcommit then it will highlight if you pass it19:36
danisanti: ':set ft?'19:37
← tiin57 left19:37
danisanti hmmm, filetype gitcommit. wow, learning everystep of the way :) ;)19:38
gonna see what :set ft means19:38
setting filetype. is this automatic in most Linux systems or a .vimrc rule is required?19:40
→ tiin57 joined19:40
← is_null left19:40
osse danisanti: depends... these days there is usually a /etc/vimrc or something similar19:41
run that command to see what the filetype is19:41
danisanti osse: ;)19:41
thanks19:41
osse: it changes color!! filetype=gitcommit :D19:43
→ palooka-jock joined19:48
→ chamunks joined19:48
← benfelin left19:49
→ is_null joined19:50
← a-l-e left19:51
biryukov @ikke, thanks a lot for suggesting --stdin to speed up update-ref. got it working. and it took minutes instead of days.19:53
← biryukov left19:53
← royal_screwup21 left20:03
← is_null left20:03
← Maxattax left20:03
← tiin57 left20:07
→ cerna joined20:08
→ leibniz[m] joined20:08
→ felixsanz joined20:08
→ hsiktas[m] joined20:08
→ nilsirl[m] joined20:08
→ peregrinator joined20:08
→ ForeverNoob[m] joined20:08
→ AlexMax joined20:08
→ tomm1e joined20:08
→ das-g[m] joined20:08
→ cpackham joined20:08
→ tiin57 joined20:10
→ masuberu joined20:14
masuberu why git diff does ont advice about the changes carries with git rm?20:14
← ChrisLane left20:15
→ ChrisLane joined20:17
← danisanti left20:17
← voidSurfr left20:18
→ mapperr joined20:18
→ mns joined20:24
← indy left20:26
→ indy joined20:26
← masuberu left20:27
← indy left20:30
← clara97 left20:30
← aw1 left20:34
← Technodrome left20:34
→ indy joined20:36
← tiin57 left20:37
← LionsMane left20:38
→ tiin57 joined20:40
← mikecmpbll left20:43
← luke-jr left20:49
→ mikecmpbll joined20:50
→ fahadash joined20:53
→ luke-jr joined20:53
→ Technodrome joined20:53
← shush left20:54
→ BSaboia joined20:54
→ shush joined20:55
← tpaper left20:58
← HaRRo left20:59
→ BlessJah_ joined21:00
← BlessJah left21:00
→ tpaper joined21:01
→ voidSurfr joined21:02
← orbyt_v7 left21:04
→ BlessJah joined21:05
← BlessJah_ left21:07
← tiin57 left21:07
← darkbit left21:09
→ tiin57 joined21:10
← Tawonga left21:12
→ Tawonga joined21:13
← wootehfoot left21:15
→ Moistmelon joined21:15
← feriman left21:17
← Wetmelon left21:18
→ Xenguy joined21:20
← p-core left21:23
← voidSurfr left21:24
← Moistmelon left21:26
← splud left21:30
← BSaboia left21:35
← tiin57 left21:37
→ voidSurfr joined21:39
→ Gurkenglas joined21:40
← dionysus69 left21:40
→ tiin57 joined21:40
→ ghostshadow001 joined21:41
← Eryn_1983_FL left21:42
← noonien left21:43
→ splud joined21:43
→ ilmostro joined21:46
← nedbat left21:52
→ Muimi joined21:53
← Muimi left21:53
→ Muimi joined21:54
← Muimi left21:54
→ nedbat joined21:55
← alexeightsix left21:55
→ Wetmelon joined21:57
→ theoceaniscool joined22:03
→ crose joined22:06
← tiin57 left22:07
→ dqx joined22:08
→ tiin57 joined22:10
← paws_ left22:11
← voidSurfr left22:11
→ Eryn_1983_FL joined22:12
← sveinse left22:13
→ charking joined22:14
charking Hello. I want to rewrite code from scratch for a project. Is it possible to move master to a legacy branch and start a new master branch with no history?22:15
Or does it make more sense to make a legacy branch then just remove all the files in the master branch?22:16
← hagabaka left22:16
→ lukedashjr joined22:17
→ hagabaka joined22:17
→ backthen57 joined22:18
← luke-jr left22:19
backthen57 I branched my main project. Then I discovered the files I'm adding belongs to a submodule within this project. What's the proper way to add these files? Should I be adding them to the project of that submodule?22:20
Or I can continue to add to this main project?22:20
← deltab left22:21
lukedashjr → luke-jr22:21
← dqx left22:22
← theoceaniscool left22:23
→ is_null joined22:25
→ deltab joined22:28
← is_null left22:30
← Eryn_1983_FL left22:33
lusrx do i have to use -u every time i push a new branch to github?22:34
git push -u origin branch22:35
→ royal_screwup21 joined22:36
← tiin57 left22:37
→ Eryn_1983_FL joined22:37
→ tiin57 joined22:41
← arcatech left22:41
← dudek left22:42
→ justanotheruser joined22:42
← ghostshadow001 left22:48
j416 no22:49
but it's convenient to set the upstream22:50
→ malmalmal joined22:50
j416 you also have the option to set a different push default22:50
→ eb0t joined22:50
j416 lusrx: man git-config look for push.default22:50
gitinfo lusrx: the git-config manpage is available at https://gitirc.eu/git-config.html22:50
→ eblip joined22:50
j416 but I'd argue that the current default is quite sane for most use-cases.22:51
← eb0t_ left22:52
→ voidSurfr joined22:52
← def_jam left22:52
← malmalmal left22:58
← finalbeta left23:01
← calcul0n_ left23:03
← Xenguy left23:04
→ Xenguy joined23:05
← foul_owl left23:05
← tiin57 left23:07
lusrx so the goal with this is so that i can do git pull without any arguments?23:07
is the upstream not set when i clone a repo from github?23:08
→ arcatech joined23:08
← arcatech left23:09
→ tiin57 joined23:10
→ vdamewood joined23:13
→ heyitsrama joined23:13
← heyitsrama left23:17
→ foul_owl joined23:20
← nurdie left23:20
→ arcatech joined23:25
→ heyitsrama joined23:30
← arcatech left23:32
← luke-jr left23:33
→ luke-jr joined23:34
→ nurdie joined23:36
← to1ne left23:36
← tiin57 left23:37
→ arcatech joined23:39
← nurdie left23:40
→ to1ne joined23:40
→ tiin57 joined23:41
← arcatech left23:46
→ sybariten joined23:47
sybariten hey23:47
→ macrover joined23:48
sybariten i'm a git newbie. I've commited a couple of changes to a new file, adding it every time . I have not done git push yet with that file. But now i am realizing that i've named that file wrong. I'd like to change it. Is there something i can do to make it change name in earlier commits, if you understand?23:48
← CodeSlingerPaul left23:51
→ dionysus69 joined23:53
→ SpeakerToMeat joined23:55
SpeakerToMeat Hello23:56
Ok I wanna clarify how I should be doing something...23:56
I'm building something, deving home, using docker (not too important here), most of the files all are the same during building as they'll be for deploy. But there's two files with configs that will change for deploy, and this will be done with tagged versions for deploying (say tag 1.0.2). Now my question is... how do I handle these two config files? with a branch?23:57
← PJBoy left23:58
SpeakerToMeat So, if I branch to let's say "deploy" right now, edit these files, commit, and then go back to my head/main branch, I keep working on all the code, etc.... when the time comes for a release, I checkout the deploy branch, merge all the main branch stuff into it? would these config files not be touched if I've not edited them on my main branch since the branching? And if I do edit them, and I merge,23:59
I'll egt only those + or - of the edits and not the rest of the differences of the configs since before I branched and the branch?23:59

Logs Search ←Prev date Next date→ Channels Documentation