louis, 9 months ago (edited 9 months ago) to random

I've seen a lot of pro-#Fossil, anti-#Git discussion recently.

Not that I love Git, but it does the job and almost all deployment platforms have support for Git only.

And, am I the only one who needs a staging area because I have to commit only a part of my changes? Often even line-based.

And, sometimes I want to squash 20 ugly commits into a single one, destructively changing the commit history. Really!

And, sometimes I need a hosting platform for a project and there is not a single serious one for Fossil. What's the point in using Fossil when I have to do a Git-export?

And, most importantly, there is #Magit :blobcatmeltlove:​.

So ... although I can feel the love for Fossil, it simply doesn't work for most of my use cases.

ctietze, 4 months ago to emacs

#Emacs and #magit users, have you figured out a way to tweak merge conflict/diff views so that the versions have more meaningful names?

E.g. merging foo into master, showing labels like "changes to be applied from foo" and "base from master" would be amazing.

abcdw, 1 month ago to emacs

Did you know that you can do a git log just for a small part of the file?

#git #magit #emacs

ramin_hal9001, 6 months ago to emacs

#Magit is too easy to use sometimes: almost lost an important bug fix to a hard reset

I was trying to reset just one file, for that you press X f but I absentmindedly pushed X h instead which deleted all changes. Fortunately #Emacs saved me, I was able to remember all of the files I had changed, visit each of those buffers and press C-/ (undo) in each of them to recover my work. The correct copy of my files were on the Undo stack. I can see why some people love those backup files with the tilde characters at the end of the file name.

But then again, #Emacs , or rather #Magit was the problem to begin with. Is there any way to configure it to ask for confirmation before doing a hard reset?

inthehands, 4 months ago to random

Any recommendations for a git tool that:

• runs on macOS, and
• does a really nice job of the •commit• workflow: showing the diff, selecting changes to commit, maybe selecting individual lines.

I don’t care about anything fancier that commits — not even branches! I have tools I like for all that stuff.

I’m just looking for a nice UI for viewing and selecting uncommitted changes, something better than the clunky “stage / unstage” buttons that are the norm.

seperis, 4 months ago to random

So I'm assuming whoever designed git hates everyone or at least everyone who likes terminal? Or at least went about everything as weirdly complicated as possible?

It took me way too much googling to figure out how to do something that--by any sane standard--should be idiot proof.

Panic: figuring out how to create, edit, and push a new branch from my machine to my fork, seperis-image-builder and not image-builder. There is a canceled pull in image-builder, that's how close it came.

ctietze, 1 year ago to random

Sometimes, I have to restart #Emacs because I don't know how to fix this situation:

I'm answering "y" in the Minibuffer here, but its contents don't reset, and it retains focus. I need to <C-x o> out of the Minibuffer.

I have no real clue what causes this. I do believe it happens when I work with #Magit for an extended period of time, answering prompts and toggling and discarding transients here and there.

What would this be called in Emacs speak? Suggestions would be appreciated :pray:

takeonrules, 3 months ago to emacs

A brief how to configure #Magit. And a personal reminder to read the documentation.

https://takeonrules.com/2024/03/01/quality-of-life-improvement-for-entering-and-exiting-magit/

#Emacs

ynom, 3 months ago to emacs

What do you all think of #lem?

It appears to be an #emacs-ish program that uses #commonlisp for customization.

Apparently there have been other emacs clones based on #go and #rust and I guess those are called #emacsen ?

Without going too into my personal details, I’m not a professional programmer and most of my experience is with a modern programming language, #swift, and a high level programming language, #python.

I’ve tried learning #elisp several times by completing various programming exercises and I end up quitting because something obnoxious comes up that, from my minimal programming experience, appears to be due to elisp‘s age. Again, I’m not a pro, so this is just my amateur take.

I did a some programming challenges with #clojure which was hugely fun (mostly because of how fun it feels in emacs 😁) so I don’t think it’s the #lisp part of emacs I have a distaste for.

I’ll probably give it a serious go within the next week here and possibly report back, but I can’t imagine an emacs clone without #magit #orgroam and ChatGPT-shell will really ever become my daily driver 🙃

https://lem-project.github.io/

https://news.ycombinator.com/item?id=39397942

entilldaniel, 1 year ago to random

#magit in #emacs is by far the best git interface I've used.

orhun, 3 months ago to rust

Say hi to Gitu! — A TUI Git client inspired by Magit ✨

🚀 Stage, commit and use other essential Git functions in your terminal!

🦀 Written in Rust & built with @ratatui_rs

⭐ GitHub: https://github.com/altsem/gitu

#rustlang #tui #ratatui #git #terminal #ui #magit #emacs

video/mp4

emaksovalec, 1 year ago to random Slovenian

I'm writing a large document in #latex in #emacs and I track my changes with #magit. Is there a way to view to view Levensthein edit distance or similar instead of line diffs? MS Visual Studio actually does this quiet wonderfully despite being otherwise less than wonderful.

