IRCloggy #git 2022-07-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.

2022-07-28

← elkalamar left00:01
→ segfaultfizzbuzz joined00:07
→ lucasta joined00:08
→ vysn joined00:14
→ tejr joined00:20
→ kevr_ joined00:20
← kevr left00:21
← vysn left00:21
← segfaultfizzbuzz left00:21
→ vysn joined00:21
← elastic_dog left00:22
ccx osse: Yeah, the issue of centralized hosting is something FOSS has been struggling with for a while. If you dig through ESR's old writing there will be lot about making open-source forge software and a migration tools to get people off SF and other proprietary services.00:27
← bambanxx left00:28
→ elastic_dog joined00:29
ccx Is there a command to get content of just one file at a particular commit? (In bazaar/breezy this is `bzr cat -r revisionspec filename`)00:31
→ Xenguy joined00:32
← rama left00:33
← Sasazuka left00:36
← konrados left00:37
← rgrinberg left00:39
← pflanze left00:41
mackerman ccx: git cat-file blob <tree-ish>:<path>00:44
→ dodobrain joined00:44
→ DreamweaverN joined00:45
ccx mackerman: thanks!00:46
mackerman You are welcome.00:46
← xx left00:46
→ lemonsni- joined00:48
← lemonsnicks left00:48
← thebombzen left00:50
← ghost43 left00:51
← FinnElija left00:51
← gildasio left00:51
→ Shentino joined00:51
→ ghost43 joined00:51
→ FinnElija joined00:51
→ gildasio joined00:52
← Shentino left00:58
← KaitoDaumoto left01:04
→ Shentino joined01:04
→ vitali64 joined01:06
→ gildasio1 joined01:10
← gildasio left01:10
→ Misotauros joined01:12
← vitali64 left01:12
← thiago left01:13
← Grace left01:15
→ rgrinberg joined01:18
→ haritz joined01:21
← haritz left01:21
→ haritz joined01:21
← DaNeenjah left01:23
← umbramalison left01:24
→ umbramalison joined01:25
← lolok left01:31
← cdown left01:35
← tsraoien left01:41
← FinnElija left01:42
→ FinnElija joined01:42
← gildasio1 left01:58
→ segfaultfizzbuzz joined01:58
← segfaultfizzbuzz left02:02
← fling left02:03
← adanwan left02:03
← YuGiOhJCJ left02:03
← FinnElija left02:03
← kevr_ left02:03
→ FinnElija joined02:03
→ YuGiOhJCJ joined02:03
→ adanwan joined02:03
→ fling joined02:03
← Yruama left02:04
→ kevr joined02:04
← YuGiOhJCJ left02:07
→ YuGiOhJCJ joined02:08
→ thebombzen joined02:10
← rgrinberg left02:13
← pretty_dumm_guy left02:14
→ tsraoien joined02:15
← erarnitox left02:17
← dodobrain left02:17
→ dodobrain joined02:18
← ferdna left02:20
← adanwan left02:23
→ adanwan joined02:23
→ thiago joined02:23
← eqw left02:24
→ eqw joined02:25
← kevr left02:36
← YuGiOhJCJ left02:36
→ YuGiOhJCJ joined02:36
→ kevr joined02:37
→ rgrinberg joined02:39
← rgrinberg left02:40
← tsraoien left02:42
→ rgrinberg joined02:42
→ musashi joined02:49
musashi Hello! Is there a way to `git log --pretty=oneline > FIX.TXT`, edit the commit messages in FIX.TXT and then feed it back into the repo somehow?02:50
Trying to batch edit commit messages02:50
← kevr left02:56
→ kevr joined02:56
npcomp musashi, I think you want `git rebase -i <commit before all the ones you want to reword>`02:56
You will have to do it one at a time that way.02:57
rewt musashi, have a look at git-filter-repo's --replace-message or --message-callback02:59
← YuGiOhJCJ left03:01
→ YuGiOhJCJ joined03:01
← YuGiOhJCJ left03:05
npcomp Hmmm, just hunting around for this, also found git-revise , which I had never heard of before.03:05
→ YuGiOhJCJ joined03:05
← gast0n left03:07
musashi Cool03:07
There's no real way to batch edit based on a changed FIX.TXT though? Would make things a whole lot easier03:09
← lucasta left03:10
← tyson2 left03:10
→ rickybob joined03:13
musashi Is there a way to add it as a feature request to Git maybe? I'll reword manually for now though, cheers!03:15
Or maybe we could try to write a Zsh/Bash script to do it for us?03:19
← hexnewbie left03:21
→ hexnewbie joined03:23
← vysn left03:28
→ vysn joined03:30
← atrigent left03:30
← bloody left03:36
← farzat left03:36
→ farzat joined03:38
← tejr left03:43
← vysn left03:50
→ saroy joined03:55
→ sandipan joined03:57
← saroy left04:02
← sandipan left04:02
← FinnElija left04:03
← zebrag left04:04
→ lucasta joined04:04
← kevr left04:06
→ ghost43_ joined04:06
→ fling_ joined04:07
→ kevr joined04:07
← pulse left04:08
→ Sasazuka joined04:09
← fling left04:09
← ghost43 left04:09
→ vqueiroz joined04:10
← rgrinberg left04:11
→ FinnElija joined04:12
← Sasazuka left04:13
fling_ → fling04:14
← randm left04:15
→ randm joined04:15
← lucasta left04:15
← sudoforge left04:15
← dodobrain left04:17
→ lucasta joined04:18
← Xenguy left04:18
→ dodobrain joined04:18
→ Xenguy joined04:18
→ The_Blode joined04:21
→ mat001 joined04:21
→ vicky_ joined04:22
← vicky_ left04:22
← randm left04:23
→ randm joined04:23
→ maryo joined04:24
← mat001_ left04:24
← chao left04:25
→ rama joined04:33
→ vdamewood joined04:34
← randm left04:35
→ randm joined04:35
← rama left04:37
→ matt0x6f joined04:37
← jazzy left04:41
→ Sasazuka joined04:42
← Sasazuka left04:46
→ forgotmynick joined04:49
→ Techcable joined04:59
→ srinidhi joined05:00
← Techcable left05:01
→ Techcable joined05:01
→ matt0x6f_ joined05:04
← matt0x6f left05:07
matt0x6f_ → matt0x6f05:07
← moldorcoder7 left05:07
← FinnElija left05:08
← thiago left05:08
← vdamewood left05:10
→ FinnElija joined05:11
→ madewokherd` joined05:17
← madewokherd left05:20
→ saroy joined05:20
← FinnElija left05:21
→ FinnElija joined05:23
← Sazhen86 left05:31
← maryo left05:36
→ vdamewood joined05:40
← Murr left05:50
→ Murr joined05:51
→ Sazhen86 joined05:55
→ RiFo joined05:55
→ xx joined06:00
→ EvilDMP joined06:02
← loulou_ left06:06
→ rsx joined06:10
← hbautista left06:11
→ coot joined06:14
← dodobrain left06:17
→ dodobrain joined06:18
→ zeenk joined06:18
→ loulou_ joined06:19
← loulou_ left06:19
→ loulou_ joined06:19
← saroy left06:21
→ saroy joined06:22
→ rickayy joined06:23
→ bkircher joined06:25
← rickybob left06:27
← rickayy left06:28
→ gunner joined06:33
← gunner left06:34
→ gunner joined06:43
← skapata left06:45
← lucasta left06:50
→ jinsun__ joined06:53
jinsun → Guest758306:53
jinsun__ → jinsun06:53
→ atrigent joined06:54
← Guest7583 left06:55
→ Murr- joined06:57
← Murr left07:00
Murr- → Murr07:00
← k_sze left07:04
→ k_sze joined07:05
← unluckyshrubbery left07:05
← k_sze left07:07
→ k_sze joined07:10
← Leonarbro left07:11
→ Qbit_ joined07:14
→ csm3105 joined07:21
← gunner left07:22
→ rfuentess joined07:24
← YuGiOhJCJ left07:25
→ YuGiOhJCJ joined07:26
→ lucasta joined07:28
← riposte left07:34
→ finalriposte joined07:34
→ MajorBiscuit joined07:40
← xx left07:42
→ iomari891 joined07:43
→ gunner joined07:46
← Qbit_ left07:46
→ mbalmer joined07:48
→ Sasazuka joined07:52
→ gryffus joined07:53
← Sasazuka left07:57
← gryffus left07:57
→ feriman joined07:58
→ chao joined08:08
← rsx left08:14
← dodobrain left08:17
→ dodobrain joined08:17
→ gryffus joined08:18
→ Anticom joined08:22
← csm3105 left08:26
→ Sasazuka joined08:26
chao → stenno08:27
→ dante-as joined08:27
→ csm3105 joined08:28
← Sasazuka left08:31
← vicecea left08:36
→ vicecea joined08:37
→ lxsameer joined08:37
→ dionysus69 joined08:37
→ mncheck-m joined08:37
→ Hi-Angel joined08:40
Hi-Angel Did anybody notice that `git cherry-pick` applies commits in a weird order? I can't seem to find that documented08:41
← Misotauros left08:41
Hi-Angel Like, I has this command `git cherry-pick 467a9dbe4 6766307e3 c6c50a8a1^..87f756493`. You would think it first applies 467a9dbe4, right? Well no, it applies c6c50a8a1 first for some reason 🤷‍♂️08:42
Which of course results in conflicts08:42
→ mexen joined08:43
← Betal left08:45
ikke Never noticed that, though must say I haven't tried anything like that either.08:47
→ arescorpio joined08:49
→ pflanze joined08:50
→ jmabr joined08:51
Hi-Angel Actually, `man git-cherry-pick` mentions in "Examples" section some weird usage, which contradicts the rest of the documentation, although could explain the problem. The examples is this "git cherry-pick maint master..next` and is described as "Apply the changes introduced by all commits that are ancestors of maint or next, but not master or any of its ancestors.". So I would think this takes the top commit from `maint` and then the range of commits08:53
gitinfo the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html08:53
Hi-Angel `master..next`, but apparently it does something else08:53
← gunner left08:53
Hi-Angel A the same time it has a more conventional example `git cherry-pick master~4 master~2` — "[..]create 2 new commits with these changes."08:53
Not sure how it's decided what syntax is used08:54
← arescorpio left08:54
Hi-Angel But most important: the usage at the top says `git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff] [-S[<keyid>]] <commit>...`. So you'd expect just a range of commits, without any weirdness08:54
Hi-Angel sighs08:55
← hexadecagram left08:55
← atrigent left08:55
→ atrigent joined08:56
ikke Well foo..bar means ^foo bar08:56
So you exclude everything from foo08:56
So anything that is reachable by foo is excluded08:57
A08:57
Try it with the --no-walk option08:58
→ tirnanog joined09:00
→ Misotauros joined09:00
→ rendar joined09:00
rendar help! git add -A just took 100% cpu and never finished, i had to press ctrl+c09:01
any clue?09:01
Hi-Angel ikke, I'm not sure what `--no-walk` does, but `man git-cherry-pick` states that its effect is used by default, quoting "Sets of commits can be passed but no traversal is done by default, as if the --no-walk option was specified"09:01
gitinfo ikke: the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html09:01
→ Sasazuka joined09:02
ikke Hi-Angel: only if you mention individual commits09:02
Read the last part09:02
→ hexadecagram joined09:02
Hi-Angel rendar, try `--verbose` switch to see what it does09:02
ikke Hi-Angel: after <commit>..09:03
← gryffus left09:03
Hi-Angel ikke, anyway, adding a `--no-walk` to my command with commits still adds the same c6c50a8a1 commit first09:04
rendar oh i saw the problem, i had gigabytes of data into the git directory..09:04
Hi-Angel rendar, C:09:04
rendar so git -A tried to add those very big files09:04
how can i revert that? i have deleted them now09:04
Hi-Angel rendar, `git reset`09:05
rendar Hi-Angel, that wouldn't lose my non-yet-committed work, right?09:05
Hi-Angel rendar, no, that would just remove added files from index, but won't do any changes to your files09:06
rendar good thanks09:06
Hi-Angel rendar, why did you use a `-A` anyway? I usually use `git add -u`, because I never know if there's some junk in the repo, like object files or what not.09:07
← Sasazuka left09:07
Hi-Angel `-u` switch won't add any new files09:07
→ gunner joined09:07
Hi-Angel It rarely happen that you want to add new files, so in those rare cases it isn't too hard to just list them explicitly.09:07
rendar Hi-Angel, because usually i have new files in my repos, when i add new sources files..09:07
Hi-Angel Well, okay 🤷‍♂️09:08
→ gryffus joined09:10
← dante-as left09:12
← atrigent left09:21
← tirnanog left09:25
→ kenanmarasli joined09:25
→ Shentino_ joined09:28
← Shentino left09:29
← hexadecagram left09:29
→ unluckyshrubbery joined09:29
→ darkstarx joined09:30
→ elkalamar joined09:30
→ cdown joined09:32
→ Sasazuka joined09:35
→ Swahili joined09:35
→ hexadecagram joined09:37
→ zaher joined09:39
zaher hi, i forked a repo in gitlab to my repo, i cloned it to local, modified sent merge request etc, now i want to update my repo to last revision of original,09:40
← iomari891 left09:41
zaher i am trying to rebase my local to original fork to push it to my remote repo, but i have merge conflics etc, what the best way to update remote repo to last commit of original09:42
→ iomari891 joined09:42
Hi-Angel zaher, I'm a bit confused by your last part. So, you have a local branch. You're trying to rebase it… Upon what? Are you trying to rebase it upon the master branch?09:43
→ pretty_dumm_guy joined09:44
→ masber joined09:44
zaher i am confused too, i am forked a repo to send merger requests (patching) FPC/Lazarus , to my repo zaher/Lazarus then i cloned it locally, i modified, commited/pushed to zaher/Lazaurs, merge request applied success09:46
now09:46
i want my zaher/Lazarus to rebased on original, FPC/Lazarus then i want to rebase my local to zaher/Lazarus09:47
what the good steps?09:47
how to make remote repo to rebase to another remote repo09:47
→ xx joined09:48
← forgotmynick left09:48
← kevr left09:51
Hi-Angel zaher, well, you would add the remote repo as upstream `git remote add upstream https://your-git-forge.com/FPC/Lazarus.git` (something like that), and then use `git pull upstream HEAD --rebase`. It should rebase your local branch upon the main branch of the upstream. Then just `git push origin HEAD -f`09:53
→ kevr joined09:53
← mon_aaraj left09:53
← Sasazuka left09:54
zaher ty Hi-Angel i will try09:55
← srinidhi left09:56
→ mon_aaraj joined09:58
→ freeman_h joined10:00
zaher i have this error: ```warning: squelched 26938 whitespace errors10:01
and i have alot of conflicts ```CONFLICT (add/add): Merge conflict in components/lazdebuggers/cmdlinedebuggerbase/Makefile10:02
← gunner left10:03
← codaraxis left10:04
← crabbedhaloablut left10:04
← av2156 left10:05
→ crabbedhaloablut joined10:05
freeman_h to run git pull you need to be in the directory you want this to happen is it possible to give a directory has part of the argument? for example if I am in directory "Myworkfolder" inside this I have other directory such as "shoeShop, teststuff, javastuff, cstuff" while inside Myworkfolder can i do "git fetch origin master javastuff"10:06
← feriman left10:06
freeman_h because when i run that command i get fatal: not a git repository (or any of the parent directories): .git10:06
← vqueiroz left10:06
← Sazhen86 left10:07
osse ccx, mackerman: git show commit:path is perhaps easier to use10:14
→ srinidhi joined10:14
→ FH_thecat joined10:15
→ enoq joined10:17
← keypusher left10:17
← dodobrain left10:17
→ dodobrain joined10:17
→ Gaboradon joined10:19
← kevr left10:20
→ kevr joined10:21
→ lolok joined10:25
← phundrak left10:28
← rendar left10:30
← dionysus69 left10:32
Hi-Angel zaher, well, I presume that's because in changes you've done on your branch you have modified components/lazdebuggers/cmdlinedebuggerbase/Makefile, and then upon rebasing someone else's commit also modifies that file, so you get the conflicts10:34
zaher i have no local changes, i want to rebase with reset everything, but still have conflict10:34
what the best way to rebase and reset in one line10:35
git pull upstream HEAD --rebase10:35
← srinidhi left10:36
← mon_aaraj left10:36
→ mon_aaraj joined10:38
← hoochmonger left10:39
→ feriman joined10:39
→ phundrak joined10:40
Hi-Angel zaher, by "changes you've done on your branch" I meant your commits. Does `git log upstream/master.. --oneline` show any commits?10:41
← kevr left10:44
→ kevr joined10:47
← Vonter left10:48
← vishal left10:48
→ vishal joined10:50
← mon_aaraj left10:52
→ mon_aaraj joined10:54
← YuGiOhJCJ left10:59
← kevr left11:00
← crabbedhaloablut left11:00
→ gunner joined11:00
→ crabbedhaloablut joined11:00
→ kevr joined11:00
→ TomyWork joined11:10
← FH_thecat left11:11
← gunner left11:14
→ DaNeenjah joined11:15
→ freeman_j joined11:17
← freeman_h left11:17
← eroux left11:17
→ eroux joined11:18
← gryffus left11:18
→ maroloccio joined11:20
→ kanka joined11:22
→ gryffus joined11:26
→ dionysus69 joined11:28
← Swahili left11:33
→ Swahili joined11:34
→ kkkk joined11:39
← kkkk left11:39
→ konsolebox joined11:46
→ keypusher joined11:55
→ srinidhi joined11:59
→ gildasio joined12:07
→ gunner joined12:14
← Anticom left12:15
→ Qbit_ joined12:15
← srinidhi left12:16
← dodobrain left12:17
→ dodobrain joined12:18
→ Anticom joined12:20
← adanwan left12:21
← fling left12:21
← ghost43_ left12:21
← FinnElija left12:21
← coot left12:22
→ adanwan joined12:22
→ fling joined12:22
zaher Hi-Ange ty it work fine, i pulled the original source for FPC/Lazarus changed it commit push to my fork repo zaher/Lazarus but with new branch, i will delete branch after merge req applied (it is auto)12:22
→ FinnElija joined12:22
→ ghost43 joined12:23
→ pulse joined12:29
→ hoochmonger joined12:30
→ srinidhi joined12:38
→ konrados joined12:39
← gryffus left12:45
→ hex_ joined12:45
← Qbit_ left12:47
→ tejr joined12:49
→ maryo joined12:49
→ bloody joined12:51
← hex_ left12:53
→ bambanxx joined12:54
← jmabr left12:55
← masber left12:59
→ masber joined13:01
→ tuskkk____ joined13:01
→ gh34 joined13:01
← maroloccio left13:01
← tejr left13:04
← dionysus69 left13:04
→ cdown_ joined13:05
← loulou_ left13:05
→ gryffus joined13:06
→ igemnace joined13:06
→ tejr joined13:06
← cdown left13:07
cdown_ → cdown13:07
← elkalamar left13:08
→ skapata joined13:08
← skapata left13:08
→ skapata joined13:08
← csm3105 left13:08
→ Sasazuka joined13:13
→ lpapp joined13:14
lpapp hi, to create a branch from a release tag, I used to do git checkout -b new-branch-name tag-name, but it is possible to do git switch -C branch tag now?13:14
ikke yes13:15
lpapp Surprisingly, no such an update to the list of answer here, so was just wondering before I potentially crack any issues: https://stackoverflow.com/questions/10940981/how-to-create-a-new-branch-from-a-tag13:15
ok, thanks, will post an answer there.13:15
challanging a past answer with 1113 upvotes, good luck, I guess13:16
← fling left13:17
← adanwan left13:17
← lpapp left13:17
← Sasazuka left13:17
→ adanwan joined13:18
→ fling joined13:18
← zaher left13:18
→ dionysus69 joined13:19
← gunner left13:20
→ powftw joined13:21
→ lpapp joined13:24
← Xenguy left13:24
lpapp is this the right way to cherry-pick lines whilst also preserving where those lines were cherry-picked from? https://stackoverflow.com/a/1526093/268214213:25
← srinidhi left13:27
→ m0viefreak joined13:29
← Lunatrius left13:34
jast lpapp: git never preserves where lines came from, really... but yeah, that's one way to cherry-pick selectively13:36
ikke it can track it later, though13:37
jast after that sequence of commands, you might have uncommitted changes left, the ones you didn't commit, so you may want to discard those13:37
→ loulou_ joined13:45
← loulou_ left13:45
→ loulou_ joined13:45
← Jong left13:46
← vdamewood left13:46
furrymcgee git revert also has -n, so you could cherry-pick and revert selectively13:47
← feriman left13:50
→ sudoforge joined13:52
→ jjakob joined13:54
→ coot joined13:58
← lucasta left13:59
← dionysus69 left14:01
→ dionysus69 joined14:01
→ av2156 joined14:01
→ thiago joined14:02
→ atrigent joined14:04
← dionysus69 left14:05
→ cvmn joined14:09
→ srinidhi joined14:12
→ lucasta joined14:15
→ gast0n joined14:16
← dodobrain left14:17
→ dodobrain joined14:18
← av2156 left14:19
← thiago left14:21
→ tsraoien joined14:24
← dodobrain left14:25
lpapp ok, thanks.14:28
← jiffe left14:32
→ dionysus69 joined14:36
→ lucasta- joined14:38
→ cdown_ joined14:40
← MajorBiscuit left14:42
← gryffus left14:42
→ benjwadams joined14:43
← cdown left14:43
cdown_ → cdown14:43
→ zebrag joined14:44
← unluckyshrubbery left14:48
← bn_work left14:54
→ cdown_ joined14:55
← cdown left14:56
cdown_ → cdown14:57
← cvmn left14:57
→ gryffus joined14:58
→ unluckyshrubbery joined15:00
→ causasui joined15:04
← cdown left15:05
→ jazzy joined15:05
← LuKaRo_ left15:07
← kanka left15:12
← Anticom left15:12
← fling left15:13
→ loki_val joined15:14
← crabbedhaloablut left15:14
→ FH_thecat joined15:14
→ fling joined15:14
← gryffus left15:15
→ cyberpear joined15:16
→ thiago joined15:17
→ madewokherd joined15:19
← madewokherd` left15:22
→ gunner joined15:23
→ LuxuryMode joined15:23
→ tirnanog joined15:23
→ atrigent_ joined15:25
← leftyfb left15:26
→ leftyfb joined15:26
← Hi-Angel left15:26
← atrigent left15:27
← maryo left15:27
→ maryo joined15:27
→ rama joined15:30
→ Ajax1463 joined15:31
← Ajax146 left15:33
Ajax1463 → Ajax14615:33
→ rgrinberg joined15:34
← igemnace left15:35
← unluckyshrubbery left15:36
→ kanka joined15:40
→ roadie joined15:40
→ av2156 joined15:47
← mon_aaraj left15:49
← rama left15:49
→ hamburgler joined15:50
→ belsirk joined15:50
→ rama joined15:50
← hamburgler left15:50
→ mon_aaraj joined15:51
← FH_thecat left15:51
← adanwan left15:52
→ adanwan joined15:52
← Swahili left15:53
← Sulky left15:53
← rfuentess left15:53
← xx left15:54
Shentino_ → Shentino15:54
← benjwadams left15:56
← maryo left15:56
← av2156 left15:57
← enoq left15:59
← atrigent_ left16:00
→ atrigent joined16:01
← dionysus69 left16:04
→ Ajax1463 joined16:05
→ feriman joined16:05
← lucasta left16:05
→ lucasta joined16:06
→ sandipan joined16:07
← Ajax146 left16:07
Ajax1463 → Ajax14616:07
← saroy left16:10
→ David78 joined16:10
David78 → d6wnpg16:11
← kevr left16:12
← freeman_j left16:14
← loki_val left16:14
→ crabbedhaloablut joined16:14
→ gildasio1 joined16:15
→ finn_elija joined16:15
← FinnElija left16:15
finn_elija → FinnElija16:15
→ kevr joined16:16
→ fling_ joined16:16
← sandipan left16:16
→ saroy joined16:16
→ maryo joined16:16
← gildasio left16:16
← fling left16:17
← mon_aaraj left16:20
→ lgc joined16:20
← lgc left16:20
fling_ → fling16:23
→ mon_aaraj joined16:32
← gunner left16:32
→ Sasazuka joined16:37
← lxsameer left16:38
→ pyeveryt_ joined16:41
→ Betal joined16:47
→ rfuentess__ joined16:48
← belsirk left16:51
← powftw left16:51
← mon_aaraj left16:52
← bambanxx left16:53
→ mon_aaraj joined16:54
← rama left16:57
→ rama joined16:59
→ rickybob joined16:59
← rickybob left17:00
→ rickybob joined17:00
← rickybob left17:01
→ rickybob joined17:01
← rickybob left17:02
→ rickybob joined17:02
← Sasazuka left17:03
← RiFo left17:04
→ dionysus69 joined17:04
← rama left17:04
→ rama joined17:05
← saroy left17:07
← rgrinberg left17:08
→ LuKaRo joined17:10
→ MajorBiscuit joined17:12
← d6wnpg left17:14
← gildasio1 left17:15
→ gildasio1 joined17:15
→ Natrick joined17:17
← kanka left17:19
→ nyah joined17:21
→ Sasazuka joined17:22
← dionysus69 left17:22
→ elkalamar joined17:22
→ dionysus69 joined17:22
← TomyWork left17:26
→ rgrinberg joined17:27
→ bambanxx joined17:28
← DaNeenjah left17:28
← bambanxx left17:30
→ Jong joined17:30
← masber left17:36
← elkalamar left17:39
→ dhrv joined17:42
dhrv hi, is there any issue in git signingkey being tracked in a git repo so as to maintain dot files?17:43
→ tyson2 joined17:43
→ dhrv1 joined17:46
← jim left17:48
← dhrv left17:49
→ bambanxx joined17:49
→ k8yun joined17:51
→ lehinsun_w_ joined17:57
→ codaraxis joined17:57
→ Lord_of_Life_ joined17:59
← lehinsun_w left18:00
← Lord_of_Life left18:01
→ lehinsun_w__ joined18:01
Lord_of_Life_ → Lord_of_Life18:02
silly_ → silly18:02
← silly left18:02
→ silly joined18:02
← dhrv1 left18:03
← codaraxis left18:03
← lehinsun_w_ left18:04
→ Sulky joined18:10
← atrigent left18:18
gildasio1 → gildasio18:22
← lucasta left18:22
→ lucasta joined18:23
← gildasio left18:24
→ Guest92 joined18:24
→ gildasio joined18:25
→ dhrv joined18:29
← dhrv left18:30
→ keypushe- joined18:33
← keypusher left18:33
keypushe- → keypusher18:35
→ cahoots joined18:39
← keypusher left18:40
→ keypushe- joined18:40
cahoots hi, i want to avoid the "Your local changes to the following files would be overwritten by checkout:" error when doing git-checkout whenever there's not a merge conflict. i.e., i want to have `git checkout` be roughly equivalent to `git stash push && git checkout && git stash pop`. is there any way to do that?18:40
← rgrinberg left18:41
← k8yun left18:42
ikke cahoots: git checkout -m18:43
(git checkout --merge)18:43
But, if there are conflicts, you will get them18:43
keypushe- → keypusher18:43
→ k8yun joined18:43
ikke But, if there are conflicts, you will get them18:43
← keypusher left18:47
→ rgrinberg joined18:50
← bambanxx left18:52
→ keypusher joined18:52
→ DaNeenjah joined18:53
→ bn_work joined18:55
← rama left18:56
→ rama joined18:57
← coot left18:57
← iomari891 left18:59
→ hbautista joined19:01
← lucasta- left19:02
← maryo left19:04
cahoots ikke, ty king19:04
← keypusher left19:04
→ bambanxx joined19:05
→ lucasta- joined19:05
← mncheck-m left19:06
→ mncheck-m joined19:06
← Sulky left19:08
→ keypusher joined19:08
→ atrigent joined19:09
← mon_aaraj left19:12
→ mon_aaraj joined19:14
← Sasazuka left19:15
← tyson2 left19:27
→ gunner joined19:35
← cahoots left19:40
→ hashworks joined19:45
← atrigent left19:45
hashworks Hi! Is there a way to change the path of the $GIT_WORK_TREE/.gitmodules file in a repository?19:46
cbreak hashworks: why?19:46
hashworks I'm using git to manage my dotfiles using a bare repo and a git alias, like so19:47
git init --bare $HOME/.dotfilesCLI19:47
alias dfCLI='/usr/bin/git --git-dir=$HOME/.dotfilesCLI/ --work-tree=$HOME'19:47
→ atrigent joined19:47
hashworks I wanted to split stuff into multiple bare repos (CLI, GUI, X11, etc.) – but then I can't use .gitmodules.19:48
cbreak :/19:48
.gitmodules is for submodules. You wouldn't have those in a bare repo19:49
→ elkalamar joined19:49
hashworks Hm? I can easily call `dfCLI submodule add …` here.19:49
cbreak because you're forcing a working dir onto the repo, making it no longer bare19:50
hashworks Ah. Well, yes. This is so I can A) use multiple git repos for one work tree and B) `git status` in any level above $HOME doesn't use a dotfiles repo19:52
I know that I'm kinda hammering things together here, but besides the.gitmodules problematic it should work19:53
← Guest92 left19:53
← crabbedhaloablut left19:53
cbreak how about you just symlink the stuff from your repo into ~/?19:53
→ crabbedhaloablut joined19:53
hashworks Ah, I did that before. Sometimes stuff breaks because of that, it's hard to manage etc.19:54
cbreak your new idea doesn't seem better to me :)19:54
← gunner left19:55
hashworks Everything has its downsides :)19:55
→ gunner joined19:55
hashworks But besides this beeing a horrible idea, you know of no way to change the .gitmodules file path?19:55
← skapata left19:56
← lpapp left19:59
→ ferdna joined20:00
→ tyson2 joined20:00
→ Ajax1462 joined20:04
← rgrinberg left20:04
hashworks Hm, quite hardcoded. https://github.com/git/git/search?q=GITMODULES_FILE20:05
← Ajax146 left20:06
Ajax1462 → Ajax14620:06
← Coop left20:08
← konsolebox left20:09
→ Sasazuka joined20:09
← Dotz0cat left20:14
← gunner left20:16
→ lxsameer joined20:16
← SuperLag left20:18
→ SuperLag joined20:19
→ structoha joined20:25
← feriman left20:28
→ gunner joined20:28
← mbalmer left20:30
← rama left20:31
→ tonitch joined20:31
→ rama joined20:32
← ghost43 left20:35
→ ghost43_ joined20:35
→ Coop joined20:36
← structoha left20:40
→ structoha joined20:41
← lucasta left20:42
← MajorBiscuit left20:45
← gh34 left20:49
→ k8yun_ joined20:53
← structoha left20:54
← k8yun left20:57
→ Rhonda joined20:59
→ YuGiOhJCJ joined20:59
← piwu left21:04
→ piwu7 joined21:04
← rama left21:05
← piwu7 left21:08
→ piwu joined21:08
← ghost43_ left21:11
→ ghost43 joined21:11
→ piwu4 joined21:11
→ Dotz0cat joined21:12
← srinidhi left21:13
← piwu left21:13
piwu4 → piwu21:13
← jimklimov left21:14
→ Sulky joined21:14
→ jimklimov joined21:14
→ M3w0[m] joined21:15
→ piwu5 joined21:19
← piwu left21:20
piwu5 → piwu21:20
→ torresjrjr joined21:20
← gunner left21:25
→ mat001_ joined21:25
→ Leonarbro joined21:27
← YuGiOhJCJ left21:27
← mat001 left21:28
← roadie left21:30
← lucasta- left21:34
→ rgrinberg joined21:39
← thiago left21:40
→ YuGiOhJCJ joined21:41
← dionysus69 left21:45
← Murr left21:50
→ Murr joined21:50
→ Guest68 joined21:51
← Guest68 left21:51
← atrigent left21:55
← bambanxx left21:55
→ atrigent joined21:55
shush Is there a way to express a revision that is either the first commit with another branch or multiple child commits? This way I can do `git rebase -i SPECIAL` where SPECIAL is the revision expression I seek21:56
→ roadie joined21:57
shush The idea is to rebase up to where the branch forked from master/main21:57
But the master branch may have newer commits and I may not want to rebase onto master yet.21:58
← tyson2 left21:58
→ bambanxx joined21:58
→ Murr- joined22:04
← Murr left22:06
Murr- → Murr22:06
← crabbedhaloablut left22:07
→ xx joined22:07
→ crabbedhaloablut joined22:07
← lxsameer left22:07
← kevr left22:08
→ Guddu joined22:09
→ kevr joined22:09
← hoochmonger left22:10
← roadie left22:10
← rfuentess__ left22:15
→ Rashad joined22:16
← ferdna left22:16
→ auk joined22:18
← YuGiOhJCJ left22:18
→ YuGiOhJCJ joined22:19
← jimklimov left22:20
→ GNUmoon2 joined22:21
→ jimklimov joined22:21
→ k8yun__ joined22:24
← bambanxx left22:25
← k8yun_ left22:27
→ thiago joined22:31
→ atrigent_ joined22:31
→ lucasta joined22:32
← atrigent left22:32
← ghost43 left22:32
→ ghost43 joined22:32
→ roadie joined22:36
→ cdown joined22:41
→ cbdlt^ joined22:45
← kyshoc left22:47
→ kyshoc joined22:47
← kyshoc left22:47
→ kyshoc joined22:47
← roadie left22:48
→ Sazhen86 joined22:50
← gildasio left22:58
→ gildasio joined22:59
← cdown left23:06
→ bambanxx joined23:10
← kenanmarasli left23:10
→ roadie joined23:13
← inversed left23:20
← cbdlt^ left23:20
→ bodiccea_ joined23:21
← bodiccea left23:22
← bn_work left23:23
← jlc left23:27
← roadie left23:27
→ tyson2 joined23:27
← k8yun__ left23:33
← nyah left23:35
← elkalamar left23:37
← xx left23:39
← pretty_dumm_guy left23:41
→ ramblebamble joined23:43
→ pretty_dumm_guy joined23:43
← m0viefreak left23:48
→ Xenguy joined23:50
← elastic_dog left23:51
→ skapata joined23:52
← skapata left23:52
→ skapata joined23:52
→ roadie joined23:55

Logs Search ←Prev date Next date→ Channels Documentation