IRCloggy #git 2023-12-28

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-12-28

← Sasazuka left00:01
← bambanxx left00:03
→ bambanxx joined00:05
← epony left00:07
→ epony joined00:09
← lostlazy left00:19
→ miigotu joined00:20
← jklfds left00:20
→ Sasazuka joined00:20
→ lostlazy joined00:24
← bambanxx left00:25
← lostlazy left00:30
→ jklfds joined00:32
← zetef left00:32
→ zetef joined00:33
← zetef left00:33
→ lostlazy joined00:33
← juergh left00:34
→ bambanxx joined00:34
→ juergh joined00:34
← mingdao left00:37
→ mingdao joined00:42
← bambanxx left00:47
← wootehfoot left00:49
← liefer396 left00:50
→ keypushe- joined00:56
← keypusher left00:57
keypushe- → keypusher00:59
→ Lord_of_Life_ joined01:17
← Lord_of_Life left01:18
Lord_of_Life_ → Lord_of_Life01:18
← Leonarbro left01:24
→ peirik_ joined01:29
→ peirik- joined01:31
→ peirik__ joined01:34
← peirik_ left01:35
← jklfds left01:35
← peirik- left01:37
← peirik__ left01:41
→ zumba_addict joined01:41
→ peirik_ joined01:42
← zumba_addict left01:42
→ zumba_addict joined01:43
→ reset joined01:45
→ jklfds joined01:48
→ nivag_2c joined01:52
← thiago left01:53
← m_antis left02:10
→ rgrinberg joined02:13
← gchound left02:13
→ m_antis joined02:25
← m_antis left02:29
← oriba left02:42
→ dreamLogic joined02:42
← nivag_2c left02:43
← Guest146856 left02:47
← navi left02:50
← insidesources left02:50
← jklfds left02:51
→ jklfds joined02:55
← FH_thecat left03:00
← jklfds left03:02
→ m_antis joined03:03
→ rosco joined03:05
← m_antis left03:10
→ finn_elija joined03:26
← FinnElija left03:26
finn_elija → FinnElija03:26
→ nate4 joined03:27
→ igemnace joined03:28
← FinnElija left03:29
→ FinnElija joined03:30
→ jklfds joined03:31
← nate4 left03:32
← donofrio left03:35
→ FH_thecat joined03:39
← lunatiq left03:40
← defec7ed left03:42
→ lunatiq joined03:44
← lunatiq left03:44
→ lunatiq joined03:44
← weko left03:47
← derpydoo left03:51
← gsi left03:56
→ weko joined03:57
→ gsi joined03:58
→ lemuria joined04:03
← rosco left04:07
→ crabbedhaloablut joined04:11
← Guest1235 left04:16
← bindu left04:24
→ bindu joined04:25
→ donofrio joined04:33
← jklfds left04:37
→ Guest1235 joined04:40
→ defec7ed joined04:49
← defec7ed left04:53
← Vonter left04:55
→ Vonter joined04:56
→ zoorat joined05:00
← ZMarkGC left05:01
← krushia left05:04
→ defec7ed joined05:05
→ jklfds joined05:07
← igemnace left05:09
→ igemnace joined05:10
← jklfds left05:12
→ ZMarkGC joined05:19
→ nivag joined05:19
← tjr left05:20
← igemnace left05:25
← dreamLogic left05:25
← nivag left05:26
← Jck_true left05:26
→ Jck_true joined05:27
→ jklfds joined05:27
← jklfds left05:32
→ nivag joined05:33
→ jklfds joined05:45
← troyt left05:46
→ masoudd_ joined05:47
→ nanobot567 joined05:51
← nivag left05:54
← nanobot567 left05:59
← tomboy64 left06:04
→ tomboy64 joined06:04
→ nivag joined06:07
← donofrio left06:10
→ troyt joined06:13
→ xdminsy joined06:13
← PantelicGR left06:14
← szkl left06:23
← Jck_true left06:29
→ Jck_true joined06:30
→ hbautista joined06:37
→ rosco joined06:40
← zumba_addict left06:44
chillxmas → grpc06:47
← jklfds left06:49
← hbautista left06:50
← zoorat left06:50
← rosco left06:55
← din0 left06:57
← nivag left06:58
→ jklfds joined07:01
← bket left07:03
→ bket joined07:06
← jklfds left07:07
← weko left07:08
→ weko joined07:09
← distant left07:11
← Sasazuka left07:13
→ jklfds joined07:19
← jklfds left07:24
→ jklfds joined07:28
→ nate4 joined07:29
← nate4 left07:34
→ jmd joined07:34
← jklfds left07:41
→ Maxb0tbeep joined07:41
→ jklfds joined07:52
→ Sasazuka joined08:01
→ john_johnk joined08:01
← Jck_true left08:04
→ AAI4ZW joined08:04
→ Jck_true joined08:05
← skapata left08:06
→ Jck_true8 joined08:08
← Maxb0tbeep left08:08
← Jck_true left08:09
Jck_true8 → Jck_true08:09
→ fdan joined08:10
← Betal left08:11
← jas-maelstrom left08:14
← Jck_true left08:15
→ Jck_true joined08:16
→ StucKman84 joined08:19
← Quack left08:23
→ Quack joined08:25
→ dsrt^ joined08:25
→ MGF_Fabio joined08:25
← MGF_Fabio left08:27
→ MGF_Fabio joined08:28
← fdan left08:30
→ sanTmue joined08:41
← khrbtxyz left08:46
→ khrbtxyz joined08:47
← Sasazuka left08:55
← sanTmue left08:55
→ YuGiOhJCJ joined08:56
← masoudd_ left08:57
← mkosmo2 left08:59
→ mkosmo2 joined09:04
← JanC left09:06
→ [codemonkey] joined09:11
→ JanC joined09:14
→ coot joined09:14
→ wootehfoot joined09:15
→ masoudd_ joined09:17
← Quack left09:17
→ jas-maelstrom joined09:18
→ m_antis joined09:19
→ Quack joined09:23
→ szkl joined09:23
→ xzed joined09:26
→ rty joined09:26
← peirik_ left09:28
→ mobidrop joined09:30
← rgrinberg left09:36
→ lacrymology joined09:36
→ rgrinberg joined09:44
← miigotu left09:53
→ miigotu joined09:53
j416 enrh: haha. another time then.09:57
← m_antis left09:58
← Quack left10:02
← farzat left10:02
← wootehfoot left10:06
→ Quack joined10:06
← StucKman84 left10:09
→ igemnace joined10:12
→ m_antis joined10:16
← hussein1 left10:20
→ hussein1 joined10:21
← rgrinberg left10:22
→ sahil_ joined10:24
← Quack left10:26
← YuGiOhJCJ left10:27
← sahil_ left10:28
→ peirik_ joined10:29
→ Quack joined10:29
← Quack left10:39
→ dizo joined10:42
→ Quack joined10:43
← xdminsy left10:43
→ xdminsy joined10:44
→ duxsco joined10:53
← miigotu left10:53
→ miigotu joined10:53
← hussein1 left10:56
→ hussein1 joined10:56
← Quack left10:56
← lacrymology left10:56
→ zoorat joined11:01
→ Quack joined11:15
← xx left11:15
→ xx joined11:18
← dsimic left11:25
← hyperair left11:25
→ thiago joined11:26
→ BlessJah joined11:27
→ dsimic joined11:27
→ mane joined11:30
← Quack left11:30
→ nate4 joined11:31
→ weko_ joined11:33
← xzed left11:33
→ hyperair joined11:34
← nate4 left11:35
← weko left11:36
← masoudd_ left11:37
→ Quack joined11:38
→ peirik- joined11:41
← peirik_ left11:44
← zoorat left11:47
← igemnace left11:47
→ bambanxx joined11:48
← Quack left11:50
← peirik- left11:54
→ lacrymology joined11:57
← theobjectivedad left11:58
→ theobjectivedad joined11:59
→ igemnace joined12:04
→ masoudd_ joined12:04
← CrunchyFlakes left12:13
→ Quack joined12:16
→ CrunchyFlakes joined12:17
→ fdan joined12:18
← miigotu left12:20
→ miigotu joined12:22
→ rgrinberg joined12:26
← Quack left12:26
← duxsco left12:32
← bambanxx left12:38
→ fling_ joined12:39
→ bambanxx joined12:39
← fling left12:40
→ Quack joined12:43
← dsrt^ left12:47
fling_ → fling12:47
← BlessJah left12:48
→ rsx joined12:48
→ BlessJah joined12:50
→ rainystorm joined12:52
← Quack left12:52
→ donofrio joined12:55
→ peirik_ joined12:57
→ sa0 joined12:57
← peirik_ left12:57
← gildasio left12:58
→ navi joined12:58
→ gildasio joined12:58
→ h-erectus joined12:59
→ realies joined12:59
← _sa0sin_ left13:00
← john_johnk left13:05
← fling left13:06
→ fling joined13:06
→ Quack joined13:10
← bambanxx left13:13
→ bambanxx joined13:16
→ weedmic joined13:18
→ dnh joined13:21
→ peirik_ joined13:21
→ dsrt^ joined13:26
← lacrymology left13:29
← fdan left13:30
→ lacrymology joined13:30
jfsimon1981 → jfsimon13:30
→ epicout joined13:31
← epicout left13:31
→ epicout joined13:31
→ nivag_2c joined13:32
← strk left13:40
← szkl left13:42
→ cdown joined13:42
← h-erectus left13:49
← Quack left13:50
→ Artea joined13:50
→ derpydoo joined13:51
← peirik_ left13:51
→ lucasta joined13:54
→ Quack joined13:54
→ john_johnk joined13:54
← epony left14:04
← Jck_true left14:08
→ Jck_true joined14:08
← Night0wl3 left14:08
→ Night0wl39 joined14:08
← weedmic left14:11
← bambanxx left14:12
← nivag_2c left14:13
← jmd left14:16
→ cbreak_ joined14:16
← cbreak left14:18
→ duxsco joined14:18
→ jmd joined14:21
→ nivag_2c joined14:26
← Traneptora left14:26
← Night0wl39 left14:34
← rgrinberg left14:34
← Quack left14:34
→ Traneptora joined14:37
→ Quack joined14:39
→ Night0wl3 joined14:41
← grpc left14:46
→ zoorat joined14:47
→ regret joined14:47
← Quack left14:47
← SuperLag left14:51
→ SuperLag joined14:51
→ epicout_ joined14:51
← epicout left14:55
→ Murr- joined14:57
← Night0wl3 left14:58
← Murr left14:59
Murr- → Murr14:59
→ Night0wl3 joined14:59
→ stuv joined15:01
→ fflam joined15:03
→ epony joined15:07
→ Quack joined15:07
← kurahaupo left15:09
← davidsenk left15:14
→ davidsenk joined15:14
VioletJewel → vi6j15:16
← nivag_2c left15:21
← coot left15:26
← dnh left15:31
→ nate4 joined15:32
→ warmana joined15:33
→ nivag_2c joined15:34
← Quack left15:35
→ hbautista joined15:36
← nate4 left15:37
← hbautista left15:40
→ Quack joined15:42
← epony left15:44
← epicout_ left15:51
← cbreak_ left15:53
→ Jaxef joined15:54
→ cbreak joined15:55
← fflam left15:55
→ fflam joined15:57
→ epony joined15:59
→ dnh joined16:00
→ Guest146856 joined16:04
→ fflam_ joined16:06
← nivag_2c left16:06
← lucasta left16:08
← Quack left16:09
← masoudd_ left16:12
→ Quack joined16:18
→ Rashad joined16:19
→ Betal joined16:19
← mobidrop left16:26
← lunatiq left16:26
→ A_Dragon joined16:26
→ B4ckBOne-ghost joined16:26
→ lunatiq joined16:26
← lunatiq left16:26
→ lunatiq joined16:26
← B4ckBOne left16:27
A_Dragon → Festive_Dragon16:27
← Quack left16:28
← Festive_Derg left16:28
Festive_Dragon → Festive_Derg16:28
→ epicout joined16:30
← zoorat left16:31
← john_johnk left16:33
→ Quack joined16:35
← Rashad left16:36
← duxsco left16:37
→ Rashad joined16:39
→ kjartan joined16:41
← cdown left16:42
→ cdown joined16:43
→ XorMan joined16:48
← dnh left16:50
→ AndOrMan joined16:51
← Quack left16:52
← XorMan left16:53
← thiago left17:00
→ Quack joined17:01
← jacobk left17:09
← warmana left17:10
← rhe left17:11
→ rhe joined17:11
← Quack left17:13
→ Sasazuka joined17:13
→ coot joined17:15
← Guest1235 left17:23
→ Quack joined17:24
← xdminsy left17:25
← Guest146856 left17:26
→ skapata joined17:30
→ szkl joined17:30
→ Guest1235 joined17:31
→ john_johnk joined17:32
← Quack left17:32
← MGF_Fabio left17:33
← makara left17:38
← makara1 left17:39
→ Quack joined17:40
← Quack left17:48
vi6j → vi-17:48
→ Leonarbro joined17:56
→ Quack joined17:56
→ makara joined17:58
→ makara1 joined17:58
← Quack left18:04
← epicout left18:07
→ zetef joined18:08
→ Quack joined18:12
→ wootehfoot joined18:12
← fflam left18:15
← Rashad left18:15
→ rustyshackleford joined18:16
← AndOrMan left18:16
← haritz left18:18
← de-facto left18:19
→ de-facto joined18:20
← osse left18:20
← Quack left18:20
→ osse joined18:22
← fflam_ left18:24
← bket left18:24
→ Quack joined18:26
← mane left18:26
→ bket joined18:26
→ Rashad joined18:29
← Quack left18:38
← rty left18:39
← batrick left18:40
→ Quack joined18:45
← vysn left18:48
← Quack left18:55
→ masoudd_ joined18:57
← khrbtxyz left18:59
→ khrbtxyz joined19:02
← Artea left19:04
→ rgrinberg joined19:05
→ Artea joined19:07
→ ahmed joined19:08
← john_johnk left19:08
← Echoz left19:09
→ Quack joined19:14
→ JanC_ joined19:18
← JanC left19:19
JanC_ → JanC19:19
← rsx left19:20
← parm left19:22
← Quack left19:24
→ parm joined19:24
→ batrick joined19:27
→ Quack joined19:27
→ tjr joined19:28
→ nate4 joined19:34
← Quack left19:35
← stuv left19:37
← nate4 left19:38
→ mane joined19:40
← rgrinberg left19:41
← igemnace left19:42
→ Quack joined19:46
← dizo left19:47
← mane left19:48
← szkl left19:49
← reset left19:49
→ john_johnk joined19:49
→ Echoz joined19:51
← Quack left19:55
→ petaflot joined20:01
→ darkAffinity2368 joined20:03
petaflot hello. I'm alway very confused with git when it comes to rebasing and merges, for some reason I often manage to do it the wrong wray round. I'm in the case where I modified only a single file (I have a backup of it so I can afford to stash it), I made a fetch, checked out the (remote?) branch I want to be on, but then it all goes wrong20:04
→ Quack joined20:06
petaflot typically this is for marlinfw ; I `git checkout -f bugfix-2.1.x` I just want to stash everything that is not done by me, make sure I'm not using any obsolete code or config, this has been getting me nuts for ages (and I usually end of trashing the entire local copy of the repos to clone it again, which is obviously wrong). can anyone advise?20:07
I don't want to merge, I don't want to rebase, I just want to change branch (and stash everything)20:08
j416 petaflot: all git commands apply to what you have currently checked out, unless otherwise specified.20:08
petaflot: git checkout foo && git rebase bar, will rebase foo on bar.20:08
petaflot I made a new branch for ma changes, I want to get rid of everything20:08
j416 petaflot: git checkout foo && git merge bar, will merge bar into foo.20:09
petaflot I don't want to merge anything20:09
j416 I'm giving you general advice.20:09
→ Kroko joined20:09
petaflot thank you but this general advice I can find on https://git-scm.com/book/en/v2/Git-Branching-Rebasing and it doesn't help20:09
j416 alright, read that then. I hope you can fix your issue.20:10
o/20:10
petaflot I've read it times and times over for years but I can never find what is the correct procedure20:11
and as much as I honestly do believe git is one of the most wonderful tools ever invented in computer science (and not only), I find the doc sooo confusing (maybe it doesn't help that english is not my native language)20:14
waterkip i'm a bit puzzled with --format from git log, from what I'm reading --format='%>(4)%s' should pad four spaces before printing the subject right?20:14
← Quack left20:15
→ sanTmue joined20:15
← Rashad left20:17
← CAT_S left20:18
← Kroko left20:18
→ krushia joined20:18
← lester29_ left20:18
j416 waterkip: sounds right, yes20:18
waterkip: note that it's padding, not adding; it's for alignment20:19
→ rgrinberg joined20:20
j416 at least that's how I interpret it.20:20
waterkip: what are you trying to do?20:20
petaflot even the way the arrows point in the doc I linked above is opposite from anything that seems logical to me20:20
b0nn petaflot: If I read what you are saying, you had some changes in your branch, then you did a fetch?20:21
and that caused a merge20:21
j416 petaflot: the git object model (what is a commit, how does it relate to other commits, and so on) is useful to look into if you haven't yet.20:21
waterkip j416: something similar to: printf '%s%+10s\n' this that20:21
j416 petaflot: also, note that rebasing and merging only applies to commits; changes that you have not committed are outside of that.20:22
waterkip: I'm unfamiliar with that syntax; what does it mean?20:23
waterkip %s is in this case, just print a string20:24
→ fflam joined20:24
waterkip the %+10s means, pad the string with spaces so its 10 chars long20:25
← regret left20:25
j416 ah, I see.20:25
waterkip eg: printf '%s%+10s\n' 10 20 becomes '10 20'20:25
→ dnh joined20:27
j416 the syntax you suggested above seems to do just that.20:27
what's the issue?20:27
waterkip my expectation is that git needs to do something similar, but it isn't doing it20:27
j416 git log -1 --format='%>(10)%h' -> " 2d2c3f9"20:28
→ lester29 joined20:28
→ Quack joined20:29
waterkip ohhh I see why20:29
← rgrinberg left20:30
waterkip thnx20:30
→ CAT_S joined20:31
← dnh left20:31
waterkip the value that i'm using is bigger than the value between the ()20:31
so it doesn't pad it20:32
which is correct20:32
j416 makes sense20:32
waterkip and when you use it with %B it doesn't do it for every line in the body, but just the first one20:33
j416 also makes sense; it's one string afterall20:33
waterkip kinda sorta, but you cannot make a pretty indented subject line like format=medium20:34
or body to be more precise20:34
j416 mhm.20:34
petaflot I made a drawing of my problem: https://www.imgpaste.net/image/S7iyfu how can I get from C1 to C4 (git fetch was done after t3)20:36
← Quack left20:36
j416 petaflot: what do you want your history to look like?20:37
b0nn petaflot: you want c1, c2, and c3 to be immediately previous to c4?20:37
but not c5?20:38
waterkip petaflot: you want C0-C2-C3-C4-C5 ?20:38
← Sasazuka left20:38
j416 ah, you don't have C4 yet?20:39
git checkout X1 && git merge C320:39
that will create a new commit on branch X1 that combines C1 and C320:39
petaflot I don't "know" how I want my history to look like, I just want it to make sense in "a git way" (and I want only the single line I changed and committed on C1 to differ from 'X') ; ie. I were to make a patch that diffs C0/C1 I want to re-apply that patch to C320:39
no I don't have C4 yet20:40
waterkip and you want to keep history?20:40
→ Sasazuka joined20:40
j416 you should give that some thought; consistent structure makes the repo easier to work with. If the project you're working on already has some set way of working, try to follow that.20:40
petaflot waterkip: what history? my single patch?20:40
b0nn There's a few options available to you - merging the upstream changes into your branch, cherry picking them, and rebasing your branch such that your c1 is after c2 and c320:41
j416 waterkip: not sure if there is a format string that can do that; re: indent the body20:41
waterkip yes, sorta, do you want: C0-C1-C2-C3 or do you want C0-C2-C3-C1 ?20:41
petaflot j416: can't I do use a reference to the branch name ('X') rather than a specifig commit ('C3') ?20:41
→ Quack joined20:41
B4ckBOne-ghost → B4ckBOne20:41
waterkip petaflot: you can, but you updated the reference to include C5 with t5 fetch20:42
j416 petaflot: if C3 is the last commit of branch X, you can say X.20:42
petaflot j416: in this case, C5 hasn't happend yet20:42
j416 petaflot: if C3 is the one before the last commit, you can say X^.20:42
→ regret joined20:42
waterkip petaflot: than you can just merge X into your branch20:43
j416 petaflot: apart from the pre-written commit message that will change a bit depending on if you give merge a branch name or a commit reference (regardless of how you specify that commit apart from just the branch name), there's no difference in the merge result20:43
waterkip j416: re body: me neither20:44
petaflot so in order sth like "git clone [repo] ; git checkout X ; git branch X1 ; git checkout X1 ; [edit file] ; git commit ; [ wait a while ] ; git fetch ; git merge X" and this is it?20:45
j416 I seem to remember reading that there's a default format string; but can't find that part in the man page. Might be that it doesn't even apply to the medium format.20:45
← zetef left20:45
j416 petaflot: not quite20:45
petaflot: git fetch will not affect anything here20:45
petaflot so when do I do the pull20:46
b0nn petaflot: I personally default to rebasing such that my changes are placed after the changes to the upstream branch20:46
j416 petaflot: you mention no pull20:46
what b0nn suggests is usually a good workflow20:46
when rebasing, one must keep in mind that whatever you rebase on might affect your changes; always check that your changes are still correct after the rebase20:47
petaflot ideally I want my git history to look like https://www.imgpaste.net/image/S7iMqz (dashed lines are obsolete)20:48
which AFAIK is what b0nn suggests20:48
j416 petaflot: that's exactly what rebase will accomplish20:48
waterkip petaflot: with using git fetch you only update the reference, you don't change anything local. if you switch to branch X locally you would see so much ahead so much after remote/X, you need to merge remote/X first into your local branch20:48
j416 petaflot: indeed20:48
waterkip petaflot: you can also merge the remote: eg, git fetch && git merge remote/X20:49
j416 petaflot: git clone <repo>; git checkout X; git branch X1; git checkout X1; [edit file]; git commit; [wait a while]; git checkout X; git pull; git checkout X1; git rebase X20:49
something like that.20:50
→ mane joined20:50
b0nn petaflot: there are a few ways to do this, you can manually rebase every time, or you can configure git to default to rebasing (as per https://stackoverflow.com/questions/13846300/how-to-make-git-pull-use-rebase-by-default-for-all-my-repositories)20:51
← Quack left20:51
petaflot j416: oh right so I _need_ to checkout X *then* pull *then* checkout X1 *then* rebase on X20:51
b0nn The manual way is good for learning, but once you get lazy, gitconfig is your friend20:51
j416 petaflot: yes, because all operations affect what is _currently checked out_20:52
petaflot .. except fetch, right?20:52
j416 yes, fetch, as waterkip mentions, updates your remote tracking branches20:52
it does not affect what you have currently checked out20:52
remote tracking branches being for example origin/foo20:53
that's a copy of what was a the remote that last time you ran fetch20:53
(or pull, which is fetch + merge)20:53
waterkip petaflot: fetch is just updating references, pull is fetch + merge20:53
or rebase, depending on pull.rebase config20:53
j416 nod20:54
nowadays, pull won't merge by default either20:54
I think.20:54
waterkip correct20:54
you need to set something for pull.rebase20:54
j416 it'll err out and ask you to tell it what you want20:54
petaflot and this is where I'm like "do what I want to do, I don't uderstand what you're asking"20:55
j416 but this is a side-track20:55
→ AndOrMan joined20:55
waterkip petaflot: read into git pull, git fetch20:55
j416 petaflot: know what you want, then find the commands, rather than the other way round or trial and error :)20:55
petaflot: your drawing made it quite clear, thanks for that20:56
waterkip petaflot: and look into the .git dir, specifically, refs, before and after you do fetch/pull and merge20:56
petaflot j416: lol, do oyu know how many times I've made copies of my local repositories (including changes) in order to figure out what the correct commands were (and then forgetting what actually worked, and having to start all over again)20:57
j416 but note that refs may be packed, so you might not actually see them there.20:57
petaflot: heh.20:57
petaflot whatever "packed" means20:57
....20:57
j416 petaflot: that's kind of what git is for, to allow you to not make copies of stuff20:57
petaflot: packed means it's stored in a packfile; it makes it faster for git to access and it takes up less space20:58
← fflam left20:58
j416 it's nothing you need to care about much20:58
git internal.20:59
petaflot I've "broken" some repositories to the point where my history got soo confusing I just trashed the entire history and started new after hours of manual merging. totally what git is supposed to avoid20:59
waterkip petaflot: you can always make copies of a branch, eg git checkout mybranch && git checkout -b copy-of-mybranch20:59
j416 "git checkout -b mybranch" is the same as "git branch mybranch && git checkout mybranch".20:59
← jmd left21:00
petaflot I've always been quite upset that "git branch foo" did not automatically checkout to foo (because if I make a branch, what reason would I have not to check it out) and then I made changs to the wrong branch21:01
→ masoudd__ joined21:01
j416 "git branch foo" is a great way to create a temporary branch that references whatever commit you're currently on, so that you can go back to that later in case you screw up.21:02
waterkip you even have git branch -c21:02
petaflot then I use gitk whenever I can, but sometimes on remotes machines this is not straightforward (and gitk doens't let me clean my tree)21:02
b0nn petaflot: I alias a lot of commands, checkout is co on my machines - so it's just `git co - b newBranch`21:02
j416 petaflot: git log --online --graph21:02
aliases are handy.21:03
waterkip petaflot: good luck with everything. The rest of you, ttfn, I'm going for a run21:03
j416 run; nice.21:03
petaflot $thanks for your help guys21:03
j416 go go go21:03
waterkip j416: thnx for the help with format ;)21:03
b0nn er, ignore the space between - and b21:03
→ Quack joined21:03
j416 \^^/21:03
→ thiago joined21:04
petaflot going to chill out/sleep, it's 10pm here21:04
← masoudd_ left21:04
waterkip b0nn: i use git nb for that, that's a script that created the branch name based on ticket ID's, eg git nb 1234 some random thing becomes ISSUE-1234-some_random_thing21:05
petaflot copied the conversation and will study it again tomorrow with a clear head21:05
b0nn waterkip: oh, that sounds handy21:05
waterkip yeah, and I overengineered it, soe the commit message also uses the issue ID from the branch name in the commit message21:09
→ rgrinberg joined21:10
waterkip which is even handier because audit reasons at $work21:10
b0nn must see21:11
b0nn have you got a gist of it?21:11
← rainystorm left21:11
waterkip https://gitlab.com/waterkip/bum/-/tree/master/hooks21:12
← Sasazuka left21:12
← Quack left21:13
b0nn hmm, that looks nice (it should work in bash right? I see that it's in zsh)21:13
waterkip this is a zsh0ism: REGEXP="${(j:|:)PREFIXES=}"21:14
b0nn ok21:14
waterkip This too: ISSUE=(${(@s:-:)CUR}) and ISSUE=(${(@s:-:)CUR}) as well21:14
its a join, aand a split21:15
should be fairly simple to port to bash I think21:15
b0nn Heh - I wonder how well chatGPT will go at porting it :)21:16
b0nn asked it about porting some Prolog to Go the other day and it nearly cried)21:16
waterkip i think this is a join in bash: ${@/#/$d} where $d is the join char21:18
← kjartan left21:21
waterkip b0nn: you use vim?21:22
b0nn Yes :)21:22
waterkip https://gitlab.com/waterkip/bum/-/blob/master/bin/vim-git I use this editor for it ;)21:22
→ Sasazuka joined21:22
← weko_ left21:23
waterkip so you can start typoiung after the ISSUE-1234:21:23
b0nn Y'know, I've tried using git inside vim with one of timpope's extensions, but I just cannot get the flow right, and almost always go back to the command line21:23
waterkip like I said, I overengineered it21:24
same here21:24
I always useanother term21:24
b0nn yeah - tmux for the win21:24
waterkip i3, tiling wm21:24
b0nn Oh, I see that code opend a vim instance21:24
← LuKaRo_ left21:24
← mane left21:25
b0nn I have i3 for the windows, but tmux inside the terminal - so I have one window for browser, and one for the terminal (almost makes i3 unneeded)21:25
→ LuxuryMode joined21:25
→ Quack joined21:25
waterkip I have a 49 inch screeen21:25
b0nn Oh, I am on the RPi atm, with a 27inch, but I also have the desktop on a 55inch tv21:26
enrh Can someone remind me how to clear unused branch names? The ones that show in red when doing git branch -a21:26
← Traneptora left21:28
← sanTmue left21:30
ikke git fetch --prune origin21:33
enrh ikke: Thank you!21:33
← Quack left21:34
ikke Those are called remote tracking branches21:34
→ LuKaRo joined21:34
← xx left21:35
← darkAffinity2368 left21:37
enrh Interesting, those words actually make sense to me!21:37
→ darkAffinity2368 joined21:38
→ JeffH joined21:38
JeffH How can I do a 'git checkout HEAD~ -- file' and have it checkout as if it were untracked?21:39
→ Quack joined21:43
→ Maxb0tbeep joined21:44
← Quack left21:51
→ PantelicGR joined21:51
← coot left21:54
← miigotu left21:56
→ miigotu joined21:58
← luca left21:59
→ luca_ joined21:59
luca_ → luca22:00
→ Quack joined22:01
← rgrinberg left22:01
→ bambanxx joined22:02
→ liefer396 joined22:03
ikke git restore --source HEAD~ -- file22:04
b0nn waterkip: this is really helpful, thanks for sharing22:04
circuitbone Non destructive > destructive. leave it all around in case.22:06
→ weko joined22:08
← Quack left22:10
JeffH thanks22:13
→ rgrinberg joined22:14
← donofrio left22:15
← Maxb0tbeep left22:17
→ Quack joined22:17
← AndOrMan left22:18
j416 JeffH: checkout + reset would also work22:23
← Vonter left22:24
JeffH J416: I ended up doing 'git show HEAD~1:<file> > <file>22:25
that worked.22:26
→ Vonter joined22:26
← bambanxx left22:27
j416 git, what a versatile tool.22:28
→ bambanxx joined22:33
← Quack left22:41
→ Quack joined22:46
← Quack left22:55
← masoudd__ left22:57
→ user03 joined22:57
user03 → gchound22:58
waterkip b0nn: yw22:59
→ fflam joined22:59
→ Quack joined23:02
← Leonarbro left23:04
← Quack left23:12
→ AndOrMan joined23:16
← AndOrMan left23:17
→ AndOrMan joined23:17
← AndOrMan left23:18
→ AndOrMan joined23:19
→ lacrymol1gy joined23:21
← LuKaRo left23:22
→ Quack joined23:22
← PantelicGR left23:22
← lacrymology left23:22
→ LuKaRo joined23:26
← Quack left23:35
→ nate4 joined23:35
← nate4 left23:40
← jklfds left23:46
→ jklfds joined23:48
← jklfds left23:52
→ cpackham joined23:55
← cpackham left23:58

Logs Search ←Prev date Next date→ Channels Documentation