magit/magit

It's Magit! An Emacs mode for Git.

Gary Trakhman

@gtrak

I know what happened, I moved the repo dir and symlinked it back to the old path. The parent dir had the overriding .gitconfig, but I guess how magit does pwd resolves the symlink, to a dir without that parent.

Noam Postavsky

@npostavs

oh, I think that's mainly Emacs configuration, perhaps vc-follow-symlinks or find-file-visit-truename

Gary Trakhman

@gtrak

hmm, I must have reverted that, though, it's something else.

it relies on includeif.gitdir:~/parent/.path=~/parent/.gitconfig , that seems to be where it diverges on git config -l

Gary Trakhman

@gtrak

yea, it's the symlink thing

thanks!

that : trick is useful

Aurabindo J

@aurabindo_gitlab

Hi all, once I start a git am --reject from the command line, and after fixing up the rejects, how can I complete the pending am in Magit ?

Gary Trakhman

@gtrak

When pushing a local branch upstream, is there a way to make the top of the list be a branch of the same name, instead of master?

Tassilo Horn

@tsdh

Is there a way to get a git log --graph starting with a specific commit? I frequently need to trace a given commit from where it has been committed in branch X and then merged "upwards", and it seems like the magit log with --graph option somehow misses commits in case the graph becomes too wide...

Julio Borja Barra

@juboba

Hi everybody! I'm creating a hook to add "coauthors" of a commit. I thought the best way of doing this, was configuring the other authors in .git/config and then reading from there, e.g.:

...
[branch "feat_resources_api_serverless-5064"]
    remote = origin
    merge = refs/heads/feat_resources_api_serverless-5064
    rebase = true
    coauthors = "John <john@current.ly>" "Mike <mike@other.mail>"

But I haven't found a function from magit to read these configuration values. I know magit gets/sets them so it has to be there

is there an existing function to do this or should I do it in another way?

Noam Postavsky

@npostavs

@juboba you can use magit-get to read git configuration values

Julio Borja Barra

@juboba

thanks!

klorophatu

@klorophatu

How can I compare files from different branches?

klorophatu

@klorophatu

Seems like doing a merge preview does the job pretty well.

Noam Postavsky

@npostavs

@klorophatu you can also use d r (magit-diff-range) with file -- arguments

klorophatu

@klorophatu

:thumbsup:

Eric Prud'hommeaux

@ericprud

dired has a specialized ~ command to mark emacs droppings (for e.g. deletion). is there an analog in magit-status?

James Elliott

@brunchboy

I generally always have *~ in my .gitignore.

arichiardi

@arichiardi:matrix.org

[m]

Hi folks, I might have misconfigured something but is there a way to see the operation I am performing (see, say Pull when I pressing F)?

Angel de Vicente

@angel-devicente

Hi, recently I got a message from GitHub saying that I have to start using token-based authentication. I created a token in GitHub and I installed forge and ghub and my basic configuration seems to work with forge (I managed to grab/modify/push issues and I was asked for the password of my authinfo.gpg, and in GitHub I can see that my token was used, so all OK there). But from within Magit, if I try to push to the repository it still asks me my username/password. Any clue what did I miss?

Ivan Yonchovski

@yyoncho

@angel-devicente for magit most likely you have used https for the repo and if you switch to ssh

or you can store your password for longer via git command line

Angel de Vicente

@angel-devicente

I was keeping my password for longer by using git ... credential-helper, but I want to get rid of passwords completely (if possible), since GitHub is telling me that is deprecated and soon will not work. So I want to be able to use ghub with the created token with Magit and do away completely with passwords (I'm assuming that is possible, since I didn't have to type any password with 'forge' to get/create issues in the repository

Ivan Yonchovski

@yyoncho

is ssh an option for you?

Angel de Vicente

@angel-devicente

is ssh an option for you?

I guess so, but I would like to sort out the ghub option first (I spent sometime configuring it and I would like to understand why is not working with Magit :-)

Ivan Yonchovski

@yyoncho

I am not an expert in the field, but I think that the token is for the API usage, not for git client.

Angel de Vicente

@angel-devicente

Thanks. I will play with the configuration then until I break something :-)

Norman Ramsey

@nrnrnr

I just updated magit and forge, and now my Emacs (version 26.1) is failing at startup. An autoloaded module is causing this error: error Key sequence C-x M-g starts with non-prefix key C-x ESC

I naively commented out the reference on line 277 of magit.el, but the issue remains.

Emacs reports, Version: 20210206.1237
Commit: dfadfd876d59cc8294fa938bd0439229b773fcd4

Norman Ramsey

@nrnrnr

Rolling back to 20200913.2013 fixes the issue.

Tassilo Horn

@tsdh

nrnrnr: Hm, some not-so-old change adds some global bindings such as C-x M-g. Apparently, in a terminal, M-g gets read as ESC g, so it might fail there if C-x ESC is not a prefix key already.

nrnrnr: I don't have that problem using emacs 28 where C-x ESC seems to have a at least repeat-complex-command bound to ESC...

nrnrnr: Anyway, you should be good anyhow by setting magit-define-global-key-bindings to nil.

(setq magit-define-global-key-bindings nil), that is.

Norman Ramsey

@nrnrnr

@tsdh thanks for the tip. I think I'll file an issue, however. Debian stable is running Emacs 26.1, and it's better for magit if it runs out of the box.

aeyk

@Aeyk

I am (trying) to use magit over tramp, but the machine I SSH into has unsupported version of git (1.8.X), is it possible to use my local version of git over tramp with magit?

Alexander Ilin

@alex-ilin

No.

ldeck

@ldeck

Hey all. What’s the quickest (or recommended) way with magit to do something like git fetch origin master:master while working on a feature branch?

Adam Faryna

@farynaio

Hi all, I use Magit together with Evil. Is it possible to hook somehow so when I open commit message I already in evil input mode rather than normal?

I noticed the msg buffer is text-mode

Noam Postavsky

@npostavs

@ideck try f o origin master RET (magit-fetch-branch)

ldeck

@ldeck

Thanks @npostavs !

crazy-nik

@crazy-nik

hi :) in the magit log buffer, when on a merge commit, is there an easy way to get to a log buffer of the merged branch? (second parent; I use the log view with --first-parent, but sometimes I like to look into a merged branch from the merge commit)

Eric Mark Martin

@ericmarkmartin

Hi—I’m trying to use the forge-create-pullreq-from-issue function but find that it doesn’t actually create a PR. The normal forge-create-pullreq does work

crazy-nik

@crazy-nik

test test :D

Alexander Ilin

@alex-ilin

Pass paa

Ssssss

Where communities thrive

People

Repo info

Activity