Questions tagged [magit]

is an Emacs extension for the Git version control system.

Filter by
Sorted by
Tagged with
1
vote
1answer
156 views

Modify last commit's message and push to upstream

I'm thinking about automating my following git workflow in emacs: checkout to a new branch remove some pattern in the last commit message commit (amend) it push it to upstream How could I automate 4 ...
0
votes
1answer
90 views

Magit error during commit on Windows

I have been getting an error when trying to commit using magit. I stage my change with a, then on commit cc I get the message: Opening output file: No such file or directory, c:/Users/myuname/.emacs....
0
votes
1answer
82 views

Magit: enable `toggle-truncate-line` in diff-mode

I'm working with tex files that have usually long lines of text. I enabled in magit the fine coloration of errors by using: (setq-default magit-diff-refine-hunk 'all) and now I'd like to disable the ...
1
vote
2answers
71 views

Magit shows magit-diff with HEAD^ instead of HEAD when invoked from console

When I start a commit from console (zsh on mac os Terminal) using git commit -a, then Emacs opens two windows as emacsclient in my existing Emacs App Window. One is the correct COMMIT_EDITMSG. The ...
0
votes
1answer
112 views

git-commit-mode with flyspell very slow

I use emacsclient as my git commit editor. This is what I have in my init file: (require 'git-commit) (add-hook 'git-commit-mode-hook 'turn-on-flyspell) I just made a huge commit (update of a third-...
3
votes
1answer
398 views

Magit asks for passphrase for ssh key every time

Running emacs 25.2.2 magit 2.12.1 on Kubuntu 18.04. I have set-up ssh keys for my bitbucket repository and I run ssh-agent on start. When I fetch or pull or push, magit asks for the passphrase for ...
2
votes
1answer
53 views

How to echo each magit command after each action?

Although I can use $ to see the command histories, I'd like to see it immediately each time I performed an action. E.g. Display git push -v origin master\:refs/heads/master after P p.
0
votes
1answer
110 views

Magit - “user” in Branch / Create from Pull Request

I've been using Magit for a long time, but finally read the manual, and started playing in the deep water. Not sure how to fix what I did... I tried b Y (Branch / Create from pull request). It asked ...
0
votes
1answer
82 views

temporary change magit-display-buffer-function

I have create this little helper to easy jump to my last used git projects, I using magit-status-internal to open a status buffer and I set magit-display-buffer-function so that the status is open in ...
0
votes
1answer
40 views

Why is the Magit M Remote pop-up different than what is shown in the Magit manual?

The Magit manual, 7.1.1 The Remote Popup, describes the following three commands, but they do not appear in my 'M' popup: M C (magit-remote-config-popup) M p (magit-remote-prune) M P (magit-...
4
votes
2answers
301 views

Using auth-source with magit and bitbucket

The code base I'm working on has recently moved from ssh key controlled git to https bitbucket. I use Magit to handle my version control in Emacs. In the old ssh world I was never challenged for my ...
2
votes
1answer
45 views

Latest Magit expands hunks after staging

With the latest version of Magit (20180410.432) I feel that the staging behavior has somewhat changed. Before, I used to expand the unstaged files in the Status Buffer, then stage the hunks one by one....
0
votes
2answers
91 views

Stage changes in just the first line of hunk

Consider the following situation: $ printf $'line1-v1\nline2-v1\n' > test.txt $ git init . $ git add test.txt $ git commit -m 'Initial commit' $ printf $'line1-v2\nline2-v2\n' > test.txt Now, ...
0
votes
2answers
88 views

How can I get a prompt for deleting index.lock file in magit?

This is a long standing issue https://github.com/magit/magit/issues/2708 . I feel that a prompt for deleting the transient file would compensate in most cases. Is there a reliable way to achieve this? ...
1
vote
1answer
929 views

Magit - How do I sync my feature branch with the latest master without checking out master?

Here's what I am trying to do:: I have one project in one git repository. I've made some changes in master and created a spinoff branch (b s) called my-feature. Now I've finished my feature and would ...
3
votes
1answer
112 views

git rebase -x (“exec”) with Magit?

Is it possible to use the "exec" mechanism when rebasing with magit? From the git rebase man page: -x <cmd>, --exec <cmd> Append "exec <cmd>" after each line creating a ...
1
vote
1answer
64 views

How can I determine if a `git` branch is a remote-tracking branch using Magit?

Is there a function magit-magic such that (magit-magic "master") => t (magit-magic "origin/master") => nil assuming origin/master is a fetched, but possibly unpulled branch on remote origin? (...
2
votes
1answer
528 views

How can I tell magit to ignore specific modified files?

I am working on a project where webpack's bundle.js is part of the repository. This file is gigantic and has many diffs and slows magit down. Is there a way I can tell magit to ignore this file when ...
1
vote
1answer
78 views

magit function to check if a branch is in sync with remote

Is there a function in magit to check if a branch is in sync with with it's remote (basically I want to check if both branches sit on the same commit) At the moment I check if remote branch and the ...
2
votes
1answer
309 views

How can Magit add a credential to ssh-agent?

Can I make Magit add my ssh passphrase to ssh-agent instead ask me to use the passphrase a single time? Every time I push a commit to my remote I need to type my passphrase or instead run M-& ssh-...
2
votes
1answer
392 views

Magit commit is slow even for tiny changes

For the last few months, committing even tiny changes using magit (c c) is really slow to bring up the commit message buffer. I've profiled the code that is executing during that time but I'm not ...
5
votes
1answer
91 views

How can I prevent Magit-status command from grabbing the frame focus?

when executing magit-status and quickly focus out emacs, after the magit buffer pops up, emacs grabs the focus back. This is quite inconvenient. Is there a way to prevent that focus changing? The ...
2
votes
1answer
295 views

Magit: amend the last commit with sign off

What if I forget to sign-off my last commit, how can I fix the last commit within Magit? I can do that with git command: $ git commit --signoff --amend Of cause I can write the sign-off by hand in ...
1
vote
1answer
882 views

Error (use-package): Failed to install magit: Package `magit-' is unavailable

I am starting to build up a .emacs file to be used as a development environment within Docker containers. I get this error when starting emacs-nox in a Docker container. Error (use-package): Failed ...
3
votes
1answer
336 views

Magit: magit-merge-squash

When I was researching the best way to merge a feature branch with a lot of WIP commits I came across squashing and rebasing however when looking how to do this in magit I found this sentence in the ...
0
votes
1answer
71 views

Revert buffer messages in echo area obscure minibuffer

My issue is that when I switch git branches in a project, each file that changes needs its buffer to revert, and this message is spat to the echo area for each file. If I try to run a command from the ...
1
vote
1answer
43 views

magit-define-popup-switch not enabled by default

I'm trying to teach magit that git pull --rebase should always --autostash. pull --rebase is always my default, so I want --autostash to be the default as well. The 5th argument of magit-define-...
0
votes
1answer
32 views

How to execute a function on the name before creating a branch in magit?

I want to execute the following function on the provided name before creating a new branch in magit: (defun pb/magit-new-branch-name (branch-name) "create a name usable as a branch name from branch-...
5
votes
3answers
435 views

Why does magit now prompt for which submodule to update?

I used to be able to press "o" then "u" (magit-submodule-update) in a magit buffer and have it update all my submodules. Now, it asks me to type in the path of which submodule I want to update. Is ...
2
votes
1answer
92 views

Magit stage modified without confirmation

(magit-stage-modified 'all) stages all modified files, but only after confirming it with the user with the message Stage all changes? (y or n). The function is defined as follows: (defun magit-stage-...
8
votes
1answer
438 views

Use magit to compare all changes in two revisions

Is there a way to invoke Ediff from Magit in order to compare the changes to all files between two revisions, not just the changes in a single file? My use case is a coworker will ask me to review ...
5
votes
1answer
88 views

Hide or fold stash section automatically in magit-status

I tend to stash a lot when using git, so my "stash" section in magit-stashes is getting pretty long. I'm not running out of hard-drive space or anything, so I don't want to delete the stashes. Can I ...
3
votes
3answers
165 views

magit-status does not open, when using (global-whitespace-mode 1)

This problem started happening today when I switched to my desktop computer after a couple months of using my laptop. I updated emacs to 25.3.1, updated all my packages, and downloaded my latest ....
0
votes
1answer
213 views

magit-status does not highlight diffs

I'm currently seeing a display problem in Magit. For a while I've seen that when I do magit-status, the diffs are no longer highlighted. I didn't care for a while, thinking it was the theme I've been ...
1
vote
2answers
264 views

How to make magit use --force-with-lease as default when pushing?

As per Magit's visual walkthrough, it is possible to save some configs as defaults, e.g: for diffing (section "Changing diff arguments"). I went through the documentation, but did not find anything ...
0
votes
1answer
171 views

Magit magit-diff-refine-hunk does not work if I don't move the cursor to the good lines

In magit, it looks like that if I want to have a diff that highlight changing words, I can either press D t when I'm in the diff, or put in my .emacs (custom-set-variables '(magit-diff-refine-hunk ...
1
vote
1answer
153 views

Magit: stash push

The stash "push" command is really practical, while stash "save" is supposed to be deprecated. However, on magit I can just find stash save... Is there any reason for that? Did I miss something? ...
2
votes
2answers
85 views

Could magit be writing `.git/index` without my intervention?

I'm trying to track down an issue which might be caused by magit. I work on multiple machines, and on each machine I have an emacs running, each of which has some magit buffers open. I keep machines ...
0
votes
1answer
87 views

changes in commits are not shown any more

when commiting in magit it used to open a diff window where I could see the changes I'm commiting right now. For some reason this window doesn't open any more on some repos. I must have disabled this ...
0
votes
1answer
64 views

Magit status wired output (control sequences)

When I use magit on a RHEL 7 box today, it gives me this output when checking magit-status: Not sure what went wrong. Magit-version output is: Magit 2.11.0, Git 2.14.1, Emacs 25.3.1, gnu/linux The ...
0
votes
1answer
144 views

Magit pushing through tramp does not work

Hi guys I'm on a osx machine and I want to push commits from a remote machine through tramp to github. I open the directory in dired on the remote machine which works fine and type M-x magit status ...
2
votes
1answer
84 views

make magit check uncommited changes when opening a file

Sometimes I am interrupted while coding and forget to commit. I would like to be warned about this next time I open a file with uncommited changes. I tried (defun my/magit-check-file-and-popup (file)...
0
votes
1answer
199 views

How to move master to branch in magit?

This is how I move master to branchX in git: $ git checkout master #move HEAD to master $ git branch -f branchX HEAD #move by force, HEAD to branchX Is there a way to do that in Magit?...
0
votes
1answer
157 views

How to view remote URLs on magit?

I would like to make sure I know where I am fetching, pulling, and pushing to. How to view remote URLs in magit? From the magit manual "7.1.1 The Remote Popup" on https://magit.vc/manual/magit/The-...
0
votes
2answers
871 views

How to setup upstream remote using Magit?

I am reading through the magit manual trying to figure out how to configure remote variables. From the magit manual "7.1.1 The Remote Popup" on https://magit.vc/manual/magit/The-Remote-Popup.html : ...
5
votes
2answers
338 views

Merge specific files with magit

Is there a way to merge single files in magit like you would do from this question or something equivalent. Namely: $ git checkout source_branch -- <paths>...
2
votes
1answer
237 views

Always show expanded Magit sections by default

Sometimes the sections such as "Recent commits", will be closed by default. Can I set it so they are all always open by default? But before I made the commit, recent commits was opened. After the ...
3
votes
1answer
240 views

magit: display the commit log around the commit I'm interested in

How can I jump to the commit log around the commit I'm interested in? I use magit-blame a lot while reading the history of a project. While doing that, I RET to see the commit that changed the line ...
2
votes
2answers
2k views

How can I do a git diff on the current file?

I'd like to do a diff on the current file / buffer compared to the git repository. Ideally a single function that could be called, or binded to a keyboard shortcut.
6
votes
1answer
168 views

Use `git add -N` in magit

Wondering if it's possible to indicate intent to add a file via magit. The intension would be to stage parts of an untracked file for a commit but leave the rest rather than the default git add ...