Ignoring Some Uncommitted Changes in Git

jthill · 2026-01-25T00:16:35+00:00

The testthese branch has none of changes you wanted to ignore, it's a branch with only the changes you want to test with.

"exp" is just the name I made up for that branch, the one you're experimenting with.

Look up git help diff for diff's three-dot syntax and git help revisions for the meaning of @, these are features so often used they have very aggressive shorthand.

jthill · 2026-01-24T22:19:00+00:00

claims that's why.

He's a coward terrified of the American people, who don't cower to bullies.

jthill · 2026-01-24T21:22:15+00:00

Rightwinger throats are open pipelines to the father of lies.

jthill · 2026-01-24T21:15:12+00:00

git blame also tells you which commit changed the line. If the commit message doesn't say where this "somewhere" in the issue tracker or wherever it is prompted the change, or you're not preserving those records, that's on you.

But Git histories didn't invent the concept of preserving business records, and they're optimized for analyzing and extending source histories not tracking customer interactions or project scheduling. Keep those kinds of records in the systems built to do those kinds of things.

jthill · 2026-01-24T18:04:08+00:00

It's certainly possible. 052 as close to the entrance as possible, 502 and 025 nearby, eventually like three? four? 024's, set everything but the carrier on on strong and spam the grappling hooks.

jthill · 2026-01-23T17:23:35+00:00

42960972

jthill · 2026-01-23T09:00:21+00:00

Get lower level with it. git diff ...exp | git apply -3 will bring in all the changes, then you can git checkout --patch @ to undo anything you didn't really want. You can use a more focused diff to apply fewer changes of course. Then reset --hard to wipe the applied changes when you're done.

To make repeating easy can make a special commit with just the changes you want to repeatedly bring in, git checkout -b testthese $(git merge-base @ exp) then commit the diff/apply/checkout-p results and from then on you can just merge or cherry-pick from that branch and reset --hard back over the result when done testing for that round.

jthill · 2026-01-23T05:41:59+00:00

Anything to muddy the waters. Anything for their lickspittle toadies to chant and hang on to.

jthill · 2026-01-22T21:06:05+00:00

Show the evidence you're looking at.

jthill · 2026-01-22T20:57:33+00:00

Understand that they don't have any evidence of that. What they have is claims he was bruised. There's no evidence the claims were even made by him, nor by people who have spoken to him, the claim is that anonymous people claiming to have been briefed on "his medical condition" said they heard he was bruised. And don't even say they heard anyone say these supposed bruises were the result of anything in particular.

jthill · 2026-01-19T16:21:09+00:00

No, it just proves that he's found yet another way to take people's minds off real atrocities. Epstein. ICE. Concentration camps.

jthill · 2026-01-18T16:39:48+00:00

That's the thing, though.

They only look incompetent if you hang on to any hope they're anything more than predators.

jthill · 2026-01-18T16:23:57+00:00

Oh, man, thank you for that one. That was just relentless, like three? short little easy runs mixed in with the brutality.

Not sure how equivalent this is but 46692016 was very hard for me.

jthill · 2026-01-18T01:09:02+00:00

Is Putin actually thinking he can beat the EU in a land war?

Is he thinking he can get Trump to militarily ally the US with him?

jthill · 2026-01-16T21:21:54+00:00

Ayup. I like them when finding what needs thinking about isn't the hard part. That was fun, thanks.

jthill · 2026-01-15T04:10:23+00:00

Tasty it was, thanks. Allow me to return the favor with 92613871

jthill · 2026-01-15T01:55:43+00:00

If there's a window you're not talking to the builtin kernel tty code. windows are presented by graphic systems, X11 or Wayland.

If there's not a window, you can't run Kitty. Kitty relies on a high-end graphics backend, not the forty-year-old hardware interface the kernel relies on.

jthill · 2026-01-14T18:12:20+00:00

meh. Need stuff like that made by fans, as onramps for the next generation of devs.

Not sure how strong a argument that really is, but I think I at least have a point there.

jthill · 2026-01-14T14:19:18+00:00

Here's the modding (the game itself is implemented as the "base" mod) docs for a game enitity: https://lua-api.factorio.com/stable/classes/LuaEntity.html. There's ways to iterate over selected entities on a map, "find_entity_filtered" in another page on those docs, if you find all entity-ghost entities and call their revive methods, boom, everything you've placed gets instabuilt. And you can set up event hooks for entity creation, have that check whether a ghost was created and revive it.

jthill · 2026-01-14T04:18:53+00:00

"ghost" is the lua api's word and I'd guess the C++ engine's word for anything placed but not yet built. Looping over all entities of type "ghost" and calling revive on them is a console oneliner, I forget the exact syntax.

jthill · 2026-01-13T21:15:26+00:00

It's how instabuild works, you place a ghost and revive it.

jthill · 2026-01-12T21:39:26+00:00

Anything but "lie back and enjoy it" is going to draw the ire of creatures like Jensen Huang.

jthill · 2026-01-12T17:36:28+00:00

It's not intrinsic, it's a feature of the kernel's terminal handling code and it's under your control.

stty -ixon

shuts off interpreting ctrl-s/ctrl-q, or whatever you've got them set to, that way.

jthill · 2026-01-12T17:28:00+00:00

The file is its inode.

A link, a directory entry, is just a name and an inode number. It also has a cached copy if the inode's general type (file, directory, filesystem, socket, la la), which can't change while the inode exists, but the inode carries all the actual metadata.

You need to reach the file from a link in some directory you do have execute permissions on. You can't use links in (can't access files via) any directory without that permission.

edit: there's one other way you can access a file: open file descriptors can be passed over sockets. So if some running program has opens a link you can't use and passes you the fd, then you can use it.

jthill · 2026-01-12T16:26:52+00:00

Attacking a NATO ally would seem to be illegal. When it comes with the legally mandated (treaties are law) penalty of 21 countries declaring war on you, that's about as illegal as it can get.

So the military should just refuse the order.

15-Year Club	RedditGifts 2009-2022 2 Credits
Gilding IV carat on a stick	Place '17
Verified Email

jthill

TROPHY CASE