Skip to contentSkip to conversation

git.el: Make it easy to add unmerged files

PATCH New Martin Nordholts 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore

Martin Nordholts

author
#0 lore raw

PATCH 1/1 git.el: Make it easy to add unmerged files

It is nice and easy to git-add ignored and unknown files in a git-status buffer. Make it equally easy to add unmerged files which is a common use case.

Signed-off-by Martin Nordholts <[email protected]>
---
 contrib/emacs/git.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
contrib/emacs/git.el +1 -1
index 8c70ad8..3af5d00 100644
@@ -1046,7 +1046,7 @@ The FILES list must be sorted."
 (defun git-add-file ()
   "Add marked file(s) to the index cache."
   (interactive)
-  (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored))))
+  (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored 'unmerged))))
     ;; FIXME: add support for directories
     (unless files
       (push (file-relative-name (read-file-name "File to add: " nil

nil t)) files))

Signature · 1 line
1.6.2.5