Questions tagged [magit]

Magit is an Emacs mode for interacting with Git.

Magit is an interface to the version control system Git, implemented as an Emacs extension.

Unlike the Version Control package which is part of Emacs and strives to provide a unified interface to various version control systems, Magit only supports Git and can therefore better take advantage of its native features.

With Magit, you can inspect and modify your Git repositories with Emacs. You can review and commit the changes you have made to the tracked files, for example, and you can browse the history of past changes. There is support for cherry picking, reverting, merging, rebasing, and other common Git operations.

Magit's maintainer prefers if questions are asked on the dedicated Emacs Stackexchange site instead of here.

168 questions
0
votes
1 answer

How do I tell to flyspell to ignore comment lines on git-commit-mode?

I usually change dictionaries when writing a git commit, however since I have a mapping to to change dictionary and run (flyspell-buffer) right after I see that flyspell goes beyond the commit message to check also comment lines starting with #. How…
zzantares
  • 341
  • 3
  • 12
0
votes
1 answer

show HEAD in magit log

I would like to know if there is a way to alter the way Magit highlight the current checked out branch on the magit-log. git log --decorate will show the HEAD at the checked out commit and Magit show an @ when checking out a commit (with no branch),…
Lorenzo Trojan
  • 117
  • 1
  • 9
0
votes
1 answer

magit-version in Emacs 24.4 on Windows returns Wrong argument type: stringp, nill

This works fine on the Mac, but when trying to set it up on Windows it didn't work. I have msysGit Bash already on the windows path and tried setting as per other instructions. (setq explicit-shell-file-name "bash") (setq shell-file-name…
Bae
  • 7,516
  • 5
  • 36
  • 42
0
votes
0 answers

Emacs crashing when opening ediff merge window with Magit

After a merge generating conflicts, I open the status window with M-x magit-status which displays, e.g. Unstaged changes: Unmerged .gitignore (Also a pesky warning-window opens "Warning (el-get): Your Emacs doesn't support HTTPS…
Metropolis
  • 2,018
  • 1
  • 19
  • 36
0
votes
3 answers

emacs daemon and magit

I've been trying out emacs as a server, and have run into a problem with magit. We have a Gitlab server at work, and when I try to use magit for a push or a pull, I'm challenged for a password. This doesn't happen when I use git from the command…
user888379
  • 1,343
  • 12
  • 30
0
votes
0 answers

Going back in time with Git (Magit, Emacs)

Git status: Local: master ~/Dropbox/MyProject/ Remote: master @ origin (https://github.com/.../MyProject.git) Head: fe73b07 updated gitignore Pending commits: * updated gitignore * test * trying to go with a flat structure * *…
PascalVKooten
  • 20,643
  • 17
  • 103
  • 160
0
votes
3 answers

Accidental commit; how to not push an unpushed commit in Magit Emacs

I did an accidental commit which really makes no sense to have anywhere in history. How can I remove this commit from existence (especially I don't want it appear remotely). In the magit-status, it shows: Unpushed commits: fe73b07 updated…
PascalVKooten
  • 20,643
  • 17
  • 103
  • 160
0
votes
2 answers

Pick what to keep from old/new file (merge) in Git/Emacs/Magit

I've looked the introductory video, but I do not really find clear instructions on how it is possible to easily cherrypick between an old/new version of a file in magit. What I'm trying to say is that in e.g. eclipse (which I don't like it all,…
PascalVKooten
  • 20,643
  • 17
  • 103
  • 160
0
votes
1 answer

how to provide prefix arg in magit while doing a pull

I am trying to do a git pull --rebase from magit following these steps: C-x g (bound to magit-status) F (opens the submenu for pulling) The menu tells me that I can use the -r switch to do a rebase, so I do: C-u -r But the above doesn't seem to…
murtaza52
  • 46,887
  • 28
  • 84
  • 120
0
votes
1 answer

Remove tag in magit

I would like to remove a tag from a previous commit and I cannot find a way to do this in magit (I am using emacs24). I realize that I could probably use ":" and then enter the git command but I was wondering whether there might be a magit-specific…
roschu
  • 766
  • 1
  • 8
  • 17
0
votes
1 answer

Bytecode format changed for function signatures?

(defun magit-max-args-internal (function) "Return the maximum number of arguments accepted by FUNCTION." (if (symbolp function) (setq function (symbol-function function))) (if (subrp function) (let ((max (cdr (subr-arity…
user797257
0
votes
1 answer

Modifying a custom defun to not conflict with Magit

I use the following smart-tab defun in my .emacs for either completion on a word or just to do a standard tab: (global-set-key [(tab)] 'smart-tab) (defun smart-tab () "This smart tab is minibuffer compliant: it acts as usual in the minibuffer.…
mwilliams
  • 9,946
  • 13
  • 50
  • 71
0
votes
2 answers

Efficiently dropping current changes already saved

I'm beginning with Git and Magit so I don't know to which one my question is specific. Sometimes I save changes to a file but then don't want to commit them: I simply want to go back to the last commit. I'm trying to do this from Emacs / Magit and…
Cedric Martin
  • 5,945
  • 4
  • 34
  • 66
0
votes
1 answer

How can I search through the unstaged changes within magit?

While working on my code, I decided I needed to change the name of a function. After making all the needed changes, I wanted to commit just just those naming changes and then continue working on what I was previously working on. Using magit, I was…
0
votes
1 answer

Scripting magit timing problems

C-x v = vc-diff is good. However, I can work with the diff directly if the diff was shown in a magit-status buffer. I've tried to do just that here: (defvar le::vc-diff-data nil) (defun le::magit-go-to-change-once () (destructuring-bind (filename…
event_jr
  • 17,467
  • 4
  • 47
  • 62
1 2 3
11
12