summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2007-09-13 09:50:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-14 05:37:54 (GMT)
commit568d2cde9b9fe0fc6b3202c7987b13289cb1a4a0 (patch)
treed02d46c1e309f7a0ccaad5ed43668efaa2bbc029 /contrib/emacs
parent98acc3fabc2d197525f1b0119382a00a664014b7 (diff)
downloadgit-568d2cde9b9fe0fc6b3202c7987b13289cb1a4a0.zip
git-568d2cde9b9fe0fc6b3202c7987b13289cb1a4a0.tar.gz
git-568d2cde9b9fe0fc6b3202c7987b13289cb1a4a0.tar.bz2
git.el: Allow the add and remove commands to be applied to ignored files.
Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/emacs')
-rw-r--r--contrib/emacs/git.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index d1068c6..2d77fd4 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -902,7 +902,7 @@ Return the list of files that haven't been handled."
(defun git-add-file ()
"Add marked file(s) to the index cache."
(interactive)
- (let ((files (git-get-filenames (git-marked-files-state 'unknown))))
+ (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored))))
(unless files
(push (file-relative-name (read-file-name "File to add: " nil nil t)) files))
(apply #'git-run-command nil nil "update-index" "--add" "--" files)
@@ -920,7 +920,7 @@ Return the list of files that haven't been handled."
(defun git-remove-file ()
"Remove the marked file(s)."
(interactive)
- (let ((files (git-get-filenames (git-marked-files-state 'added 'modified 'unknown 'uptodate))))
+ (let ((files (git-get-filenames (git-marked-files-state 'added 'modified 'unknown 'uptodate 'ignored))))
(unless files
(push (file-relative-name (read-file-name "File to remove: " nil nil t)) files))
(if (yes-or-no-p