nik, 10 months ago to random

#Lazygit is five years old. I’ve been using it for a few years, and it’s made interacting with #Git so much more convenient. I used #vimagit (inspired by a coworker’s use of #Magit) before it, and the official Git #CLI before that.

Love me a good tool!

Links:

• https://jesseduffield.com/Lazygit-5-Years-On/
• https://github.com/jesseduffield/lazygit
• https://github.com/jreybert/vimagit
• https://github.com/magit/magit

piturnah, 10 months ago to rust

Hey everyone!!! I just released a really important usability update for #Gex, which is my #Rust #OSS project for #git interaction inspired by #Magit

Finally, we have scrolling! This is a feature that should've been added a long time ago, but here it is. Spent a long time tweaking it to try and get it to feel "right" so I'd love to know what you think!

A video where the software

brokenix, 8 months ago to random

#magit #phone indispensable

image/png

tarsius, 8 months ago to random

🎺​ #magit has been downloaded four million times from #melpa. 🥳​

https://melpa.org/#/magit

HaraldKi, 4 months ago to linux German

For software development I use #linux.
For version control I use #git.
To control git I use #magit in #emacs.
To start magit out of a #bash for the current project I use:

% type magit
magit is a function
magit ()
{
emacsclient -e "(kill-all-magit-buffers)" -e "(magit-status "$PWD")"
}
where kill-all-magit-buffers is based on this: https://stackoverflow.com/a/44119606/2954288

thanks @tarsius for magit

pbx, 3 months ago to emacs

#emacs is my org-mode editor, not my coding editor, but I've always liked the sound of #magit and have wanted to learn it for a long time. I came up with a silly hack this week to support that effort: a keybinding in VS Code that opens the current file in Emacs!

From there it's 'C-x g' and off to the races.

ericsfraga, 10 months ago to emacs

I am so proud of myself 🙂: I have just used #git #CherryPick for the first time ever and, drum roll, it worked! Did it via the command line as for some reason I get lost sometimes using #magit in #Emacs even though magit is fantastic for the usual activities.

sunshine, 3 months ago to emacs

A new blog post today on how #emacs and #magit have influenced my #git usage. I'd love to have feedback and corrections from the nice people on Mastodon!
https://signmaker.dev/refinements-from-magit

njoseph, 1 month ago to rust

Magit is one of the "killer apps" of emacs, which one might miss when using a different editor. Helix editor in my case.

gitu is a Git porelain offered in the form of a TUI app with keybindings similar to magit. It's still in active development. I've installed it using cargo for now.
https://github.com/altsem/gitu

#Rust #Magit #Emacs #Git #gitu #HelixEditor

ctietze, 3 months ago to random

GitButler | Git Branching, Refined https://gitbutler.com/

Found this #git tool today, and oh boy would I like to have what "virtual branches" sounds like:

Spotting a bug that has nothing to do with my current work?
Instead of checking out main again with a bugfix branch, do it directly without actually wrestling branch changes.

I really like that with #Magit I can "donate" and "harvest" commits, so I do that instead, but you can run into conflicts when rebasing after moving commits around

aksharvarma, 2 months ago to emacs

I always told people that #texlatex is best written/edited in #emacs but didn't have a better argument for it than how well everything integrates. #AUCTeX, pdf-tools, #magit, etc. make it a seamless experience. I had a little bit of YASnippets going as well which made life wonderful.

That already brought things to the state of Gilles Castel's 2019 latex lecture notes in #vim article (which I believe is famous, at least in these circles). But yesterday I found a blog post by @karthink about how to get that and more in Emacs.

LaTeX input for impatient scholars: https://karthinks.com/software/latex-input-for-impatient-scholars/

The very first demo (40 seconds) shows how to get an equation in latex that I am sure would take me over a minute to write by hand (and it would look ugly in comparison). Then I looked at the second video (45 seconds) and realized that somehow org table style editing can be used for things like matrices and arrays and what not.

Just like that, less than 2 minutes has me committed to getting all that functionality in my Emacs config. Of course, this being emacs, I can tailor it all precisely to my comfort and I'm willing to spend however long is needed to get it to that stage.

jameshowell, 4 months ago to random

TIL about #difftastic, a richly semantic diff that integrates well with #magit. Holy amazeballs. Thank you, @wilfredh!

https://github.com/Wilfred/difftastic

bram85, 1 month ago to emacs

magit-find-file allows you to open a file at a certain revision, which could be a (relative) timestamp. Notation: HEAD@{3 days ago}.

Using these bits, I wrote a small #emacs command that displays a file at a certain moment, chosen with the built-in calendar.

(defun bram85-magit-find-file-as-of (datetime)  
 (interactive (list (org-read-date)))  
 (let ((rev (format "HEAD@{%s}" datetime)))  
 (magit-find-file rev (magit-read-file-from-rev rev "File: "))))  

#magit #git