this post was submitted on 10 Jul 2024
391 points (95.2% liked)

Linux

48033 readers
780 users here now

From Wikipedia, the free encyclopedia

Linux is a family of open source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991 by Linus Torvalds. Linux is typically packaged in a Linux distribution (or distro for short).

Distributions include the Linux kernel and supporting system software and libraries, many of which are provided by the GNU Project. Many Linux distributions use the word "Linux" in their name, but the Free Software Foundation uses the name GNU/Linux to emphasize the importance of GNU software, causing some controversy.

Rules

Related Communities

Community icon by Alpár-Etele Méder, licensed under CC BY 3.0

founded 5 years ago
MODERATORS
391
submitted 4 months ago* (last edited 4 months ago) by [email protected] to c/[email protected]
 

Zed is a modern open-source code editor, built from the ground up in Rust with a GPU-accelerated renderer.

you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 6 points 4 months ago

Git has some counterintuitive commands

Yeah... 'git merge main' weirds me out because my brain likes to think the command is merging current branch TO main instead of other way around

Some IDEs have extra non-native Git features like have inlined "git blame" outputs as you edit (easily see a commit message per-line, see who changed what, etc.), better diff/merge tooling (JetBrain's merge tool comes to mind), being able to revert parts of the file instead of the whole file, etc.

Okay this sounds very good, so they actually improve git cli feature wise in addition to implementing GUI for it.

Thanks for the reply!