🔎Julia Evans🔍 retweeted
LIVE NOW! Our 24h livestream is officially on and we are ecstatic to spend the next day hearing from open source creators from around the world! Join here: youtube.com/watch?v=L6jIMz…
1
11
26
18,009
🔎Julia Evans🔍 retweeted
For a while, I've been working on a startup to design the next generation of day & night trains, optimizing space usage, comfort & economics all at once. The idea is to make night trains economically viable, a true alternative to flying, while being super comfortable.
17
52
731
124,687
reasons I still love the fish shell jvns.ca/blog/2024/09/1…
9
17
104
21,580
🔎Julia Evans🔍 retweeted
website-making class where you have to recapitulate the history of the web -- week 1 you can only use the very first HTML tags from HTML 1.0 or whatever, then over time you get to use <img>, then CSS, JavaScript 1.0, XMLHttpRequest, etc
28
47
602
41,258
migrating Mess With DNS to use PowerDNS jvns.ca/blog/2024/08/1…
1
9
39
14,616
people have been asking me to print posters for a long time and I'm excited to finally announce our first poster!
you can get it for $20 US + shipping here: store.wizardzines.com/products/poste…
the design is a collaboration between me, @omarieclaire, and Inner Loop Press
you can get it for $20 US + shipping here: store.wizardzines.com/products/poste…
the design is a collaboration between me, @omarieclaire, and Inner Loop Press
9
64
409
41,483
🔎Julia Evans🔍 retweeted
Get ready for this one.......
Robin shows us her bootable puzzle roguelite written in _x86 assembly_.
she also demonstrates how she debugs her (hand written) random number generator in qemu
code? here! github.com/metavee/puzdug…
her blog? here!! metavee.github.io/blog/
MORE!
Robin shows us her bootable puzzle roguelite written in _x86 assembly_.
she also demonstrates how she debugs her (hand written) random number generator in qemu
code? here! github.com/metavee/puzdug…
her blog? here!! metavee.github.io/blog/
MORE!
1
15
105
18,152
🔎Julia Evans🔍 retweeted
Corollary to this: you can have an outsized impact on the world by being one of the few people who DO publish fresh information online on your own web pages
Blog like it's 2005!
Blog like it's 2005!
A decade ago I felt like I could find anything on the Web. Now I feel like I can barely find anything. People just don't put information on web pages anymore.
26
153
1,198
131,659
entering text in the terminal is complicated jvns.ca/blog/2024/07/0…
4
16
122
20,353
🔎Julia Evans🔍 retweeted
Refreshed an eye-opening @b0rk computer performance quiz that I remember doing almost 10 yrs ago now.
thundergolfer.com/computers-are-…
thundergolfer.com/computers-are-…
0
6
33
12,894
git add -p
(this is bonus comic #4 for "How Git Works" wizardzines.com/zines/git, covering some topics that I didn't have space for in the zine)
permalink: wizardzines.com/comics/git-add…
(this is bonus comic #4 for "How Git Works" wizardzines.com/zines/git, covering some topics that I didn't have space for in the zine)
permalink: wizardzines.com/comics/git-add…
7
44
284
30,783
git worktree
(this is bonus comic #3 for "How Git Works" wizardzines.com/zines/git, covering some topics that I didn't talk about in the zine)
permalink: wizardzines.com/comics/git-wor…
(this is bonus comic #3 for "How Git Works" wizardzines.com/zines/git, covering some topics that I didn't talk about in the zine)
permalink: wizardzines.com/comics/git-wor…
7
68
390
48,789
🔎Julia Evans🔍 retweeted
@b0rk this is such a great resource. I’ve been using git for years and immediately learned multiple useful commands and git architecture concepts from the first few pages. thank you for this work!
1
1
11
10,349
git submodules
(this is bonus comic #2 for "How Git Works" wizardzines.com/zines/git, covering some topics I didn't talk about in the zine!)
permalink: wizardzines.com/comics/submodu…
(this is bonus comic #2 for "How Git Works" wizardzines.com/zines/git, covering some topics I didn't talk about in the zine!)
permalink: wizardzines.com/comics/submodu…
4
66
327
46,318
interactive rebase
(this is #bonuscomic #1 for How Git Works wizardzines.com/zines/git, covering some topics that didn't make it into the zine!)
permalink: wizardzines.com/comics/interac…
(this is #bonuscomic #1 for How Git Works wizardzines.com/zines/git, covering some topics that didn't make it into the zine!)
permalink: wizardzines.com/comics/interac…
6
59
351
43,730











![panel 1: git add -p lets you stage some changes and not others
(this is one of the tasks GUIs and IDEs are best at, but I always use git add -p anyway)
panel 2: what the interface looks like
filename, diff, your choice ("Stage this hunk [y,n,q,a,d,s,e,?]")
panel 3: y(es)/n(o)/q(uit)
y means "stage this change"
n means "don't"
q quits, keeping what you did so far. pretty straightforward.
panel 4: how to check your work
git diff --cached
will show your staged changes
panel 5: s: split into 2 parts
s will split a diff into smaller diffs you can say y or n to individually, like this:
panel 6: how to split a diff if there's no newline
You can use the e ("edit") option to edit the diff manually:
* to remove a - line, replace "-" with a space
* to remove a + line, delete the whole line
(or you can just say 'n' and edit your code! that's what I do!)](/pic/media%2FGQhwYxgWQAE3rNj.jpg)



