IRCloggy #git 2023-08-17

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.

2023-08-17

→ ThorMojito joined00:00
← stats4647 left00:00
← causa_sui left00:03
← mz` left00:05
→ mz` joined00:06
← eqw left00:12
→ wonko-the-sane joined00:13
← w4 left00:14
← dijksterhuis left00:14
→ dijksterhuis joined00:15
→ abubakarsadiq joined00:15
→ TheDcoder joined00:15
→ _sa0sin_ joined00:16
TheDcoder Hi, I'm serving a repo with the dumb HTTP protocol, the `HEAD` points to the `testing` branch but when I use `git clone` the `master` branch is checked out by default, why is this?00:16
How do I set the "default branch" in the dumb protocol?00:16
→ eqw joined00:18
← sa0 left00:19
← ursa left00:19
TheDcoder Nevermind, turns out I can't run the post update hook from the bare repository :P00:19
It started working after I ran it manually from the tree00:20
← omero[naldvras] left00:24
→ konsolebox joined00:25
→ w4 joined00:26
← mz` left00:29
← dijksterhuis left00:30
← Noisytoot left00:32
→ countach202020 joined00:36
← guru_de left00:38
← bn_work left00:41
→ guru_de joined00:42
← ThorMojito left00:44
→ Noisytoot joined00:49
← vdamewood left00:49
← Noisytoot left00:52
→ diod joined00:52
→ Noisytoot joined00:56
→ ThorMojito joined00:59
→ mz` joined01:02
← mz` left01:14
→ mz` joined01:18
→ nate2 joined01:22
← hamedariyo left01:25
→ hamedariyo joined01:26
← nate2 left01:27
← Noisytoot left01:27
← hamedariyo left01:27
→ Noisytoot joined01:28
← diod left01:28
← navirc left01:30
← raffaele left01:41
→ raffaele joined01:41
→ vdamewood joined01:59
← forgotmynick left02:04
← R2robot left02:15
→ nate2 joined02:16
← cyberpear left02:25
→ Gary_Sinise joined02:35
→ gsi joined02:36
← gsi_ left02:40
← FinnElija left02:46
→ FinnElija joined02:49
→ bywaterloo joined02:52
→ rageshkrishna joined02:54
→ diod joined02:56
→ R2robot joined02:57
← Ragnor left02:58
← reset left02:59
→ Ragnor joined03:00
→ justinf210 joined03:10
← ThorMojito left03:11
← bloody left03:13
→ rustyshackleford joined03:14
← FinnElija left03:16
→ FinnElija joined03:17
→ ThorMojito joined03:17
← raffaele left03:18
→ raffaele joined03:18
← nate2 left03:19
← justinf210 left03:22
← diod left03:33
→ stolen joined03:33
→ bluesm joined03:37
← Valeria22 left03:42
← ThorMojito left03:48
→ diod joined03:50
← vdamewood left03:50
← defjam left03:51
→ duxsco joined03:51
→ defjam joined03:58
← wonko-the-sane left03:59
← yoyofreeman left04:01
→ yoyofreeman joined04:02
← osse left04:02
→ EvgenyK_ joined04:04
← Inline left04:05
← EvgenyK_ left04:09
← defjam left04:12
→ EvgenyK_ joined04:12
← EvgenyK_ left04:17
← diod left04:18
→ catlemon joined04:19
→ osse joined04:20
← abubakarsadiq left04:22
← catlemon left04:24
→ EvgenyK_ joined04:25
← Gary_Sinise left04:28
→ srinidhi joined04:34
← osse left04:35
→ defjam joined04:36
→ diod joined04:36
→ jmd joined04:37
→ YuGiOhJCJ joined04:40
← countach202020 left04:42
← EvgenyK_ left04:43
← srinidhi left04:43
→ EvgenyK_ joined04:45
← EvgenyK_ left04:50
→ gep joined04:51
← duxsco left04:54
← bywaterloo left04:55
→ EvgenyK_ joined04:55
← larryv left04:58
← konsolebox left05:02
→ osse joined05:03
← guru_de left05:03
← EvgenyK_ left05:03
← hbautista_ left05:12
→ nate2 joined05:15
← nate2 left05:20
→ EvgenyK_ joined05:25
→ bgs joined05:27
→ dlani_ joined05:28
← dlani_ left05:32
← jmd left05:32
← diod left05:34
← thiago left05:34
→ mrdlani joined05:35
← EvgenyK_ left05:35
← kjartan left05:36
← osse left05:37
→ osse joined05:41
→ kjartan joined05:41
→ valdemaras joined05:47
← bluesm left05:47
← leftyfb left05:48
→ leftyfb joined05:52
→ Chaser joined05:54
→ c0dehu1k joined05:54
→ jmd joined05:56
← YuGiOhJCJ left05:59
→ stats4647 joined06:01
← gast0n left06:07
← stats4647 left06:07
→ multi_io joined06:14
→ rfuentess joined06:15
← krumelmonster left06:17
← multi_io left06:20
→ Shinzon9 joined06:20
← c0dehu1k left06:24
→ konsolebox joined06:24
→ igemnace joined06:25
← osse left06:25
→ osse joined06:27
→ krumelmonster joined06:29
← valdemaras left06:33
→ carl-- joined06:35
→ theoceaniscool joined06:38
→ carl--- joined06:39
→ multi_io joined06:39
→ srinidhi joined06:40
← carl-- left06:41
← stolen left06:42
← dsrt^ left06:44
→ otisolsen70 joined06:44
→ dsrt^ joined06:47
→ shokohsc51089 joined06:48
← w4 left06:49
← shokohsc5108 left06:49
shokohsc51089 → shokohsc510806:49
← Betal left06:59
← osse left07:00
→ Tazy joined07:07
← Lord_of_Life left07:14
← skapata left07:14
→ mobidrop joined07:14
→ osse joined07:17
← otisolsen70 left07:22
← osse left07:22
→ CR4ER30 joined07:23
→ flom_84 joined07:24
→ osse joined07:24
← CR4ER30 left07:24
← mrdlani left07:24
→ ursa joined07:26
→ mrdlani joined07:26
→ Lord_of_Life joined07:30
→ Wuzzy joined07:30
← mrdlani left07:31
← ursa left07:32
→ node1 joined07:37
← flom_84 left07:40
→ coot joined07:41
→ otisolsen70 joined07:41
← osse left07:43
→ flom_84 joined07:44
← mitrokov left07:45
→ osse joined07:47
→ w4 joined07:48
← flom_84 left07:48
→ nyah joined07:48
→ flom_84 joined07:49
→ firewyre- joined07:49
← firewyre left07:49
← rfuentess left07:54
→ meator joined07:54
← flom_84 left07:56
→ mrdlani joined07:57
← elastic_dog left07:57
→ axacx joined08:02
← mrdlani left08:03
← node1 left08:05
← konsolebox left08:07
→ elastic_dog joined08:09
→ ursa joined08:13
→ konsolebox joined08:17
→ flom_84 joined08:24
→ feriman joined08:24
← bket left08:26
→ john_johnk joined08:27
→ bket joined08:29
→ Inline joined08:35
→ danse-nr3 joined08:38
← otisolsen70 left08:39
→ finn_elija joined08:41
← FinnElija left08:41
finn_elija → FinnElija08:41
→ otisolsen70 joined08:45
→ catlemon joined08:46
catlemon Thursday and new BSD Now: https://www.bsdnow.tv/52008:47
← ackyshake left08:48
← konsolebox left08:49
→ gas51627 joined08:49
← Shinzon9 left08:50
← TheCatCollective left08:50
gas51627 hi everyone, is it possible to reset to certain commit but except 2 root folders?08:51
→ Shinzon9 joined08:52
gas51627 like there is a git project folder with say 10 folders, I want to reset everything except to to version master08:52
← carl--- left08:53
← flom_84 left08:53
→ flom_84 joined08:53
→ TheCatCollective joined08:54
← jmd left08:55
← srinidhi left08:56
→ jmd joined08:57
← otisolsen70 left08:58
→ valdemaras joined08:59
← osse left09:00
→ otisolsen70_ joined09:02
gas51627 or, maybe let me start from the beginning. My branch develop went forward by, say 50 commits in different folders. Now I want to make a release from it's initial state + changes done in two folders. How would I go about it?09:04
jmd gas51627: If I was going from A to B, then I wouldn't start from A09:04
gas51627 jmd how do you mean?09:05
grawity I guess I'd create a new branch off the initial state, then either `git checkout` the two specific folders from develop (loses commit history) and commit them as "Import the specific things from develop" --- or do some fancy git-merge to keep the history09:05
jmd Well if you didn't mean to release changes in certain directories why did you put those in the same branch?09:05
gas51627 jmd because we suddenly found an issue and now want to make a smaller release that would contain only configuration files changes (which are in that directories), but not code changes09:06
not any other changes09:06
← theobjectivedad left09:07
grawity yeah, definitely sounds like "branch off the previous release, then import the two folders"09:07
jmd Well then like grawity says, perhaps the best idea is to create a new branch for your release and remove those commits (or parts of commits) which you don't wish to release.09:07
grawity I didn't say anything about removing commits09:08
jmd ... and next time try to think ahead ...09:08
← meator left09:08
grawity but I guess that's another option09:08
→ theobjectivedad joined09:09
gas51627 ok, so say I go with the obption "branch off previous release, then add changes for those folders". I switched back to previous release, created a branch from it,09:10
now what should I do?09:10
← Spawns_Carpeting left09:11
→ flom__84__ joined09:12
jmd gas51627: Cherry pick the changes you want.09:12
gas51627 I don't know all the changes09:13
how can I checkout 2 specific folders from develop?09:13
jmd git log09:13
← flom_84 left09:13
jmd git checkout <branch> -- ./directory09:13
← flom__84__ left09:13
jmd What is a "folder" anyway?09:13
→ flom__84__ joined09:14
gas51627 a folder in a root of the project09:14
← chexum left09:14
← flom__84__ left09:15
→ flom__84__ joined09:15
→ chexum joined09:15
jmd gas51627: Can you point me to anywhere in the git manual where the word "folder" is mentioned?09:16
→ nate2 joined09:16
← flom__84__ left09:16
gas51627 how does it call those things?09:17
directory09:17
→ flom__84__ joined09:17
jmd Oh right.09:17
→ osse joined09:17
jmd If you mean a directory, it's best to say "directory".09:17
Unless of course you're talking German then you can say Verzeichnis.09:18
→ Spawns_Carpeting joined09:18
→ mrdlani joined09:19
← jmd left09:19
← nate2 left09:21
→ jmd joined09:21
→ no_gravity joined09:22
no_gravity Is it possible to retroactively combine a bunch of commits into a branch, so the repo is more structured?09:22
← flom__84__ left09:23
→ flom__84__ joined09:23
← mrdlani left09:23
jmd no_gravity: You can cherry-pick commits from one branch to another. Whether it makes it more structured is a matter of opinion and depends on a lot of things.09:24
You also might, or might not have to deal with conflicts.09:24
no_gravity jmd: I think this is a misunderstanding. Let me try to explain ...09:24
Say I have only the master branch. And it has the commits 1,2,3,4,5,6. Can I combine commits 3,4,5 into a branch?09:25
Not a new branch. I want the repo to look as if they were in a branch in the past.09:25
jmd A branch is merely a name for a particular ref09:26
← igemnace left09:26
no_gravity Hmm.. When I do "git log --graph --all --decorate" it shows me which commits were in a branch in the past.09:26
jmd If there were in the branch in the past, then they are in the branch now.09:27
You cannot delete commits (unless you reset and then push with --force)09:28
no_gravity I don't want to delete commits09:28
Although yes, I want to rewrite history.09:28
← mane left09:28
no_gravity I want to mark commits 3,4,5 as "have been in branch FeatureX"09:28
jmd git branch FeatureX09:29
git checkout FeatureX09:29
→ mane joined09:29
no_gravity I want that for the past09:29
HEAD is at commit 609:29
→ carl--- joined09:29
no_gravity And I want to mark commits 3,4,5 as "FeatureX".09:29
jmd okay so you could do git reset --hard <commit 5>09:30
But git has no concept of past, future, present09:30
no_gravity I have09:30
jmd except for the timestamps of commits, but they are often faked.09:30
Git only knows the order in which commits have been made.09:31
It's one big tree.09:31
no_gravity Hmm... I have the feeling we are talking past each other.09:33
→ node1 joined09:37
→ igemnace joined09:42
← catlemon left09:43
← rustyshackleford left09:54
← otisolsen70_ left09:57
← flom__84__ left09:58
→ stats4647 joined10:05
← no_gravity left10:09
← stats4647 left10:12
gas51627 grawity: jmd: thanks a lot10:14
→ bluesm joined10:21
← feriman left10:24
← node1 left10:28
→ epicout joined10:29
← epicout left10:29
→ epicout joined10:29
→ epicout_ joined10:33
← epicout left10:37
→ dijksterhuis joined10:40
← valdemaras left10:42
← RiFo left10:43
→ RiFo joined10:45
← john_johnk left10:46
→ shokohsc51088 joined10:50
← shokohsc5108 left10:51
shokohsc51088 → shokohsc510810:51
← Tazy left10:52
← gep left10:53
← jmd left10:58
→ ThorMojito joined10:58
→ jmd joined10:58
→ jijibao joined10:58
→ KnoP joined11:01
← mane left11:01
← jfsimon1981 left11:01
→ jfsimon1981_b joined11:01
← ash_m left11:02
← vishal left11:03
→ ash_m joined11:04
→ mane joined11:05
→ vishal joined11:05
← epicout_ left11:05
→ jonosterman joined11:05
← axacx left11:08
→ konsolebox joined11:09
← ThorMojito left11:09
→ clime joined11:12
← jfsimon1981_b left11:14
→ jfsimon1981_b joined11:14
← KnoP left11:14
→ Tazy joined11:16
← konsolebox left11:23
→ konsolebox joined11:23
→ feriman joined11:28
→ mrdlani joined11:29
← de-facto left11:30
→ de-facto joined11:30
→ ThorMojito joined11:34
← mrdlani left11:35
nona is there any difference at all between cherry-picking 3 commits, one after the other versus using abcdef1..[.]abcdef2 notation?11:43
← ThorMojito left11:48
→ danse-nr3_ joined11:52
← danse-nr3 left11:54
→ f_ joined11:57
← bgs left12:02
← danse-nr3_ left12:04
← mane left12:05
→ aspirin joined12:06
→ danse-nr3_ joined12:07
→ reset joined12:08
→ mane joined12:11
→ john_johnk joined12:12
← gryffus left12:26
→ ThorMojito joined12:26
→ flom__84__ joined12:29
→ mrdlani joined12:30
← bluesm left12:32
← troyt left12:35
→ troyt joined12:37
← mrdlani left12:37
→ mrdlani joined12:38
→ KaitoDaumoto joined12:41
→ epicout joined12:56
← epicout left12:56
→ epicout joined12:56
Th|ef hello gitmasters <312:56
how can i be sure what this wants to pull? As I fear I have the perfect code locally, and don't wish to risk a permanent overwrite! :)12:56
Thanks in advance re: https://pastebin.com/p9Pfs3ZH12:57
→ lucasta joined13:00
← jmd left13:03
→ node1 joined13:06
node1 → ruckus13:06
→ bloody joined13:09
← theoceaniscool left13:13
← ThorMojito left13:16
→ nate2 joined13:18
← flom__84__ left13:21
igemnace Th|ef: git log [--oneline] @..@{u}13:21
→ jmd joined13:22
← nate2 left13:23
igemnace nona: as long as the order is the same, they should be the same. mind the difference between .. and ...13:23
→ flom84 joined13:29
← flom84 left13:30
← yoyofreeman left13:31
← mrdlani left13:35
→ flom84 joined13:35
→ mrdlani joined13:35
Th|ef igemnace, fatal: @..@{u}: no such path in the working tree.13:43
igemnace oh, did you type the command exactly? i had meant for [--oneline] to be interpreted as an optional flag13:43
Th|ef hm13:43
← mrdlani left13:44
igemnace git log @..@{u} OR git log --oneline @..@{u}13:44
Th|ef oh lol13:44
sorry13:44
← jijibao left13:44
Th|ef thank you :)13:44
→ fuzzybear86 joined13:44
Th|ef igemnace, but what does this do ?13:44
← mobidrop left13:45
igemnace @ is shorthand for HEAD (where you are currently). @{u} is shorthand for HEAD@{upstream}, which is the upstream for your branch. @..@{u} means (in simple, potentially reductive terms) the commits that your upstream has that your local doesn't have13:45
→ odoood joined13:46
Th|ef ahhhh ! :)13:46
igemnace the full man text is in git help revisions13:46
Th|ef gotcha13:46
no idea about it yet but ont hew ay as it were13:46
https://pastebin.com/ZHcCBtH113:46
jast man gitrevisions btw :)13:47
gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html13:47
igemnace jast: nice! ty13:47
jast @..@{u} is way too much to type! try: ..@{u}13:47
igemnace Th|ef: i didn't catch that last sentence, but that pastebin output is the commit that you haven't pulled13:47
← flom84 left13:47
→ flom84 joined13:47
Th|ef jast, cool man13:48
igemnace nice13:48
Th|ef igemnace, okay well im not going to want that pulled down into my local source tree as my local source is perfect! If anything, I want to only push the current local source ?13:48
← flom84 left13:49
→ flom84 joined13:49
igemnace hmm does that mean you don't want it to appear on the remote as well? that's a !rewrite if so13:49
gitinfo 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/waqum13:49
→ countach202020 joined13:49
→ navirc joined13:50
igemnace oh, "it" being the commit you don't want13:50
jast force pushing is an option but you have to be very sure that that's actually what you want, particularly if other people are using the upstream branch too13:50
Th|ef excellent13:51
this is a base source tree and strictly only for my local, so i build personal apps atm - and noone else is collaborating :)13:51
jast because if other people are involved and you force push, chances are they'll either end up bringing that destroyed commit back in anyway, or other fun times13:51
right13:51
Th|ef --force it is I guess... I just wanted to know if that was the safest way and the correct way really to do so :)13:51
jast did you do something that you remember that would have replaced, rewritten or removed a commit locally?13:51
because then (and because nobody else could interfere) --force is a straightforward option13:52
Th|ef would an amend count ?13:52
jast yes!13:52
if you amend something that you previously pushed, you end up with a divergence13:52
Th|ef my bad! getting used to this and cli+vscode lol13:52
jast the remote has the old commit, you have the new commit13:52
Th|ef i see!13:52
:D13:52
thanks jast! :D13:52
→ rfuentess joined13:52
Th|ef (cool discussion)!13:52
jast amend is one of the things that we call "history rewriting" (along with rebase)13:52
Th|ef yah i see13:52
jast and it gets you these kinds of results13:52
Th|ef i dont watnto rebase but i can see how that ties in now13:52
igemnace amend is not necessarily a good or bad thing, just learn the context and apply as necessary13:52
Th|ef ahuh, okay!13:53
jast if you rewrite history that doesn't exist remotely, it's always absolutely fine to do13:53
Th|ef igemnace, indeed, very well spoken :)13:53
jast if you rewrite stuff that's already shared with others, extreme care is advised :)13:53
and just so you know, even if you had pulled, it would still be possible to recover from that13:54
Th|ef jast, lucky as!13:54
well im very glad i asked13:54
→ thiago joined13:54
Th|ef thank you for jumpingin and saving! :D13:54
jast low effort saving, my speciality :>13:54
← flom84 left14:00
→ flom84 joined14:01
→ abubakarsadiq joined14:01
← flom84 left14:04
→ flom84 joined14:04
← Inline left14:07
→ Inline joined14:10
→ ThorMojito joined14:11
Th|ef :D14:12
← flom84 left14:15
← danse-nr3_ left14:15
→ mobidrop joined14:16
→ causasui joined14:17
→ theoceaniscool joined14:17
Th|ef jast, while we're here this evening? How can I fully renew my github remote with a fresh push? Or do I need to create a new branch to do that? Keeping in mind that its only me on the coding front.14:17
← DPA left14:19
← ThorMojito left14:23
→ srinidhi joined14:24
← mobidrop left14:27
→ belsirk joined14:30
← rfuentess left14:32
→ danse-nr3 joined14:33
→ rfuentess joined14:34
→ axacx joined14:34
← JanC left14:34
→ JanC joined14:34
→ raffaele__ joined14:35
← countach202020 left14:36
← belsirk left14:36
→ c0dehu1k joined14:38
← raffaele left14:38
→ rafspiny joined14:39
← raffaele__ left14:40
→ raffaele joined14:41
→ fdan joined14:42
← rafspiny left14:44
→ iomari891 joined14:44
→ stolen joined14:50
← stenno left14:52
← fuzzybear86 left14:52
→ psukys joined14:59
← OnlineCop left15:00
← fdan left15:01
→ yoyofreeman joined15:01
← ruckus left15:03
→ DPA joined15:03
→ fuzzybear8 joined15:04
→ gast0n joined15:05
→ m4r35n357 joined15:08
→ Valeria22 joined15:11
← srinidhi left15:11
← clime left15:19
← fuzzybear8 left15:19
← theoceaniscool left15:20
→ Gary_Sinise joined15:21
← psukys left15:22
→ PantelicGR joined15:22
→ psukys joined15:23
← rfuentess left15:30
→ gh34 joined15:31
→ ThorMojito joined15:32
← SuperLag left15:32
→ SuperLag joined15:33
← rkta left15:33
→ rkta joined15:33
← Tazy left15:33
← RDMengineer left15:34
nona igemnace: thank you! yes, re `..` vs `...`, that's a sneaky one :P15:35
← yoyofreeman left15:36
← peeps[work] left15:40
← FH_thecat left15:40
→ peeps[work] joined15:42
← ThorMojito left15:43
→ shinonome joined15:44
← subopt left15:45
→ Cirdo joined15:47
← peeps[work] left15:49
→ peeps[work] joined15:50
← lucasta left15:54
→ RDMengineer joined15:54
→ lucasta joined15:54
→ [RiFo] joined15:57
← RiFo left16:00
→ Rashad joined16:03
← odoood left16:04
← Cirdo left16:06
→ Cirdo joined16:06
← nvmd left16:07
← c0dehu1k left16:12
→ ThorMojito joined16:14
→ raffaele__ joined16:19
← raffaele left16:22
← ThorMojito left16:27
← Cirdo left16:27
← Ragnor left16:30
← Inline left16:33
← RDMengineer left16:34
← lucasta left16:36
→ Ragnor joined16:37
→ bywaterloo joined16:39
← abubakarsadiq left16:40
← konsolebox left16:40
→ Inline joined16:41
→ odoood joined16:42
→ FH_thecat joined16:45
→ c0dehu1k joined16:47
→ RDMengineer joined16:50
← danse-nr3 left16:50
Jck_true → WinterFlower16:52
WinterFlower → Jck_true16:52
→ humanface joined16:53
→ crabbedhaloablut joined16:53
→ stats4647 joined16:54
← agd851201 left16:59
→ shokohsc51085 joined17:01
→ delay joined17:02
← shokohsc5108 left17:03
shokohsc51085 → shokohsc510817:03
← jmd left17:03
← c0dehu1k left17:04
← m4r35n357 left17:05
← causasui left17:05
→ epicout_ joined17:07
← delay left17:07
→ delay joined17:07
← epicout left17:11
← delay left17:11
→ agd851201 joined17:14
→ Cirdo joined17:17
← RDMengineer left17:18
→ nate2 joined17:19
→ Guru_DE joined17:20
← carl--- left17:21
← agd851201 left17:21
→ agd851201 joined17:22
← gast0n left17:23
← nate2 left17:24
← elastic_dog left17:26
→ gast0n joined17:26
→ lostlazy joined17:27
← Cirdo left17:30
← Chaser left17:32
→ rustyshackleford joined17:33
→ nvmd joined17:33
← stats4647 left17:33
→ RDMengineer joined17:34
→ stats4647 joined17:35
→ konsolebox joined17:37
→ elastic_dog joined17:38
→ Chaser joined17:38
← stats4647 left17:39
← axacx left17:40
→ diod joined17:42
→ codaraxis joined17:48
→ JeffH joined17:50
← humanface left17:50
← coot left17:51
← nvmd left17:53
← john_johnk left17:58
← JeffH left18:01
← mane left18:03
← Rashad left18:03
→ yoyofreeman joined18:05
→ larryv joined18:05
→ hamedariyo joined18:10
← Gary_Sinise left18:11
→ hbautista_ joined18:16
→ nvmd joined18:17
→ skapata joined18:19
← reprazent left18:19
→ reprazent_ joined18:20
reprazent_ → reprazent18:20
→ shortcircuit joined18:20
← lostlazy left18:21
→ stats4647 joined18:25
→ ThorMojito joined18:26
← kjartan left18:26
← gblfxt left18:26
← hamedariyo left18:27
→ hamedariyo joined18:27
← stats4647 left18:29
← hamedariyo left18:30
→ hamedariyo joined18:31
← GNUmoon left18:31
→ zer0bitz_ joined18:32
→ kjartan joined18:33
→ GNUmoon joined18:34
← iomari891 left18:34
← zer0bitz left18:34
→ causasui joined18:36
← odoood left18:43
← Tabmow left18:46
→ john_johnk joined18:46
→ Tabmow joined18:49
← diod left18:51
→ flom84 joined18:51
→ abubakarsadiq joined18:54
← nvmd left18:58
← overseasons left18:59
← Chaser left18:59
← konsolebox left19:00
→ nvmd joined19:00
→ coot joined19:01
→ Chaser joined19:02
← Chaser left19:02
← FTX514 left19:02
→ Chaser joined19:03
→ stats4647 joined19:04
→ FTX514 joined19:04
← FTX514 left19:07
← stats4647 left19:08
→ overseasons joined19:15
← overseasons left19:15
→ overseasons joined19:15
← bywaterloo left19:18
← shinonome left19:19
← overseasons left19:20
← hbautista_ left19:25
← gas51627 left19:29
← jacobk left19:31
→ overseasons joined19:32
← overseasons left19:32
→ overseasons joined19:32
← flom84 left19:37
→ bywaterloo joined19:37
← overseasons left19:38
← jonosterman left19:39
→ odoood joined19:43
← f_ left19:43
← bf_ left19:47
→ overseasons joined19:49
← overseasons left19:49
→ overseasons joined19:49
← Chaser left19:51
← john_johnk left19:52
← kjartan left19:53
← feriman left19:54
← overseasons left19:54
→ overseasons joined20:00
← overseasons left20:00
→ overseasons joined20:00
← FinnElija left20:01
→ FinnElija joined20:02
← dmc left20:04
→ Betal joined20:06
→ dmc joined20:06
← crabbedhaloablut left20:10
→ cdown joined20:11
← Betal left20:12
→ Betal joined20:12
→ daniel3 joined20:14
→ Siecje joined20:14
Siecje I did git mv and then changed the file. But I wanted to split my work up into two commits so I restored the git mv. Now when I add both files git doesn't automatically treat it as a move because too much of the file has changed.20:15
How can I force the git mv?20:17
→ cdown_ joined20:19
← stolen left20:20
j416 Siecje: rename first, then change20:21
Siecje: two commits20:21
Siecje Okay I even copied the file then reverted everything then did git mv then copied back and it is not a move20:21
← cdown left20:21
Siecje j416: okay thanks20:21
cdown_ → cdown20:22
j416 I'm not sure what you mean by that20:22
Siecje I did mv $dest $dest2; git restore --staged; git restore ...; git mv; mv $dest2 $dest20:23
And it didn't show up in git as a move20:23
I have 2 other files that do show up as a move, I guess I will restore those as well for the second commit20:24
← ThorMojito left20:24
j416 'git mv' is a shorthand for 'mv' followed by 'git add'; it's nothing special apart from that20:25
git doesn't record renames in a special way20:26
→ stats4647 joined20:28
← stats4647 left20:28
→ stats4647 joined20:29
→ jacobk joined20:30
← psukys left20:33
← stats4647 left20:34
Siecje I did it in two commits, but when I view the MR on GitLab it shows deleted and add. Does that mean history is lost?20:34
→ Cirdo joined20:38
j416 are you able to link to the repo?20:38
osse most hosts show a PR one whole diff and then you can click around to view individual commits I think20:39
delete + add sounds reasonable then20:40
j416 Siecje: check the diff for each commit (git show <commit>), or if that's not enough, check out and compare the state at each commit to see that it is what you expected20:41
Siecje j416: No it's private.20:42
each commit is fine20:42
← Cirdo left20:43
→ Cirdo joined20:43
← R2robot left20:44
j416 gitlab's UI might not show the exact same output as git does; it might use its own differ/diff configuration20:44
osse then it's fine20:44
there is basically only one way to record this in git's history anyway20:45
→ R2robot joined20:45
← dmc left20:50
→ dmc joined20:52
← rossome left20:53
→ vysn joined20:53
← makara left20:59
← makara1 left20:59
← Inline left21:01
← jacobk left21:01
← aspirin left21:01
→ diod joined21:02
← Dotz0cat left21:03
→ ThorMojito joined21:05
→ Dotz0cat joined21:05
→ mven2 joined21:05
← mven left21:09
mven2 → mven21:09
→ makara joined21:11
→ makara1 joined21:12
← abubakarsadiq left21:16
← coot left21:16
← llh left21:20
→ nate2 joined21:21
→ epicout joined21:22
← epicout left21:22
→ epicout joined21:22
← epicout_ left21:25
← nate2 left21:25
← gh34 left21:26
→ humanface joined21:26
→ delay joined21:26
← delay left21:26
← ThorMojito left21:27
← diod left21:28
← Cirdo left21:30
→ chandash joined21:31
→ Cirdo joined21:31
← daniel3 left21:35
← Cirdo left21:35
← Dotz0cat left21:36
→ Dotz0cat joined21:39
→ Cirdo joined21:39
→ Rashad joined21:44
→ tirnanog joined21:55
← Siecje left21:59
← bywaterloo left21:59
→ szkl joined22:03
← Cirdo left22:07
← vysn left22:10
→ cliluw joined22:14
← igemnace left22:18
→ diod joined22:19
← diod left22:19
→ Techcable joined22:27
→ ThorMojito joined22:30
→ stats4647 joined22:30
→ Dotz0cat_ joined22:31
← Dotz0cat left22:31
← overseasons left22:33
Dotz0cat_ → Dotz0cat22:33
← causasui left22:41
← nyah left22:42
← stats4647 left22:43
→ ThorMojito1 joined22:43
← ThorMojito left22:46
→ shinonome joined22:49
→ overseasons joined22:50
← overseasons left22:50
→ overseasons joined22:50
→ shokohsc51080 joined22:50
← shokohsc5108 left22:52
shokohsc51080 → shokohsc510822:52
← overseasons left22:54
→ ferdna joined23:00
← yuljk left23:06
← Noisytoot left23:06
→ yuljk joined23:06
→ diod joined23:08
← humanface left23:10
→ Noisytoot joined23:10
← Lord_of_Life left23:14
→ Lord_of_Life joined23:15
← odoood left23:15
→ riposte joined23:18
← tomhg left23:18
← ThorMojito1 left23:19
← chandash left23:22
→ overseasons joined23:23
← overseasons left23:23
→ overseasons joined23:23
← navirc left23:24
← Lord_of_Life left23:27
→ Lord_of_Life joined23:27
← overseasons left23:27
← ferdna left23:28
→ tomhg joined23:35
← Lord_of_Life left23:37
← riposte left23:37
→ riposte joined23:38
→ Lord_of_Life joined23:39
→ overseasons joined23:39
← overseasons left23:39
→ overseasons joined23:39
← Ranhir left23:40
← cdown left23:41
← overseasons left23:43
→ llh joined23:44
← zulutango left23:44
→ zulutango joined23:44
→ chandash joined23:48
→ ackyshake joined23:49
← leah2 left23:51
← chandash left23:54
→ leah2 joined23:54
→ overseasons joined23:56
← overseasons left23:56
→ overseasons joined23:56
← riposte left23:57
← Rashad left23:57
→ BUSY joined23:58
→ riposte joined23:58

Logs Search ←Prev date Next date→ Channels Documentation