| 2022-10-27 |
| ← oriba left | 00:03 |
| → gsi_ joined | 00:03 |
| → audiobirb joined | 00:03 |
| ← LuKaRo left | 00:04 |
| → LuKaRo joined | 00:05 |
| ← gsi left | 00:05 |
| ← audioburn left | 00:06 |
| ← TheCatBehemoth left | 00:06 |
| ← redbool left | 00:08 |
| → redbool joined | 00:09 |
| → alexhandy joined | 00:13 |
| → nate2 joined | 00:14 |
| → odoood joined | 00:14 |
| ← awmv left | 00:16 |
| → awmv joined | 00:17 |
| ← nate2 left | 00:18 |
| ← alexhandy left | 00:18 |
| ← adlternative left | 00:19 |
| → adlternative joined | 00:19 |
| ← awmv left | 00:22 |
| bin_slasher → javascript | 00:22 |
| javascript → jquery | 00:22 |
| jquery → bin_slasher | 00:23 |
| bin_slasher → java | 00:23 |
| java → bin_slasher | 00:23 |
| ← Sasazuka left | 00:24 |
| → gvg joined | 00:24 |
| → hiroot joined | 00:27 |
| → awmv joined | 00:30 |
| → alexhandy joined | 00:31 |
| ← alexhandy left | 00:31 |
| ← dnh left | 00:32 |
| ← clime left | 00:33 |
| ← odoood left | 00:34 |
| ← ThorMojito left | 00:36 |
| ← ZacSharp left | 00:36 |
| ← rama left | 00:36 |
| → rama joined | 00:37 |
| ← madewokherd left | 00:39 |
| ← ferdna left | 00:39 |
| ← rama left | 00:39 |
| → rama joined | 00:40 |
| ← avar left | 00:42 |
| ← Murr left | 00:44 |
| → Murr joined | 00:44 |
| ← NSOL left | 00:44 |
| → NSOL joined | 00:45 |
| ← NSOL left | 00:45 |
| → polo_ joined | 00:45 |
| → avar joined | 00:47 |
| → Sasazuka joined | 00:48 |
| ← stewie925 left | 00:48 |
| ← polo left | 00:49 |
| → alexhandy joined | 00:49 |
| ← mncheck left | 00:51 |
| ← alexhandy left | 00:51 |
| ← polo_ left | 00:52 |
| → polo joined | 00:53 |
| → epony joined | 00:53 |
| ← reset left | 00:54 |
| ← rama left | 00:55 |
| → rama joined | 00:55 |
| ← rama left | 00:56 |
| ← polo left | 00:58 |
| ← xx left | 01:05 |
| ← awmv left | 01:07 |
| → alexhandy joined | 01:09 |
| ← fweht left | 01:12 |
| → Cromulent joined | 01:13 |
| → ThorMojito joined | 01:14 |
| ← alexhandy left | 01:14 |
| ← LuKaRo left | 01:16 |
| ← Lord_of_Life left | 01:16 |
| ← Filip2 left | 01:16 |
| → Lord_of_Life joined | 01:17 |
| → LuKaRo joined | 01:19 |
| ← Sasazuka left | 01:22 |
| ← avar left | 01:30 |
| → avar joined | 01:30 |
| ← arescorpio left | 01:31 |
| → forgotmynick joined | 01:44 |
| → codebam joined | 01:53 |
| ← pulse left | 01:55 |
| → nate2 joined | 02:01 |
| → inversed joined | 02:02 |
| → madewokherd joined | 02:04 |
| ← Yruama left | 02:04 |
| → runlevels joined | 02:09 |
| → alexhandy joined | 02:09 |
| → Kangie_ joined | 02:14 |
| ← alexhandy left | 02:16 |
| → nate3 joined | 02:17 |
| ← nate2 left | 02:17 |
| Kangie_ → Kangie | 02:18 |
| ← LuKaRo left | 02:20 |
| ← dionysus69 left | 02:20 |
| ← ntz left | 02:20 |
| ← gast0n left | 02:20 |
| ← piwu left | 02:20 |
| ← regedit left | 02:20 |
| ← jazz-o-lantern left | 02:20 |
| ← dermoth left | 02:20 |
| ← m5zs7k left | 02:20 |
| ← dirtydan left | 02:20 |
| ← jed left | 02:20 |
| ← Quietus left | 02:20 |
| ← whatsupdoc left | 02:20 |
| ← ectospasm left | 02:20 |
| ← Soliton left | 02:20 |
| ← ryjen left | 02:20 |
| ← selckin left | 02:20 |
| → ndorf joined | 02:20 |
| → ntz joined | 02:20 |
| → MrMagic joined | 02:20 |
| → iokill joined | 02:20 |
| → cweiss076532124 joined | 02:20 |
| → jinsl joined | 02:20 |
| → lagash joined | 02:20 |
| → Learath2 joined | 02:20 |
| → dirtydan joined | 02:20 |
| → MaverickFischer joined | 02:20 |
| → Jenna16bit joined | 02:20 |
| → mingdao joined | 02:20 |
| → piwu joined | 02:20 |
| → dmvrtx joined | 02:20 |
| → preisi joined | 02:20 |
| → stutz joined | 02:20 |
| → sco1 joined | 02:20 |
| → Nixx joined | 02:20 |
| → redrambles joined | 02:20 |
| → regedit joined | 02:20 |
| → lechner joined | 02:20 |
| → whatsupdoc joined | 02:20 |
| → frojnd joined | 02:20 |
| → teddyc joined | 02:20 |
| → glik22 joined | 02:20 |
| → terminaldweller joined | 02:20 |
| → Illya joined | 02:20 |
| → cozycactus joined | 02:20 |
| → ectospasm joined | 02:21 |
| ← Jenna16bit left | 02:21 |
| → Jenna16bit joined | 02:21 |
| ← lechner left | 02:21 |
| → lechner joined | 02:21 |
| ← Illya left | 02:21 |
| → Illya joined | 02:21 |
| ← terminaldweller left | 02:21 |
| → terminaldweller joined | 02:21 |
| ← stutz left | 02:21 |
| → stutz joined | 02:21 |
| → dionysus69 joined | 02:21 |
| → FFY00 joined | 02:21 |
| → Noisytoot joined | 02:22 |
| → hexology joined | 02:22 |
| ectospasm → Guest4398 | 02:22 |
| → riposte joined | 02:22 |
| → jgn joined | 02:22 |
| → m5zs7k joined | 02:22 |
| → johncs joined | 02:22 |
| → skered joined | 02:22 |
| ← skered left | 02:22 |
| → selckin joined | 02:22 |
| → Quietus joined | 02:22 |
| → Kamilion joined | 02:22 |
| → robink joined | 02:22 |
| → jim joined | 02:22 |
| → ueberall joined | 02:22 |
| → arash joined | 02:22 |
| → ripdog joined | 02:22 |
| → barlas joined | 02:22 |
| → magic_ninja joined | 02:22 |
| → jed joined | 02:22 |
| → sebastorama joined | 02:22 |
| → ProperNoun joined | 02:22 |
| → michele joined | 02:22 |
| → tcurdt joined | 02:22 |
| → Erawan joined | 02:22 |
| → ryjen joined | 02:22 |
| → bremner joined | 02:22 |
| → mcfrdy joined | 02:22 |
| → Tuor joined | 02:23 |
| → nyuszika7h joined | 02:23 |
| → skered joined | 02:23 |
| ← skered left | 02:23 |
| → LuKaRo joined | 02:23 |
| → magga joined | 02:24 |
| → Disconsented joined | 02:24 |
| → skered joined | 02:24 |
| ← skered left | 02:24 |
| → ecs joined | 02:24 |
| → jazzy joined | 02:24 |
| → charly joined | 02:25 |
| → Soliton joined | 02:25 |
| → mooz joined | 02:25 |
| → gast0n joined | 02:25 |
| → skered joined | 02:25 |
| → polo joined | 02:27 |
| → Aleksejs joined | 02:29 |
| ← polo left | 02:37 |
| ← FinnElija left | 02:47 |
| → finn_elija joined | 02:47 |
| finn_elija → FinnElija | 02:47 |
| → TheCatBehemoth joined | 02:55 |
| ← epony left | 02:57 |
| → epony joined | 02:58 |
| → Murr- joined | 02:59 |
| → shokohsc4 joined | 03:00 |
| shokohsc4 → shokohsc | 03:01 |
| ← Murr left | 03:02 |
| Murr- → Murr | 03:02 |
| ← nate3 left | 03:04 |
| → jb1277976_ joined | 03:07 |
| → lucasta joined | 03:09 |
| → guardianx joined | 03:11 |
| ← guardianx left | 03:13 |
| ← cdown left | 03:17 |
| → HumanG33k joined | 03:26 |
| ← skapata left | 03:34 |
| → sahilister joined | 03:35 |
| → Kangie_ joined | 03:36 |
| ← TheCatBehemoth left | 03:37 |
| ← Kangie left | 03:37 |
| → Kangie joined | 03:41 |
| ← Kangie_ left | 03:42 |
| → dviola joined | 03:43 |
| ← forgotmynick left | 04:00 |
| ← zebrag left | 04:02 |
| → hbautista joined | 04:03 |
| → vdamewood joined | 04:06 |
| ← LuKaRo left | 04:08 |
| → LuKaRo_ joined | 04:09 |
| → alexhandy joined | 04:10 |
| ← alexhandy left | 04:10 |
| → coot joined | 04:12 |
| ← Cleverness left | 04:13 |
| → forgotmynick joined | 04:14 |
| ← lucasta left | 04:14 |
| → lucasta joined | 04:16 |
| → caveman joined | 04:19 |
| ← gast0n left | 04:20 |
| ← lucasta left | 04:25 |
| ← Kangie left | 04:26 |
| → lucasta joined | 04:26 |
| → Murr- joined | 04:27 |
| ← Murr left | 04:29 |
| Murr- → Murr | 04:29 |
| → dob1 joined | 04:33 |
| → wallabra joined | 04:34 |
| ← lucasta left | 04:35 |
| → lucasta joined | 04:36 |
| ← c0dehu1k left | 04:38 |
| → c0dehu1k joined | 04:39 |
| → roadie joined | 04:43 |
| ← Murr left | 04:43 |
| ← jed left | 04:44 |
| → Murr joined | 04:44 |
| → Kangie joined | 04:45 |
| → jed joined | 04:46 |
| ← atrigent_ left | 04:47 |
| ← hbautista left | 04:48 |
| → hbautista joined | 04:50 |
| → atrigent joined | 04:52 |
| → RiFo joined | 04:55 |
| ← lucasta left | 04:58 |
| → lucasta joined | 04:59 |
| ← epony left | 05:01 |
| → epony joined | 05:02 |
| → bgs joined | 05:03 |
| ← LuKaRo_ left | 05:05 |
| → madewokherd` joined | 05:05 |
| ← lucasta left | 05:05 |
| → lucasta joined | 05:06 |
| → LuKaRo joined | 05:07 |
| ← madewokherd left | 05:08 |
| ← foul_owl left | 05:09 |
| ← lucasta left | 05:11 |
| → lucasta joined | 05:11 |
| → SirRippovMaple joined | 05:16 |
| ← bgs left | 05:22 |
| → foul_owl joined | 05:25 |
| ← lucasta left | 05:26 |
| → lucasta joined | 05:26 |
| ← pyeveryt_ left | 05:32 |
| → warthog9 joined | 05:33 |
| → pyeverything joined | 05:33 |
| ← gsi_ left | 05:33 |
| → gsi joined | 05:34 |
| ← jiffe left | 05:35 |
| ← pyeverything left | 05:38 |
| → jiffe joined | 05:38 |
| ← roadie left | 05:39 |
| → recyclehero joined | 05:39 |
| ← caveman left | 05:42 |
| ← jiffe left | 05:43 |
| ← lucasta left | 05:43 |
| jazzy → jazz-o-lantern | 05:43 |
| → lucasta joined | 05:45 |
| → jiffe joined | 05:45 |
| vdamewood → vdameboo | 05:46 |
| → alexhandy joined | 05:48 |
| ← lucasta left | 05:51 |
| ← alexhandy left | 05:51 |
| → lucasta joined | 05:51 |
| ← hiroot left | 05:54 |
| ← lucasta left | 05:56 |
| → lucasta joined | 05:56 |
| → igemnace joined | 05:59 |
| → alexhandy joined | 06:00 |
| ← alexhandy left | 06:00 |
| ← hbautista left | 06:00 |
| → alexhandy joined | 06:01 |
| ← audiobirb left | 06:01 |
| ← agarr left | 06:01 |
| → BrianBlaze joined | 06:02 |
| ← alexhandy left | 06:04 |
| → pyeverything joined | 06:04 |
| ← blahboybaz left | 06:07 |
| ← LuKaRo left | 06:07 |
| → fweht joined | 06:11 |
| → LuKaRo joined | 06:14 |
| → alexhandy joined | 06:14 |
| ← KimK_ left | 06:15 |
| ← alexhandy left | 06:16 |
| → gtristan joined | 06:19 |
| ← Scien left | 06:20 |
| ← forgotmynick left | 06:20 |
| ← Betal left | 06:21 |
| → Scien joined | 06:21 |
| → srinidhi joined | 06:22 |
| → rfuentess joined | 06:22 |
| → Murr- joined | 06:22 |
| → sa0 joined | 06:24 |
|
gtristan
| Hi, it seems we've got ourselves in a bit of a bind doing a complicated merge, and as I've had good luck asking here in the past, perhaps someone here could tell me the best merge strategy for this situation | 06:25 |
| ← Murr left | 06:25 |
| Murr- → Murr | 06:25 |
|
gtristan
| It's probably *fairly* typical | 06:25 |
|
| So we've got a situation which can be described like this: https://bpa.st/7KYQ (simple ascii art) | 06:26 |
|
| Essentially, a downstream vendor has modifications against an upstream stable branch | 06:26 |
|
| And we want to move to the next stable branch, and unfortunately in the past, these folks have been doing a `git merge <new-upstream-branch>` into their downstream | 06:27 |
|
| They are interested in properly isolating their downstream patches again so that a rebase strategy will work better, but for now they've gone a couple cycles of merging upstream into their downstream | 06:28 |
|
| So they'd prefer to take the quickest approach for right now, and then refactor their things so that a rebase is more possible in the future | 06:28 |
| ← pyeverything left | 06:29 |
|
gtristan
| The result of this however, is that when we do the `git merge` command, we get a big mix of conflicts - including conflicts between the two upstream stable branches, sometimes mixed into the same file where we have downstream vendor changes | 06:29 |
| → nate3 joined | 06:30 |
| → nivag joined | 06:30 |
| ← c0dehu1k left | 06:30 |
| → c0dehu1k joined | 06:31 |
|
gtristan
| So ultimately, I'm curious if it would be possible to say: Merge the next stable into our downstream messy branch, and automatically prefer changes from the upstream while merging... *except* for changes which can be found in the delta between last-upstream-stable...this-messy-branch | 06:31 |
| → KimK joined | 06:32 |
|
gtristan
| This way, even though the strategy is messy for now, we still should only be dealing with resolving conflicts between downstream vendor changes and the new upstream | 06:32 |
| ← Cromulent left | 06:33 |
| → alexhandy joined | 06:34 |
| ← nate3 left | 06:34 |
| ← lucasta left | 06:35 |
| → lucasta joined | 06:36 |
| ← alexhandy left | 06:36 |
| ← Murr left | 06:44 |
| → Murr joined | 06:44 |
| → IFTquestion2 joined | 06:44 |
| → alexhandy joined | 06:46 |
| ← alexhandy left | 06:46 |
| → alexhandy joined | 06:47 |
| → agarr joined | 06:49 |
| → mncheck joined | 06:50 |
| ← alexhandy left | 06:52 |
| ← agarr left | 06:54 |
| → zeenk joined | 06:56 |
| → alexhandy joined | 06:58 |
| ← hamburgler left | 07:00 |
|
adlternative
| hi, how can I know a local repo is "synced" with repo on github or other git server? | 07:00 |
| → Leonarbro joined | 07:00 |
| ← alexhandy left | 07:04 |
| → agarr joined | 07:05 |
| → clime joined | 07:05 |
| ← epony left | 07:05 |
| → otisolsen70 joined | 07:05 |
| → epony joined | 07:07 |
| ← agarr left | 07:09 |
| → alexhandy joined | 07:10 |
| → shyjun joined | 07:11 |
| ← alexhandy left | 07:11 |
| → peirik_ joined | 07:12 |
| ← transhumanist left | 07:13 |
| → xx joined | 07:13 |
| → transhumanist joined | 07:14 |
| ← shyjun left | 07:18 |
| → feriman joined | 07:18 |
| → Guest55 joined | 07:18 |
|
Guest55
| Hi I have a doubt/question | 07:18 |
|
| can some1 help ? | 07:19 |
| ← LuKaRo left | 07:20 |
|
rkta
| Don't ask to ask. | 07:21 |
| → _sa0sin_ joined | 07:22 |
|
Guest55
| In a git repo, there is a folder "a", inside that there is "b" . like that a->b->c->d->e->f ... if i give "git status" on folder "f" it show git status. Is there any option to specify how many levels to go up to look for repository ? | 07:22 |
| ← ajfriesen left | 07:23 |
| ← jazz-o-lantern left | 07:24 |
| → ajfriesen joined | 07:24 |
| ← m5zs7k left | 07:24 |
| ← sa0 left | 07:25 |
| → alexhandy joined | 07:25 |
| → LuKaRo joined | 07:25 |
| → m5zs7k joined | 07:25 |
| ← gtristan left | 07:26 |
| ← alexhandy left | 07:28 |
|
osse
| Guest55: not directly. You can set GIT_CEILING_DIRECTORIES, but that's a list of paths it won't cd into. | 07:31 |
|
| But you cannot control how many levels to cd up before it gives up | 07:31 |
|
| IF you want to "disable" git for some reason you can set GIT_DIR to a bs directory | 07:32 |
| → alexhandy joined | 07:34 |
| → thebombzen_ joined | 07:37 |
| ← alexhandy left | 07:40 |
| → Le_Ris joined | 07:42 |
| ← Leris left | 07:45 |
| → theoceaniscool_ joined | 07:46 |
| → theoceaniscool joined | 07:46 |
| → farzat joined | 07:49 |
| ← epony left | 07:50 |
| → iomari891 joined | 07:52 |
| → gtristan joined | 07:53 |
| Masklin_Gurder → Masklin__Gurder | 08:00 |
| Masklin__Gurder → Masklin | 08:00 |
| → agarr joined | 08:01 |
| → epony joined | 08:03 |
| ← agarr left | 08:05 |
| → sa0 joined | 08:09 |
|
Guest55
| My prob is like this. I have a "tools" repo checked out at /home/uesr directory. and there is another repo(an SDK) which is at /home/user/a/. This "a" can be a repository, or it will be built by some script.(if its a repo, then it will have .git folder, if its built/packaged by a script, then .git folder wont be there.). If "a" is a repo, then | 08:09 |
|
| if i give "git status" on /home/user/a/b/c/d it shows the git version of repo "a"... If "a" is generated through script, and i give "git status" on /home/user/a/b/c/d it shows the git version of repo "tools" ... | 08:09 |
| → mobidrop joined | 08:11 |
| ← _sa0sin_ left | 08:11 |
|
Guest55
| My makefile fetches git version from /home/user/a and gives it as a macro to a C file. The prob is if /home/user/a is a repo, then it works fine, but if its built/packaged through script, it gets version of "/home/user/tools/" | 08:13 |
| → alexhandy joined | 08:16 |
| ← alexhandy left | 08:16 |
| ← gtristan left | 08:17 |
| → gtristan joined | 08:17 |
| ← Guest55 left | 08:17 |
| → Guest55 joined | 08:17 |
| ← fling left | 08:22 |
| → pyeverything joined | 08:22 |
| → fling joined | 08:22 |
| → dante-as joined | 08:26 |
|
osse
| Guest55: then I suggest you export GIT_DIR=/home/user/a/.git (or use git --git-dir=...) in your script/Makefile to force git to consider /home/user/a as a repo. It might fail of course if there is no repo there, but at least you don't get false positives from the outer repo | 08:27 |
| ← Guest55 left | 08:27 |
| ← pyeverything left | 08:27 |
| ← farzat left | 08:31 |
| → cart_ joined | 08:31 |
| → codebam1 joined | 08:32 |
| → farzat joined | 08:33 |
| ← codebam left | 08:34 |
| → jonascj joined | 08:36 |
|
jonascj
| Hi all. If I have two branches feature and master. Since the branching both branches have had commits. I think I want some changes from the master branch incorporated into my feature branch but not all (maybe just the changes to one file). | 08:39 |
| → Guest55 joined | 08:39 |
| → trace1918 joined | 08:40 |
|
jonascj
| What action would do this, is it a merge? | 08:40 |
| → alexhandy joined | 08:40 |
|
grawity
| a merge is mostly all-or-nothing – you can merge "all commits up to X" but not split them up | 08:41 |
|
| if all you need is a single commit or two, `git cherry-pick` it | 08:41 |
| → agarr joined | 08:43 |
| ← alexhandy left | 08:45 |
| ← agarr left | 08:47 |
| ← Guest55 left | 08:47 |
| ← atrigent left | 08:50 |
| → atrigent joined | 08:51 |
|
jonascj
| grawity thanks | 08:52 |
| → leon_ joined | 08:54 |
| → realies6 joined | 08:55 |
| realies6 → realies | 08:57 |
| → daoudr joined | 09:09 |
| ← epony left | 09:10 |
|
jonascj
| grawity Apart from a note in the log, will cherry-picking more or less be equivalent to manually taking the changes from two working trees and incorporating them? | 09:10 |
| → epony joined | 09:11 |
|
grawity
| the result is just a regular commit, equivalent to applying a patch | 09:11 |
|
jonascj
| okay, so the graph will not afterwards reflect that something from one branch was incorporated into another branch? | 09:12 |
|
grawity
| no | 09:13 |
| ← trace1918 left | 09:14 |
|
grawity
| the graph can only represent merges of whole commit history -- not single commits, but their parents included | 09:14 |
| → _sa0sin_ joined | 09:17 |
| ← sa0 left | 09:20 |
| ← gtristan left | 09:20 |
| → agarr joined | 09:21 |
|
jonascj
| alright, thanks you | 09:22 |
|
| *thank | 09:22 |
| ← agarr left | 09:25 |
| → trace1918 joined | 09:34 |
| ← coot left | 09:34 |
| ← R2robot left | 09:35 |
| → Guest55 joined | 09:38 |
| → pyeverything joined | 09:41 |
| → wgrant joined | 09:41 |
| ← dante-as left | 09:42 |
| → Murr- joined | 09:44 |
| ← pyeverything left | 09:45 |
| → alexhandy joined | 09:45 |
| ← jonascj left | 09:45 |
| ← Guest55 left | 09:45 |
| → R2robot joined | 09:46 |
| ← Murr left | 09:46 |
| Murr- → Murr | 09:46 |
| → nuala joined | 09:48 |
| → m4r35n357 joined | 09:49 |
| → coot joined | 09:51 |
| → malmalmal joined | 09:57 |
| codebam1 → codebam | 09:58 |
| ← LuKaRo left | 09:59 |
| ← Masklin left | 09:59 |
| → Murr- joined | 10:00 |
| → f3n1x joined | 10:01 |
| → reset joined | 10:02 |
| ← Murr left | 10:03 |
| Murr- → Murr | 10:03 |
| → dnh joined | 10:04 |
| → LuKaRo joined | 10:04 |
| ← alexhandy left | 10:06 |
| ← edgars left | 10:11 |
| ← coot left | 10:12 |
| → elastic_1 joined | 10:18 |
| elastic_1 → elastic_dog | 10:18 |
| → tristan_ joined | 10:23 |
| → Murr- joined | 10:31 |
| → nate3 joined | 10:31 |
| ← Murr left | 10:32 |
| Murr- → Murr | 10:32 |
| ← vishal left | 10:35 |
| ← nate3 left | 10:36 |
| → Murr- joined | 10:37 |
| → vishal joined | 10:37 |
| → edgars joined | 10:37 |
| ← Murr left | 10:39 |
| Murr- → Murr | 10:39 |
| ← feriman left | 10:45 |
| → Filip2 joined | 10:51 |
| leon_ → leon | 10:51 |
| → csm310599 joined | 10:57 |
| → clime1 joined | 10:57 |
| → vitali64 joined | 10:57 |
| ← csm310599 left | 10:59 |
| → csm310599 joined | 10:59 |
| → tuskkk____ joined | 11:01 |
| ← csm310599 left | 11:01 |
| → csm310599 joined | 11:01 |
| ← csm310599 left | 11:04 |
| → csm310599 joined | 11:04 |
| → Masklin joined | 11:04 |
| ← Visne left | 11:04 |
| → awmv joined | 11:05 |
| → vladoski joined | 11:05 |
| → fandre1986 joined | 11:07 |
|
fandre1986
| Hi all | 11:07 |
| ← fweht left | 11:08 |
|
fandre1986
| I would like to ignore all files with pattern *.csv and *.xlsx; | 11:08 |
|
| I can add both lines to .gitignore but is it possible to do it in one line? | 11:09 |
|
ikke
| no | 11:09 |
|
| one pattern per line | 11:09 |
|
fandre1986
| i.e: *.[csv-xlsx] | 11:09 |
|
ikke
| no | 11:09 |
|
| that's not possible | 11:09 |
|
fandre1986
| Ok | 11:09 |
|
| thanks | 11:10 |
| → agarr joined | 11:11 |
| ← agarr left | 11:12 |
| → Visne joined | 11:13 |
| → dante-as joined | 11:13 |
| ← epony left | 11:14 |
| → epony joined | 11:15 |
| ← mobidrop left | 11:15 |
| → alexhandy joined | 11:16 |
| → cdown joined | 11:18 |
| ← fandre1986 left | 11:19 |
| ← alexhandy left | 11:19 |
| → lacrymology joined | 11:20 |
| → detuneattune joined | 11:23 |
| → thuna` joined | 11:24 |
| ← LuKaRo left | 11:25 |
| → alexhandy joined | 11:27 |
| ← alexhandy left | 11:27 |
| → cdown_ joined | 11:28 |
| ← ThorMojito left | 11:28 |
| → ThorMojito1 joined | 11:28 |
| → LuKaRo joined | 11:28 |
| ← dante-as left | 11:30 |
| ← cdown left | 11:30 |
| cdown_ → cdown | 11:30 |
| ← malmalmal left | 11:30 |
| → ThorMojito joined | 11:31 |
| ← ThorMojito1 left | 11:31 |
| → yuiyukihira joined | 11:32 |
| → coot joined | 11:32 |
| ← mingdao left | 11:33 |
| → mingdao joined | 11:34 |
| ← adanwan left | 11:35 |
|
detuneattune
| How would I deal with things if I made 5 atomic, incremental commits to one file, made a PR and the maintainer didn't approve of the 3rd commit but the other commits were fine? Would that mean that everything from commit 4 and onwards is also unusable since they also contain the incorrect changes from commit 3? | 11:40 |
| → adanwan joined | 11:41 |
|
bremner
| you can try rebase -i, remove the commit, and resolve any conflicts | 11:41 |
|
selckin
| git rebase -i <one before it>, delete 4th commit, exit, and resolve conflicts if any, and bremner types faster then me | 11:41 |
| ← cdown left | 11:41 |
| → pyeveryt_ joined | 11:41 |
|
bremner
| yay, I win | 11:41 |
|
| give bad advice fast, thank you coffee | 11:42 |
|
detuneattune
| Thank you! I was wondering what the best practice was in this case. I considered doing a separate branch and PR for each commit if it was in the same file but that sounded odd/incorrect | 11:42 |
|
| I'll look up rebasing :) | 11:42 |
|
selckin
| you can do it in many ways | 11:43 |
| → sjoshi joined | 11:45 |
| → alexhandy joined | 11:45 |
| ← c0dehu1k left | 11:45 |
| ← sjoshi left | 11:46 |
| → pulse joined | 11:50 |
| ← alexhandy left | 11:50 |
| → sjoshi joined | 11:51 |
| ← lacrymology left | 11:52 |
| → enimaloc joined | 11:52 |
| → cdown joined | 11:55 |
|
IRChatter
| detuneattune, it all comes down to cohesion. Is each commit a completely different thing (a new feature, a bug fix, etc)? Or does their sum result in only one of those? The former would be a different PR for each, and the latter a single one | 12:01 |
| → alexhandy joined | 12:03 |
| → TomyWork joined | 12:03 |
|
detuneattune
| I think I'd say it'd fall under the latter as one PR. I wanted to make a README easier to understand. One commit would have been changing the examples given, and the other one would have been adding a paragraph to expand upon a point | 12:04 |
|
| Thanks for the clarification though, was a bit confused on this since I haven't really had to do anything other than git add, commit and push up until now :P | 12:05 |
| ← LuKaRo left | 12:07 |
| ← eroux left | 12:08 |
| → LuKaRo joined | 12:09 |
| ← alexhandy left | 12:09 |
| → mexen joined | 12:13 |
| → ajshell1 joined | 12:14 |
| → eroux joined | 12:18 |
| ← codebam left | 12:19 |
| → alexhandy joined | 12:21 |
| → apteryx joined | 12:23 |
|
apteryx
| hi! I have a script that outputs extra arguments such as --add-header= ... to be tacked to the git send-email command line, but its invocation through command substitution causes quoting issues... perhaps there's a native git mechanism to extend its command line? | 12:25 |
|
selckin
| how does it pass the args, should be fixable so it works | 12:26 |
| ← alexhandy left | 12:27 |
| → john_johnk joined | 12:27 |
|
apteryx
| after discussing that in #bash, our conclusion is that the design is fragile and should be reviewed; currently it's to be invoked as: git send-email --to [email@hidden.address] $(./etc/teams.scm cc mentors) *.patch, where etc/teams.scm is a Guile script in the tree | 12:28 |
|
| the problem is that the command substitution of said script generates output like: --add-header="X-Debbugs-Cc: some@email" ..., and when using command substitution these quotes are not interpreted so the words are split on white space and it breaks | 12:29 |
|
| (and the quotes appear as literals in the arguments) | 12:30 |
| ← clime1 left | 12:31 |
|
selckin
| can't change it to like ./etc/teams.scm cc mentors -- git send-email --to [email@hidden.address] *.atch | 12:32 |
|
| then teams can call the cmd after -- with the proper args | 12:32 |
| → ferdna joined | 12:32 |
| → Matt|home joined | 12:36 |
| ← theoceaniscool_ left | 12:36 |
| ← theoceaniscool left | 12:36 |
|
Matt|home
| hello. Is there a way to pull all github branches with git? for example, I have two branches in a repo: main and other. If i simply do git pull 'github.com/mystuff' , it only pulls in main and excludes other like it doesn't exist | 12:38 |
|
| Do i need to manually pull in each branch? | 12:38 |
| → derpydoo joined | 12:38 |
|
apteryx
| selckin: interesting idea! | 12:38 |
| → alexhandy joined | 12:39 |
| → molt joined | 12:40 |
|
osse
| Matt|home: pull = fetch + merge. usually it will fetch all branches (so that origin/foo and origin/bar) are updated, but only merge one branch (e.g. for master it will memrge origin/master and so on) | 12:41 |
|
Matt|home
| ah | 12:41 |
|
| how do i get the repo back from githut without doing merges/changes | 12:41 |
|
| with all branches | 12:41 |
| ← alexhandy left | 12:42 |
| ← pyeveryt_ left | 12:42 |
| ← RiFo left | 12:42 |
| ← john_johnk left | 12:42 |
|
osse
| depends on what you mean exactly | 12:43 |
| ← Murr left | 12:43 |
| → Murr joined | 12:44 |
|
Matt|home
| I created a directory on my local machine. I have a github repo with 2 branches. main and other. I'd like to get both branches from the same repo, and move them into the directory i created. I don't want the branches merged yet because I am stil working on other | 12:44 |
| → RiFo joined | 12:44 |
|
osse
| Matt|home: in your local repo, what is the output of git branch -r ? | 12:44 |
|
Matt|home
| one moment | 12:45 |
|
| no output, empty | 12:45 |
|
| git branch only shows master | 12:45 |
|
osse
| you should add your github repo as a remote and then fetch. try this: | 12:47 |
| → durko03 joined | 12:47 |
| → loulou joined | 12:47 |
| ← loulou left | 12:47 |
| → loulou joined | 12:47 |
|
osse
| git remote add origin github.com/mystuff && git fetch origin | 12:47 |
|
| what does git branch -r say after that | 12:47 |
|
Matt|home
| after running those commands, git branch without any arguments shows main, but git branch -r shows both branches in red | 12:48 |
|
| matt@rfranklin:~/Programming/SantasWorkshop$ git branch | 12:48 |
|
| * master | 12:48 |
|
| matt@rfranklin:~/Programming/SantasWorkshop$ git branch -r | 12:48 |
|
| origin/header-dump | 12:48 |
|
| origin/main | 12:48 |
|
| matt@rfranklin:~/Programming/SantasWorkshop$ | 12:48 |
|
osse
| good, that's the way it's supposed to be | 12:49 |
|
| the way git works is that for each branch X in github you will have something locally called origin/X | 12:49 |
|
| but the branch(es) you have locally exist in a different namespace, so to speak | 12:49 |
| → lacrymology joined | 12:50 |
|
Matt|home
| okay cool. i can switch between them, update and push no problems right? | 12:50 |
|
| thanks osse | 12:51 |
|
osse
| to update and push you should make a new local branch by the same name. usually 'git checkout header-dump' (without origin/ in front) will automatically do that for you | 12:51 |
|
Matt|home
| yep | 12:51 |
|
| it seems to have worked | 12:51 |
| ← loulou left | 12:51 |
|
Matt|home
| thank you | 12:51 |
|
osse
| ncie | 12:52 |
|
| printed something like "switch to a new branch" and "set up tracking" and bla bla right? | 12:53 |
| → theoceaniscool joined | 12:53 |
| → theoceaniscool_ joined | 12:53 |
| ← csm310599 left | 12:54 |
|
Matt|home
| yep | 12:54 |
|
| one of these days i'll read the git docs in full and actually understand how to use it | 12:55 |
| ← durko03 left | 12:55 |
|
Matt|home
| one day | 12:55 |
| → dermoth joined | 12:57 |
| ← awmv left | 12:58 |
|
osse
| well | 13:01 |
|
| one day | 13:01 |
|
| or another | 13:01 |
|
| git'll gonna find ya | 13:02 |
|
| gonna get ya get ya get ya | 13:02 |
| → csm310599 joined | 13:02 |
| ← LuKaRo left | 13:02 |
| → malmalmal joined | 13:02 |
| ← f3n1x left | 13:05 |
| → LuKaRo joined | 13:08 |
| → feriman joined | 13:08 |
| → gryffus joined | 13:08 |
| → skfax joined | 13:09 |
| ← vladoski left | 13:10 |
| ← edgars left | 13:10 |
| → BlessJah joined | 13:11 |
| ← lacrymology left | 13:12 |
| ← Xenguy left | 13:13 |
| → belsirk joined | 13:15 |
| ← coot left | 13:16 |
| → coot joined | 13:17 |
| ← rfuentess left | 13:17 |
| → pyeverything joined | 13:18 |
| ← pyeverything left | 13:18 |
| ← epony left | 13:18 |
| → pyeveryt_ joined | 13:18 |
| → epony joined | 13:19 |
| ← RiFo left | 13:20 |
| ← feriman left | 13:23 |
| → mw_ joined | 13:24 |
| → feriman joined | 13:25 |
| → Raito_Bezarius joined | 13:29 |
| ← Raito_Bezarius left | 13:32 |
| → cyberpear joined | 13:35 |
| → GrapeSlush joined | 13:38 |
| ← peirik_ left | 13:41 |
| ← malmalmal left | 13:43 |
| → alexhandy joined | 13:46 |
| → hamburgler joined | 13:52 |
| → peirik_ joined | 13:52 |
| → ccapndave joined | 13:53 |
| ← otisolsen70 left | 13:55 |
| ← molt left | 13:56 |
| ← peirik_ left | 13:58 |
| ← theoceaniscool left | 14:00 |
| ← theoceaniscool_ left | 14:00 |
| ← alexhandy left | 14:03 |
| → colemickens joined | 14:03 |
| ← atrigent left | 14:04 |
| → causasui joined | 14:05 |
|
colemickens
| hi folks. What is the state of the art for fast `git status`? I'd been using [rs-git-fsmonitor](https://github.com/jgavris/rs-git-fsmonitor), but it hasn't seen many updates and I see the GitHub blog just uses plain watchman and hooks | 14:05 |
| → audiobirb joined | 14:06 |
|
colemickens
| I use gitstatusd with zsh and frankly it makes it very hard to change shells, because nothing comes anywhere near it for speed. (unless using something like jj [jujube] where it can do smarter things) | 14:06 |
| ← lucasta left | 14:06 |
| → atrigent joined | 14:07 |
| ← tux12 left | 14:07 |
| → lucasta joined | 14:08 |
|
selckin
| an SSD | 14:11 |
| ← ccapndave left | 14:11 |
|
selckin
| what kind of crazy repo you got that status is slow | 14:11 |
| ← skfax left | 14:13 |
|
colemickens
| nixpkgs | 14:13 |
|
| SSD + zfs with a huge arc and it's still easy to tell a difference :D | 14:14 |
|
| though, I just enabled untrackedCache, so that might considerably help. | 14:14 |
| → austin987 joined | 14:14 |
| → sd5 joined | 14:15 |
| → powftw joined | 14:16 |
| ← gryffus left | 14:16 |
| → lpapp joined | 14:16 |
|
lpapp
| hi, git bisect log does not contain the number of commits and steps left | 14:16 |
|
| can I somehow explicitly request it? | 14:16 |
| → gh34 joined | 14:16 |
|
lpapp
| when I am in the middle of a bisecting session | 14:17 |
| ← lucasta left | 14:17 |
| → supay joined | 14:19 |
| ← pyeveryt_ left | 14:20 |
| → ccapndave joined | 14:22 |
| ← sjoshi left | 14:26 |
| → thiago joined | 14:27 |
| → peirik_ joined | 14:27 |
| ← tristan_ left | 14:29 |
| → tristan_ joined | 14:30 |
| ← peirik_ left | 14:32 |
| → nate3 joined | 14:33 |
| → moon93 joined | 14:34 |
| → c0dehu1k joined | 14:34 |
| ← tristan_ left | 14:35 |
| → jonosterman joined | 14:37 |
| ← nate3 left | 14:37 |
| → gryffus joined | 14:38 |
| ← LuKaRo left | 14:39 |
| ← thiago left | 14:39 |
| → memoryleak joined | 14:40 |
| → thiago joined | 14:41 |
| → alexhandy joined | 14:42 |
| → LuKaRo joined | 14:44 |
| ← alexhandy left | 14:45 |
| ← ccapndave left | 14:48 |
| → audioburn joined | 14:49 |
| ← csm310599 left | 14:49 |
| → peirik_ joined | 14:50 |
| ← audiobirb left | 14:52 |
| ← peirik_ left | 14:55 |
| → medusa joined | 14:56 |
| ← feriman left | 14:56 |
| ← medusa left | 14:56 |
| → softirq joined | 14:56 |
| → bookworm joined | 14:56 |
| → berkay joined | 14:57 |
| → pyeverything joined | 14:58 |
| → ThorMojito1 joined | 14:58 |
| ← ThorMojito left | 14:58 |
| ← pyeverything left | 14:59 |
| → pyeverything joined | 14:59 |
| → jazz-o-lantern joined | 15:04 |
| → soman joined | 15:05 |
| → alexhandy joined | 15:06 |
| ← travisghansen left | 15:06 |
| ← thiago left | 15:06 |
| → edgars joined | 15:08 |
| → haps joined | 15:09 |
| → thiago joined | 15:11 |
| ← trace1918 left | 15:11 |
| → peirik_ joined | 15:12 |
| ← LuKaRo left | 15:13 |
| → LuKaRo joined | 15:15 |
| ← alexhandy left | 15:16 |
| ← blaklistd left | 15:16 |
| → blaklistd joined | 15:16 |
| → Lunatrius joined | 15:17 |
| ← blaklistd left | 15:17 |
| ← ntz left | 15:18 |
| → blaklistd joined | 15:18 |
| → ntz joined | 15:19 |
| → m0viefreak joined | 15:20 |
| → leeand00 joined | 15:20 |
| → Kulrak joined | 15:20 |
| ← edgars left | 15:20 |
| → alexhandy joined | 15:22 |
| ← epony left | 15:22 |
| ← alexhandy left | 15:24 |
| ← belsirk left | 15:27 |
| → epony joined | 15:27 |
| → lacrymology joined | 15:28 |
|
Kobaz
| little bit of a gittastrophy here | 15:28 |
|
| https://dpaste.com/29B7BP5ZM | 15:28 |
|
ikke
| Kobaz: !situation | 15:30 |
|
gitinfo
| Kobaz: Please post the url returned by ' git log -n 20 --all --graph --format="%h %p %d %s" | curl -F text=@- https://upaste.de ' to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain) | 15:30 |
| → rama joined | 15:30 |
| ← ferdna left | 15:30 |
|
selckin
| !undo_merge | 15:30 |
|
Kobaz
| fatal: ambiguous argument '%p': unknown revision or path not in the working tree. | 15:31 |
|
anddam
| how do I force checking out on "error: The following untracked working tree files would be overwritten by checkout:"? | 15:31 |
|
selckin
| !revert_merge | 15:31 |
|
gitinfo
| [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you can use 'git revert' but there are gotchas to be aware of. Please read: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt | 15:31 |
|
ikke
| Kobaz: seems like you omitted the quotes? | 15:31 |
|
anddam
| oh, checkout --help has --force | 15:31 |
|
Kobaz
| nope, the quotes are in there | 15:31 |
| ← dionysus69 left | 15:31 |
|
Kobaz
| # git log -n 20 --all --graph --format="%h %p %d %s" | 15:31 |
|
| option doesn't exist maybe? | 15:33 |
|
ikke
| it works for me | 15:33 |
|
| And it's not a recent option | 15:33 |
|
Kobaz
| git version 2.30.2 | 15:33 |
|
anddam
| worksforme as well | 15:34 |
|
ikke
| Kobaz: what shell? | 15:34 |
| ← sd5 left | 15:35 |
|
anddam
| "What the shell!" | 15:35 |
| → sd5 joined | 15:35 |
|
anddam
| Kobaz: try single quotes maybe | 15:36 |
|
Kobaz
| single quotes.. nope.... and man git-log does show %p as a valid option | 15:36 |
|
gitinfo
| the git-log manpage is available at https://gitirc.eu/git-log.html | 15:36 |
| → alexhandy joined | 15:37 |
| ← GrapeSlush left | 15:37 |
| ← audioburn left | 15:38 |
| → gsgx joined | 15:38 |
|
anddam
| Kobaz: yea I figure parent is a pretty old concept in git logging | 15:38 |
|
Kobaz
| maybe a bug in this version | 15:39 |
| → GrapeSlush joined | 15:39 |
| ← alexhandy left | 15:39 |
| ← ThorMojito1 left | 15:41 |
|
anddam
| Kobaz: what if you throw an actual revision there? | 15:41 |
|
| also you didn't answer what shell is this | 15:42 |
|
Kobaz
| oh, sorry... bash | 15:43 |
|
anddam
| that sounds very odd then | 15:43 |
| ← peirik_ left | 15:43 |
| → ferdna joined | 15:45 |
| → dionysus69 joined | 15:45 |
| → alexhandy joined | 15:45 |
| ← alexhandy left | 15:45 |
| ← apteryx left | 15:46 |
| → clime1 joined | 15:48 |
| ← crabbedhaloablut left | 15:52 |
| → crabbedhaloablut joined | 15:52 |
| → madewokherd joined | 15:53 |
| → ThorMojito joined | 15:55 |
| → feriman joined | 15:57 |
| ← madewokherd` left | 15:58 |
| ← leeand00 left | 15:59 |
| ← dionysus69 left | 16:00 |
| → alexhandy joined | 16:00 |
| ← pyeverything left | 16:00 |
| → pyeverything joined | 16:00 |
| → Murr- joined | 16:03 |
| ← alexhandy left | 16:03 |
| ← Murr left | 16:06 |
| Murr- → Murr | 16:06 |
| ← lpapp left | 16:07 |
| → leeand00 joined | 16:08 |
| ← ThorMojito left | 16:12 |
| ← cdown left | 16:14 |
| ← ferdna left | 16:15 |
| ← IFTquestion2 left | 16:18 |
| ← sd5 left | 16:19 |
| → sd5 joined | 16:21 |
| → ferdna joined | 16:21 |
| ← sd5 left | 16:24 |
| → sd5 joined | 16:25 |
| ← powftw left | 16:25 |
| ← leeand00 left | 16:27 |
| → alexhandy joined | 16:27 |
| ← alexhandy left | 16:27 |
| → ___nick___ joined | 16:28 |
| ← sd5 left | 16:28 |
| ← ___nick___ left | 16:28 |
| → sd5 joined | 16:29 |
| ← clime1 left | 16:29 |
| → ___nick___ joined | 16:30 |
| ← jonosterman left | 16:30 |
| → cdown joined | 16:31 |
| ← feriman left | 16:32 |
| → feriman joined | 16:32 |
| ← NorrinRadd left | 16:32 |
| ← haps left | 16:33 |
| → leeand00 joined | 16:37 |
| ← moon93 left | 16:39 |
| ← supay left | 16:41 |
| ← adlternative left | 16:41 |
| → adlternative joined | 16:42 |
| → loulou joined | 16:43 |
| ← loulou left | 16:43 |
| → loulou joined | 16:43 |
| → junebug joined | 16:43 |
| ← cdown left | 16:44 |
| → cdown joined | 16:45 |
| → alexhandy joined | 16:46 |
| → ThorMojito joined | 16:46 |
| → lucasta joined | 16:48 |
| → skapata joined | 16:49 |
| ← LuKaRo left | 16:49 |
| ← cdown left | 16:50 |
| ← alexhandy left | 16:51 |
| → LuKaRo joined | 16:53 |
| ← adlternative left | 16:59 |
| ← soman left | 16:59 |
| ← pyeverything left | 17:01 |
| → alexhandy joined | 17:01 |
| ← lucasta left | 17:02 |
| ← rama left | 17:02 |
| → rama joined | 17:03 |
| → lucasta joined | 17:03 |
| ← alexhandy left | 17:03 |
| ← LuKaRo left | 17:08 |
| → IFTquestion2 joined | 17:10 |
| → lpapp joined | 17:10 |
| ← softirq left | 17:10 |
|
lpapp
| is this deliberate that git bisect good/bad keeps the local changes, e.g. a build fix for htat revision? | 17:11 |
|
| i.e. I have to throw that away explicitly for the next step? | 17:11 |
| → LuKaRo joined | 17:11 |
|
lpapp
| I actually do not even know how it does it, it rebases the local changes on top of the next commit in the bisecting session? | 17:11 |
|
ikke
| it would just checkout the commit it wants to check | 17:12 |
| → softirq joined | 17:12 |
|
lpapp
| but for that, we typically need to drop local changes, right | 17:12 |
|
| or commit them | 17:12 |
|
ikke
| git checkout will succeed if there are no conflicting changes | 17:13 |
|
lpapp
| ok, maybe I confused it with pull then, thanks | 17:13 |
|
| so, if there was conflict, git bisect good/bad would also be in trouble. | 17:13 |
|
ikke
| rebase wants a clean working tree | 17:13 |
| → adlternative joined | 17:15 |
| → Sasazuka joined | 17:19 |
|
lpapp
| thanks | 17:20 |
| → edgars joined | 17:21 |
| → alexhandy joined | 17:22 |
| ← leeand00 left | 17:24 |
| ← lucasta left | 17:24 |
| ← alexhandy left | 17:24 |
| → leeand00 joined | 17:25 |
| → lucasta joined | 17:25 |
| ← edgars left | 17:29 |
| ← LuKaRo left | 17:30 |
| → TheCatBehemoth joined | 17:30 |
| ← derpydoo left | 17:31 |
| ← epony left | 17:31 |
| → epony joined | 17:32 |
|
wpcarro
| would `git reflog` be the place to go to find the previous values for HEAD for branch=main | 17:32 |
|
ikke
| wpcarro: the default reflog tracks HEAD, which can be any branch | 17:33 |
|
| if you want to know the history of main, use `git reflog main` | 17:33 |
|
wpcarro
| ty anyway to query a remote's reflog? | 17:34 |
|
ikke
| no | 17:34 |
|
wpcarro
| i'd like to see `git reflog main` for my origin remote | 17:34 |
|
| :( | 17:34 |
|
ikke
| reflog is local only, not shared | 17:34 |
|
| or exposed | 17:34 |
|
wpcarro
| okay must find new implementation idea then | 17:35 |
|
| i have a ci job that adds refs to tag commits with "revision numbers" (e.g. r/123 is the 123rd commit in the mainline branch) | 17:35 |
| ← lpapp left | 17:35 |
| → LuKaRo joined | 17:36 |
| → pyeveryt_ joined | 17:36 |
|
wpcarro
| and it's working mostly okay except i forgot that github PRs allow multiple commits per PR, so i'm tag only the HEAD of main and skipping previous commits | 17:36 |
| ← junebug left | 17:36 |
|
wpcarro
| was hoping to find the commit range from the PR using `git reflog main` on the remote | 17:36 |
|
| i'd prefer to not query github if i can avoid it | 17:36 |
|
| pure git much nicer imo | 17:36 |
|
ikke
| github does expose several refs for each PR | 17:37 |
|
wpcarro
| oh right! | 17:37 |
|
| so maybe i can find the pr ref from a commit SHA... | 17:37 |
| → rama_ joined | 17:38 |
| ← rama_ left | 17:39 |
| ← rama left | 17:41 |
| ← ferdna left | 17:42 |
| → blahboybaz joined | 17:44 |
| → hoochmonger joined | 17:44 |
|
wpcarro
| hard to find that ref bc i guess the commit SHAs will differ after the merge... could look it up by tree SHA lol | 17:45 |
|
| this is starting to feel a bit much | 17:46 |
| → Murr- joined | 17:47 |
| ← leeand00 left | 17:47 |
|
wpcarro
| i'll just find a way to backfill from HEAD to which commit in main doesn't have a r/* ref | 17:48 |
| ← Murr left | 17:49 |
| Murr- → Murr | 17:49 |
| ← softirq left | 17:52 |
| → NorrinRadd joined | 17:52 |
|
wpcarro
| is `git for-each-ref --contains=HEAD` the fastest way to list all refs attached to HEAD? | 17:53 |
| ← lucasta left | 17:53 |
| → lucasta joined | 17:54 |
| → ThorMojito1 joined | 18:02 |
| ← ThorMojito left | 18:02 |
| → ThorMojito joined | 18:03 |
| ← ThorMojito1 left | 18:03 |
|
wpcarro
| `git log -1 --format=%D HEAD` maybe more direct | 18:06 |
| → leeand00 joined | 18:07 |
| ← cart_ left | 18:09 |
| → dionysus69 joined | 18:22 |
| ← peepsalot left | 18:24 |
| → dkeohane joined | 18:27 |
| → alexhandy joined | 18:29 |
| ← c0dehu1k left | 18:29 |
| ← adanwan left | 18:30 |
| ← iomari891 left | 18:31 |
| → adanwan joined | 18:32 |
| ← NorrinRadd left | 18:34 |
| → nate3 joined | 18:34 |
|
anddam
| Kobaz: no more updates? | 18:35 |
|
| I am curious about that misinterpreted %p | 18:35 |
| ← ThorMojito left | 18:35 |
| → ThorMojito joined | 18:35 |
| ← pyeveryt_ left | 18:37 |
| ← IFTquestion2 left | 18:38 |
| ← TomyWork left | 18:39 |
| ← nate3 left | 18:39 |
| → sudoforge joined | 18:40 |
| → peirik_ joined | 18:41 |
| ← Murr left | 18:43 |
| ← alexhandy left | 18:43 |
| → Murr joined | 18:43 |
| → NorrinRadd joined | 18:45 |
| ← lucasta left | 18:52 |
| → lucasta joined | 18:52 |
| ← ThorMojito left | 19:03 |
| ← blahboybaz left | 19:04 |
| → blahboybaz joined | 19:06 |
| ← gryffus left | 19:06 |
| ← LuKaRo left | 19:06 |
| → fweht joined | 19:08 |
| → LuKaRo joined | 19:11 |
| → pyeveryt_ joined | 19:12 |
| ← gsgx left | 19:12 |
| ← lucasta left | 19:13 |
| → lucasta joined | 19:13 |
| ← pyeveryt_ left | 19:14 |
| → pyeverything joined | 19:14 |
| ← peirik_ left | 19:16 |
| ← adlternative left | 19:18 |
| → adlternative joined | 19:18 |
| → ThorMojito joined | 19:25 |
| → edgars joined | 19:25 |
| ← ThorMojito left | 19:25 |
| → audioburn joined | 19:27 |
| ← dionysus69 left | 19:28 |
| → IFTquestion2 joined | 19:31 |
| ← edgars left | 19:31 |
| ← LuKaRo left | 19:31 |
| → jaume joined | 19:33 |
| jaume → malmalmal | 19:33 |
| ← malmalmal left | 19:34 |
| → jaume joined | 19:35 |
| → LuKaRo joined | 19:35 |
| ← epony left | 19:36 |
| ← jaume left | 19:36 |
| → epony joined | 19:37 |
| → malmalmal joined | 19:37 |
| ← fling left | 19:37 |
| ← malmalmal left | 19:44 |
| → malmalmal joined | 19:45 |
| → malmalmalmal joined | 19:45 |
| ← malmalmal left | 19:47 |
| ← malmalmalmal left | 19:47 |
| → malmalmal joined | 19:47 |
| → ThorMojito joined | 19:49 |
| ← tuskkk____ left | 19:50 |
| → ThorMojito1 joined | 19:56 |
| ← ThorMojito left | 19:56 |
| ← irrgit_ left | 20:01 |
| → fling joined | 20:01 |
| ← malmalmal left | 20:01 |
| ← fling left | 20:02 |
| ← lucasta left | 20:02 |
| → irrgit_ joined | 20:02 |
| → lucasta joined | 20:04 |
| ← ___nick___ left | 20:04 |
| → fling joined | 20:05 |
|
wpcarro
| anyone know how to list the commits added in a gh pr using vanilla git? i know there's the refs/pull/#/head... | 20:10 |
|
| if refs/pull/n/head has been rebased with latest origin/main, then origin/main..pull/n/head works as expected | 20:11 |
|
| but i think things might get strange when pull/n/head hasn't been rebased with the latest origin/main | 20:11 |
|
| am i better off just using the gh api? | 20:13 |
| → peirik_ joined | 20:14 |
| ← pyeverything left | 20:16 |
| → pyeveryt_ joined | 20:16 |
| ← NorrinRadd left | 20:16 |
| ← peirik_ left | 20:18 |
| ← Coop left | 20:20 |
| ← ThorMojito1 left | 20:20 |
| ← pyeveryt_ left | 20:21 |
| → ferdna joined | 20:23 |
| ← IFTquestion2 left | 20:25 |
| → user joined | 20:26 |
|
user
| hi | 20:26 |
| → lgc joined | 20:27 |
|
user
| i found the file and and a hash via 'git grep keyword $(git rev-list --all)' but how can i find the exact commit hash? | 20:27 |
| ← sudoforge left | 20:28 |
| ← lgc left | 20:29 |
| → alexhandy joined | 20:29 |
| → Coop joined | 20:37 |
| ← alexhandy left | 20:42 |
| → baffodoro joined | 20:42 |
| → peirik_ joined | 20:42 |
| → keypushe- joined | 20:45 |
| ← igemnace left | 20:45 |
| ← keypusher left | 20:46 |
| ← coot left | 20:48 |
| keypushe- → keypusher | 20:48 |
| ← LuxuryMode left | 20:51 |
| → YuGiOhJCJ joined | 20:51 |
| → alexhandy joined | 20:52 |
| → awmv joined | 20:52 |
| ← lucasta left | 20:54 |
| → lucasta joined | 20:54 |
| → pyeveryt_ joined | 20:56 |
| ← Le_Ris left | 20:57 |
| → iomari891 joined | 20:59 |
| ← fling left | 21:00 |
| ← LuKaRo left | 21:03 |
| → cdown joined | 21:04 |
| ← hexadecagram left | 21:04 |
| → molt joined | 21:07 |
| → LuKaRo joined | 21:15 |
| ← iomari891 left | 21:15 |
| → fling joined | 21:19 |
| → robo- joined | 21:21 |
| → hexadecagram joined | 21:24 |
| ← robo- left | 21:26 |
| ← LuKaRo left | 21:26 |
| → robo- joined | 21:27 |
| ← gvg left | 21:27 |
| ← dviola left | 21:27 |
| → analpaper__ joined | 21:28 |
| → m0viefreak2 joined | 21:28 |
| ← m0viefreak left | 21:28 |
| m0viefreak2 → m0viefreak | 21:28 |
| → LuKaRo_ joined | 21:30 |
| → edgars joined | 21:30 |
| ← user left | 21:31 |
| → travisghansen joined | 21:32 |
| ← alexhandy left | 21:33 |
| ← dnh left | 21:33 |
| ← peirik_ left | 21:34 |
| → gvg joined | 21:34 |
| ← sd5 left | 21:35 |
| ← edgars left | 21:36 |
| ← jim left | 21:37 |
| → ThorMojito joined | 21:37 |
| → alexhandy joined | 21:37 |
| ← ThorMojito left | 21:38 |
| ← fweht left | 21:38 |
| ← lucasta left | 21:39 |
| → lucasta joined | 21:40 |
| → sedzcat joined | 21:40 |
| → dviola joined | 21:41 |
| → pikapika joined | 21:41 |
| ← sedzcat left | 21:42 |
| → jim joined | 21:42 |
| → ThorMojito joined | 21:42 |
| ← adanwan left | 21:43 |
| → adanwan joined | 21:46 |
| ← causasui left | 21:48 |
| ← gh34 left | 21:48 |
| ← geosmile left | 21:49 |
| ← crabbedhaloablut left | 21:49 |
| → crabbedhaloablut joined | 21:50 |
| → peirik_ joined | 21:51 |
| ← alexhandy left | 21:51 |
| ← feriman left | 21:52 |
| ← peirik_ left | 21:55 |
| ← pyeveryt_ left | 21:56 |
| ← jim left | 21:57 |
| ← adanwan left | 21:57 |
| → adanwan joined | 21:58 |
| → trace1918 joined | 21:58 |
| → ThorMojito1 joined | 21:59 |
| ← ThorMojito left | 21:59 |
| → cbreak joined | 21:59 |
| → peirik_ joined | 22:00 |
| → Shentino joined | 22:01 |
| ← ThorMojito1 left | 22:03 |
| → alexhandy joined | 22:03 |
| ← gildasio left | 22:04 |
| ← m0viefreak left | 22:07 |
| ← alexhandy left | 22:08 |
| ← peirik_ left | 22:08 |
| ← Lord_of_Life left | 22:10 |
| → gildasio joined | 22:10 |
| → Lord_of_Life joined | 22:11 |
| → Xenguy joined | 22:14 |
| ← vitali64 left | 22:18 |
| → ThorMojito joined | 22:19 |
| ← lucasta left | 22:20 |
| → alexhandy joined | 22:21 |
| → lucasta joined | 22:22 |
| ← mncheck left | 22:24 |
| ← alexhandy left | 22:25 |
| ← lucasta left | 22:27 |
| ← cyberpear left | 22:35 |
| → nate3 joined | 22:36 |
| ← ThorMojito left | 22:38 |
| → alexhandy joined | 22:39 |
| → pyeveryt_ joined | 22:40 |
| ← dkeohane left | 22:40 |
| ← alexhandy left | 22:40 |
| ← nate3 left | 22:41 |
| → ThorMojito joined | 22:41 |
| → ThorMojito1 joined | 22:42 |
| ← ThorMojito left | 22:42 |
| ← srinidhi left | 22:43 |
| ← madewokherd left | 22:44 |
| ← trace1918 left | 22:47 |
| ← TheCatBehemoth left | 22:50 |
| ← FinnElija left | 22:51 |
| → FinnElija joined | 22:55 |
| ← pyeveryt_ left | 22:57 |
| ← YuGiOhJCJ left | 23:04 |
| → rama joined | 23:05 |
| → barometz joined | 23:06 |
| ← gildasio left | 23:08 |
| ← ThorMojito1 left | 23:08 |
| → ThorMojito joined | 23:09 |
| → gildasio joined | 23:10 |
| → YuGiOhJCJ joined | 23:12 |
| ← Kangie left | 23:12 |
| ← barometz left | 23:16 |
| → barometz joined | 23:17 |
| → sa joined | 23:17 |
| → polo joined | 23:19 |
| ← _sa0sin_ left | 23:26 |
| → darkstardevx joined | 23:31 |
| ← adlternative left | 23:32 |
| ← rama left | 23:33 |
| → edgars joined | 23:33 |
| → rama joined | 23:34 |
| ← barometz left | 23:35 |
| ← rama left | 23:35 |
| → rama joined | 23:35 |
| ← darkstardevx left | 23:35 |
| ← ThorMojito left | 23:37 |
| ← edgars left | 23:38 |
| → barometz joined | 23:39 |
| → madewokherd joined | 23:39 |
| ← YuGiOhJCJ left | 23:40 |
| ← zeenk left | 23:43 |
| ← epony left | 23:44 |
| → epony joined | 23:45 |
| → YuGiOhJCJ joined | 23:46 |
| → darkstardevx joined | 23:50 |
| → alexhandy joined | 23:50 |
| ← darkstardevx left | 23:52 |
| → darkstardevx joined | 23:53 |
| → specing joined | 23:56 |
| → jacobk joined | 23:56 |
|
specing
| Hello, I have an issue: $(git branch -r) shows no branches at all | 23:57 |
| ← alexhandy left | 23:57 |
|
specing
| git remote -v lists fetch and push origin https://github.com/vegastrike/Vega-Strike-Engine-Source.git (fetch) | 23:57 |
|
thiago
| fetch that remotes | 23:58 |
|
specing
| thiago: I did git fetch, git fetch --all, git fetch origin all to no avail | 23:59 |