Questions tagged [magit]

is an Emacs extension for the Git version control system.

15 questions with no upvoted or accepted answers
Filter by
Sorted by
Tagged with
2
votes
0answers
30 views

Is it possible to apply `smerge-keep-mine` for all the conflicts by using a single keybinding?

I am using smerge to resolve conflicts in order to apply merge. I am applying one by one for smerge-keep-mine to all conflicts, which I belive equivalent for git merge --strategy-option ours [Q] Is it ...
1
vote
1answer
47 views

Can magit stage a hunk / selected lines in 'diff-mode'?

Is it possible to stage the current hunk or selected lines of the hunk in diff-mode? For example, when in diff-mode, what command can I run to stage the current hunk?
1
vote
1answer
40 views

Magit configuration file location on Mac

I want to reset Magit defults for particular pop up that was previously saved using magit-popup-save-default-arguments (https://magit.vc/manual/magit-popup.html). Where is the file created by magit-...
0
votes
1answer
100 views

Deleteing remote branches

I want to delete a remote branch. How can I do git push origin --delete my-branch in magit, to delete a remote branch?
0
votes
0answers
29 views

Magit continues despite pre-commit hook failing

I have a pre-commit hook in git that returns nonzero on some "fatal" QA checks. When using git commit on the command line, git bails out. However, when trying the very same commit in Magit, ...
0
votes
1answer
29 views

How to apply a hunk of changes in diff to current branch?

I have two branches, let's say branch a and b, I would like to apply some changes from b to a. Note that I use magit-diff to show the differences between the two branches. Then I would like to apply ...
0
votes
1answer
33 views

Magit: cannot commit error, unsure why

I am getting the error below and I have no clue what could be causing this. Any help is greatly appreciated: 1 git --no-pager --literal-pathspecs -c core.preloadindex\=true -c log.showSignature\=...
0
votes
0answers
15 views

Force magit to ask for confirmation before deleting a branch

I would like to have magit ask for confirmation when I've told it to delete a particular branch. Currently it seems that magit considers the selection of a branch to delete to be the confirmation, as ...
0
votes
0answers
34 views

Magit git commit isn't working on spacemacs

After installing Magit in spacemacs. I used Helm to create a git repository. I added some files to stage then tried to commit. Let me know if I'm doing something wrong or it's just an issue. I get: ...
0
votes
0answers
28 views

magit, understand magit-blame

When I enter magit-blame it shows the following lines. jihae 2020-04-07 14:51 불필요한 파일 삭제, yarn 빠진 부분 추가, public path Eugene Kim 2020-06-04 17:50 config process.env.__DEV__ = ...
0
votes
0answers
113 views

Syntax highlighting for comments in Magit commit buffers with custom core.commentChar

I frequently source the body of my GitHub PRs from my commits, and thus is makes sense to consider my commits to be made in Markdown (it is nice to have a markup language for commits anyway). Thus I ...
0
votes
1answer
39 views

Magit remove local branches that were merged into another branch

Explaining the problem more in-depth than the titular definition: Often I merge branches into master and want to prune based on that. M-p works fantastic for removing the remote branches (eg origin/...
0
votes
1answer
52 views

Error in newly installed magit -head branch header wrong type argument

I just installed the magit package in emacs 26.3 (using CentOS 7 OS). When I start it with M-x magit, I get the error below. It works fine for me in an older installation, and the only difference I ...
0
votes
0answers
48 views

Unable to create a new commit using Magit on Windows

trying to commit using "M-x magit-status" followed by "c c", keep getting the following: 1 git.exe … "commit" "--" Aborting commit due to empty commit message. sh -c 'printf WITH-EDITOR:: $$: No such ...
0
votes
1answer
74 views

Ignoring specific remotes when running `magit-log-popup` to log all branches

I would like to add an option in magit-log-popup to ignore a list of remotes when using "Log all branches" (l b). What I'm trying to do is something like this git log HEAD --branches --remotes --not -...