Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
    alphapapa
    @alphapapa:matrix.org
    [m]
    :)
    alphapapa
    @alphapapa:matrix.org
    [m]
    understandable. I can't imagine being the primary maintainer of a package used by as many people as Magit is used by
    Do you have any non-Magit Elisp projects nowadays that you enjoy working on?
    Jonas Bernoulli
    @tarsius
    Sadly no but I plan to bring back "personal computing" with the help of guix in my live time. ;)
    alphapapa
    @alphapapa:matrix.org
    [m]
    cool, Guix seems like a great project, I hope to be using it more in the future
    Jonas Bernoulli
    @tarsius
    :P gotta go for a walk now before doing some difficult releasing later today
    alphapapa
    @alphapapa:matrix.org
    [m]
    good luck :)
    Jonas Bernoulli
    @tarsius
    :wave:
    alphapapa
    @alphapapa:matrix.org
    [m]

    @tarsius Man, reading emacs-devel, it always amazes how some people seem to want to resist using Magit, preferring even shell commands. They're like, "Err, give me some examples of REALLY COMPLICATED git things and how Magit would make THOSE easier. Don't tell me about how Magit makes simple things fast and complicated things simple."

    Magit makes me feel like a git ninja, like Magit is a musical instrument that I can press a few keys to express what would take paragraphs to say. I feel sad when I see people who won't even try it; they're missing out on so much.

    Jonas Bernoulli
    @tarsius
    What can I say...
    alphapapa
    @alphapapa:matrix.org
    [m]
    Just used the magit-cherry-donate command for what I think is the first time. It's so convenient. :)
    I love how easy it is to reorganize commits from the log buffer. Cherry-pick, donate, harvest, rebase onto master, all with just a few keypresses, like playing the piano where each note tells a story.
    I must sound like a Magit fanatic haha
    Jonas Bernoulli
    @tarsius
    I like that :D
    Julio Borja Barra
    @juboba
    hi all! is there a way of having the magit-status buffer work quick when dealing with huge merge conflicts?
    I understand the slowness comes from Emacs having to render thousands of lines even if they're not visible.
    So, I wonder if there's an easy way of leaving only the conflicts in the buffer (removing all the lines of other changes)
    5 replies
    Tassilo Horn
    @tsdh
    juboba: I don't think there is but I wished for something like that, too.
    alphapapa
    @alphapapa:matrix.org
    [m]
    Ahh, Magit is just so good! I love how easy and fast it is to rebase several WIP branches on top of a new master HEAD and force-push them to the remote. Just a few keystrokes for what would take many separate commands to do.
    Julio Borja Barra
    @juboba
    yeah, I usually c e (extend commit) and then p -f u (push --force-with-lease) :P
    as you say, using magit is like playing an amazingly powerful piano haha
    Giulio Centorame
    @GiulioCentorame

    Hi there, I am having issues while connecting through SSH on a remote with an outdated git by default, but with a working git in another folder. Setting up magit-remote-git-executable manually to point at the working git binary seems to work; unfortunately, this makes it nontransferable to other devices. In any other case, it just recognises the default git (which is 1.8), causing a Magit requires Git >= 2.2.0 error.

    We've tried a couple of things here: https://emacs.stackexchange.com/questions/67975/load-right-version-of-git-while-connecting-to-remote but they do not work (not sure if it's because my elisp is terrible or they actually do not work). Would you have any idea on how to fix this on either ends?

    Thank you in advance for any help!
    Jonas Bernoulli
    @tarsius
    @GiulioCentorame Use tramp-remote-path.
    Giulio Centorame
    @GiulioCentorame
    @tarsius I set it to ("/software/git-2.18.0/bin/" "/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/freeware/bin" "/local/gnu/bin" "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin" "/opt/bin" "/opt/sbin" "/opt/local/bin") but unfortunately it still favours the system git installation while looking for it
    alphapapa
    @alphapapa:matrix.org
    [m]
    tarsius: Just read your post on emacs-devel about Transient and its "heresy" :D FWIW I appreciate the care and attention to detail with which you develop it, and the tireless way you take feedback and keep trying to satisfy nearly everyone. Also, the explanation about incomplete key sequences makes perfect sense, and makes Transient seem like a natural enhancement of Emacs to me.
    alphapapa
    @alphapapa:matrix.org
    [m]
    Just "harvested" over to master 3 commits I accidentally made on a WIP branch. Magit makes it so easy: go to the log buffer, select them in the region, "A h", done. :D
    alphapapa
    @alphapapa:matrix.org
    [m]
    Magnus
    @magthe:tchncs.de
    [m]

    I'm sometimes missing a "drop commit", i.e. a commit I make and keep for a while, but as as soon as I do git rebase --autosquash ... it would be removed. Typically I do it for extra logging that I want only temporarily while I experiment with things.

    Maybe I'm completely alone in wanting this though...

    6 replies
    Ag Ibragimov
    @agzam

    Does anyone know if it's possible to format commit message in a way that it would have "collapsible" groups while reviewing it in magit-revision-mode?

    We have a convention to put the list of squashed commits at the end of the commit message on "squash and merge", sometimes those commit messages tend to grow big - we not only include the message, but also keep the QA instructions and other relevant information in the message.

    I would love to find a way to make the commit message in such a way that it would be possible to quickly jump to the list of squashed commits. Or even better - format the message in such a way that in magit-revision-mode (when you visit the merge commit with Magit) it would have collapsible groups like for example in org-mode
    Neil Okamoto
    @gonewest818
    for the first time(!) I'm working on a project that uses git-lfs, so I'm searching around for magit lfs support. Is this what people are using? https://github.com/Ailrun/magit-lfs
    it's a start, I suppose, but I find myself dropping back to a shell more often than not
    alphapapa
    @alphapapa:matrix.org
    [m]
    tarsius (Jonas Bernoulli): Does this package seem bogus to you? melpa/melpa#7675
    Jonas Bernoulli
    @tarsius
    @alphapapa:matrix.org When I first noticed that pr I had a look too. I was unsure what "tag" meant. Turns out it means "git tag with or without additional github metadata depending on whether the latter exists or not". I think. I had to read the code to be fairly sure about that. To be sure that that description isn't wrong in subtle but in important ways wrong I would have to try it out and/or read the api documentation. Especially since this provides only one tiny feature it should document that in a way that makes such guessing unnecessary.
    This does not belong in ghub because that is more low-level. It makes it more convenient to make requests, handling tha authentication stuff and such; it does not implement concrete requests. github-tags could use ghub to benefit from its convenience features though.
    github-tags also sets global variables (not per-repository variables) to store individual parts of the returned data. That may work well for the authors use-case, but since it isn't documented at all others probably won't use it.
    1 reply
    This probably should not be a package but be part of the (likely only) package that uses it. As a "competitor" I decided to not comment on the pull-request.
    Jonas Bernoulli
    @tarsius
    @agzam No support for that and I don't plan to implement it because if different teams do this sort of thing they probably would do it in incompatible ways and it would be difficult to support them all. You could write an alternative to magit-insert-revision-message and use it in magit-revision-sections-hook.
    @gonewest818 I am not familiar with any git-lfs packages and cannot make any recommendations.
    Arya Kiran
    @gi-yt:matrix.org
    [m]
    can we make magit automatically push after a commit?
    Jonas Bernoulli
    @tarsius
    @gi-yt:matrix.org You should be able to accomplish that using git-commit-post-finish-hook.
    1 reply
    davecalkins
    @davecalkins
    Is it possible to have magit show the diffs in a side-by-side fashion? old file on the left, new file on the right? new to magit and like it, but my personal preference with diffs is side by side. My searching on this so far seems to suggest ediff should work, but I haven't figured out how to get that going.
    Jonas Bernoulli
    @tarsius
    davecalkins
    @davecalkins
    @tarsius I found myself at that page before, but couldn't find anything there which explains how to get a side by side diff. I tried it again and noticed that if I use E on a changed file, and then in the separate Ediff window which opens, hit |, it switches to vertical comparison which is sort of like side by side but with 3 windows.
    davecalkins
    @davecalkins
    Adding (setq magit-ediff-dwim-show-on-hunks t) to ~/.emacs results in 2 side by side windows
    davecalkins
    @davecalkins
    Is it possible to have magit output all git commands that it runs to a buffer? I found a section in the manual on this (https://magit.vc/manual/magit/Viewing-Git-Output.html) but it notes that it only outputs commands with side effects. It mentions the magit-git-debug option to output all calls but that doesn't seem to work. I'm setting that to true but am not seeing anything in the process buffer when doing non-side effect commands. When doing some commands, there's a delay and no visual feedback so you don't know what's happening. Being able to see commands being executed would be nice if possible.
    Jonas Bernoulli
    @tarsius
    There's also magit-process-extreme-logging. (Yes, I'll have to update the documentation.)
    davecalkins
    @davecalkins
    It would be nice to have an option to log all commands, but just log the commands not the output. As I haven't gotten it working at all, I'm thinking it may log output from Git as well? But just seeing the command line invocations as they go in a separate buffer would be nice. You could know something is happening. And learn some more Git commands along the way :)
    alphapapa
    @alphapapa:matrix.org
    [m]
    Just discovered magit-log-trace-definition. It's like vc-region-history, but with collapsible Magit sections. Man, Magit is good!
    Tassilo Horn
    @tsdh
    alphapapa:matrix.org: Wow, didn't know that! Nice!
    alphapapa
    @alphapapa:matrix.org
    [m]
    Magit's like Emacs: there's always something more to learn about it. You know, I think I'd pay money to see a screencast of Jonas using it himself, haha