Questions tagged [git]
is for Emacs support of Git, the distributed version control system. Emacs `version-control` feature supports many systems besides Git. Additional extensions, such as `Magit`, also provide extensive Git support. Therefore use additional tags besides `git` for Git related questions.
220
questions
11
votes
1answer
301 views
How can I make 'git diff' aware of Emacs Lisp functions?
When diffing with Git, for most languages, it provides a function name in the chunk header, allowing to get a better grasp on the context, e.g.,
@@ -7,5 +7,6 @@ int main() {
if(condition()) {
...
2
votes
0answers
22 views
How do I jump to the previous/next modification (relative to the git HEAD) in the current file?
How do I jump to the previous/next modification (relative to the git HEAD) in the current file?
Ideally, I like sth like swiper that lets me choose to easily jump between modifications.
0
votes
0answers
29 views
Automating git rebase and solve conflict
I have a script can solve some conflict on certain file.
How can I automate the work flow to do the following?
Run git rebase
If has conflict, run script try to solve it.
Then run git rebase --...
2
votes
0answers
38 views
Switch README from Markdown to Org, having problem with image rendering
I have a repository on Gitlab, I'm trying to change my README from Markdown to Org, I'm fully able to make the changes, but for reasons the the images are having some sizing issues, they expand ...
0
votes
0answers
13 views
'(auto-revert-tail-mode t t) - duplicate content of buffer in git folder
Linux Mint 20
Emacs 27.2
In my init.el I has:
'(auto-revert-tail-mode t t)
And as result when I open file that in git repository (in folder with .git folder) then content of file is duplicate.
When ...
0
votes
0answers
26 views
Remove stale buffers after switching to a different branch
This is the scenario:
Switch to a new git branch
Open some "new files" in that branch
Switch back to an older branch that doesn't have these "new files"
I want these opened ...
1
vote
1answer
60 views
magit equivalent to `git push -u origin newLocalBranch`
I often create new branches locally (e.g., newLocalBranch), and then push them to the upstream remote origin, thus creating a new remote branch, using git push -u origin newLocalBranch. Is there a ...
3
votes
1answer
55 views
Magit status section with recent checkouts / visited branches?
In the same fashion magit can offer the list of recent commits in a section of status buffer. I'd like to have a list of recent checkout/visited branches to be able to quickly switch to it (M-xbb).
...
0
votes
0answers
37 views
How to take line from recent commit with Magit
Use Magit to view the log with show diffs (-p).
Inspect 4 commit old commit.
Navigate to a few lines I've since deleted, but want back my project.
I can mark the lines but cannot copy them, which ...
0
votes
0answers
19 views
Smerge: clearer refine mode?
I'm using doom+magit to deal with git, and I have smerge configured to change in-file conflicts. When I enable the smerge refine mode to highligh changes on a per-word basis, I find that refines works ...
0
votes
0answers
19 views
Smerge: auto-resolve LaTeX-like git conflicts
I'm using doom emacs + magit, and it enables smerge for me to display nicely my conflicts. I just saw that smerge has a function smerge-resolve to automatically resolve conflicts. I'd like to use it ...
0
votes
0answers
33 views
How to git stage a just-tangled file in `org-babel-post-tangle-hook`
I want to create a org-babel-post-tangle-hook that does a git stage buffer-file-name. There is a boring technical issue I have, which is that I don't know how to call magit-stage-file from elisp so ...
0
votes
1answer
33 views
Pull from git before applying org-capture?
I'm using org-capture to take project-specific notes by having a notes file in each of several git repositories. Looking forward, however, I can see danger here: if I'm working on project (1) and I ...
0
votes
1answer
38 views
Magit: rebase and push, basic questions
I was learning magit and found this screenshot at Command to visit Github pull request of current branch with Magit:
I was wondering why we have Rebase and Push (and not just Push) at the top. What ...
1
vote
1answer
208 views
What means Unmerged into origin/master in magit?
In the magit buffer I see Unmerged into origin/master, yet I'm not noticing see any issues while merging with magit or with git on the commandline.
Searching for the the subject brought me here[0], ...
0
votes
1answer
53 views
Why magit use rectangle on origin/master and not only on master?
I have done a branch checkout on master but magit rectangle is on origin/master and not only on master.
0
votes
0answers
112 views
emacs27 : Depends: emacs27-common but it is not going to be installed
I has Emacs 25.3
emacs -version
GNU Emacs 25.3.2
Copyright (C) 2017 Free Software Foundation, Inc.
GNU Emacs comes with ABSOLUTELY NO WARRANTY.
You may redistribute copies of GNU Emacs
under the terms ...
1
vote
0answers
24 views
Ignore file- and directory-variables when using “emacs -Q”?
I am using emacs -Q as editor for git, because my startup is too heavy for "quick editing" use and using emacsclient will hang when git is invoked with M-x shell-command. However, as a ...
0
votes
1answer
44 views
Can Emacs be set to auto-stage (preferably with --intent-to-add) new files?
I often add a new file to a repo, make some other changes, then stage all, and commit all, forgetting that the new file is not yet tracked, so is not included in the stage all step. At least one ...
0
votes
0answers
35 views
Open git commit -v in diff-mode [duplicate]
How can I tell emacs to open COMMIT_EDITMSG in diff-mode by default? Specifically when issuing git commit -v, but the solution can be for all commit options.
0
votes
1answer
43 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
0answers
18 views
vc-annotate: strip the last character of git commit id
When editing a file managed by Git, vc-annotate shows the output of git blame. As Git usually does, revisions are identified by a short commit id.
The short commit id is abbreviated to be one ...
asked Nov 15 '20 at 22:28
Gilles 'SO- stop being evil'
18k4 gold badges46 silver badges82 bronze badges
0
votes
1answer
14 views
Lags when navigating vc-root-diff buffer
When I move around the buffer *vc-diff* from vc-root-diff I experience lags.
GNU Emacs 27.1 (build 1, x86_64-pc-cygwin) of 2020-10-29.
With procmon I detected lots of:
C:\opt\cygwin64\bin\git.exe --no-...
0
votes
1answer
94 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
1answer
56 views
Git commit multiple files
When I go to commit my changes VC seems only allows me to commit one file at a time via C-x v v. Is there a way for VC to commit more than 1 file at a time?
0
votes
1answer
132 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
44 views
Git Repo for Doom Config With Different Platforms
I have emacs on two separate platforms, and I would like it to function in much the same way on both, but there is some platform-dependent configuration as well. I have created a git repository in my ....
1
vote
0answers
94 views
Cannot figure out why vc-git.elc is always loaded on startup
This is more a curiosity, than a necessity.
I'm playing around with startup times, and to have something to compare with, I wanted to see how fast emacs could start up pure.
Running emacs -Q, emacs-...
2
votes
1answer
172 views
Cannot edit “.gitignore” due to strange errors and read-only switched on
A new error has occurred with a recent upgrade to Emacs 27.1. I'm trying to edit .gitignore and get the following error:
*ERROR*: Unlocking file: Invalid argument, <directory>/.gitignore
To ...
0
votes
0answers
21 views
(Version-Control) Branch Agnostic Undo
Has anybody tried implementing (VC) branch specific undo's? It would have to be agnostic to changes both inside Emacs and from the outside when Emacs is running using file-notify-.*.
One solution ...
2
votes
2answers
85 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
0answers
12 views
How I can see difference between working file and index with vc-diff and vc-ediff command with vc-git?
vc-diff and vc-ediff seem to show changes between working file and HEAD. I would like to see difference between working file and index instead.
How can I do that?
0
votes
1answer
57 views
Cannot paste text copied from Emacs to synchronous subprocess
TL;DR
When trying to paste text copied/killed in Emacs to another program while Emacs is waiting for a synchronous subprocess to finish, the target program hangs until Emacs becomes responsive again.
...
0
votes
1answer
48 views
Magit Move Submodule
In git bash I can use git mv home/subdir_1/my_submod home/subdir_2/my_submod to move a submodule between directories. Git handles changing .gitmodules and stages the change to be committed.
Is there a ...
0
votes
2answers
85 views
magit status and git lfs files diff shows pointer diff
When I call magit-status git lfs files are shown as follows.
modified src/myfile
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:...
0
votes
1answer
85 views
Is it possible to force `markdown-mode` during git commit?
I was using following answer: https://emacs.stackexchange.com/a/57535/18414 to set markdown on the .git/COMMIT_EDITMSG file.
(add-to-list 'auto-mode-alist
'("/\\.git/COMMIT_EDITMSG\\'...
0
votes
1answer
47 views
How to stage selected lines / hunks in diff-mode?
Is it possible to stage changes in diff-mode? Or is this only possible with magit+ediff?
1
vote
1answer
40 views
While merging, how to tell Magit to use one version of the file?
When I merge something and there are conflicts, I can go to the file in the magit status page (SPC-g-s) and press, for example, e to start ediff. Within that, I can scroll through all conflicts and ...
0
votes
2answers
69 views
How do I modify magits behavior to use the date that I finalize the commit and not the date that I start the commit
Desired Solution: I want magit to make a commit with a datetime set to the time that I "create" the commit, not the time that I start the commit "creation" flow.
Background:
So committing in magit ...
2
votes
1answer
108 views
How do I associate a file such as git's `COMMIT_EDITMSG` with a specific mode?
I was doing following solution for markdown files: How do I associate a file extension with a specific mode?
(autoload 'markdown-mode "markdown-mode.el"
"Major mode for editing Markdown files" t)
...
2
votes
2answers
75 views
How to develop a package I also have installed?
When developing a package which is also installed via an online repository, there is a practical problem.
/source/my-emacs-package
git repository where I have my code.
~/.config/emacs/elpa/my-emacs-...
2
votes
1answer
227 views
Error when loading new version of org mode
I upgraded Org-mode to the latest version on the master branch (according to How to install latest version of org mode?) and now I get this error every few seconds:
Error running timer ‘org-indent-...
3
votes
1answer
132 views
How to activate diff-mode from command line?
Git's editor config is set to launch emacs in no-window mode and to execute lisp function diff-mode:
git config --global core.editor "emacs -nw -f diff-mode"
However, when I execute git commit -v to ...
3
votes
1answer
1k views
How to install latest version of org mode?
I want to update to the latest version of Org-mode to test a bug fix. I followed the instructions:
cd ~/src/
git clone https://code.orgmode.org/bzg/org-mode.git
cd org-mode/
make autoloads
Then I ...
1
vote
1answer
119 views
Git Texinfo indices missing
I have installed the official Git documentation in Texinfo format on my computer and for Emacs. But when I try to search for something with I in the info buffer (C-h-i d m git) it reports no indices. ...
0
votes
2answers
221 views
How to match the nondirectory part of a filename with a regular expression?
Whats the correct way to match a filename from a full path using string-match-p.
Say I want to check if the file is a git commit message COMMIT_EDITMSG or svn-commit.tmp or svn-commit.3.tmp to pass ...
1
vote
1answer
239 views
How to search certain subdirectories of directories that are ignored by Git
I'm working in a Scala project that has target/ directories entered as ignored in the .gitignore. However, there is also Scala code being generated during the build which is being nested under a ...
4
votes
1answer
84 views
Magit: Howto create a new commit ignoring white-space differences
I'm using magit 20191128.39 on Emacs 26.3
When changing a python script resulting in a new unstaged change, git/magit should ignore whitespace-differences. A git diff -w will do the trick, but I'd ...
0
votes
1answer
83 views
How to abort an ediff merge?
I use ediff to merge mercurial conflicts (and sometimes git conflicts), but I can't seem to abort. Ediff pops up as soon as a conflict is detected, and quitting and not saving results in mercurial ...
0
votes
1answer
84 views
el-get Basic Setup (https://github.com/dimitri/el-get) : error: Unable to find 'git'
Start Emacs from gitbash (MINGW64)
Snippet below is loaded automatically:
; add el-get to the load path, and install it if it doesn't exist
(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
(...
