{"thread":{"id":"20790","subject":"[PATCH] git.el: Make it easy to add unmerged files","startedAt":"2009-08-30T14:35:02Z","lastAt":"2009-08-30T14:35:02Z","messageCount":1,"participants":["Martin Nordholts"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"122116","messageId":"4A9A8E16.9040106@gmail.com","threadId":"20790","inReplyTo":null,"subject":"[PATCH] git.el: Make it easy to add unmerged files","fromName":"Martin Nordholts","fromEmail":"enselic@gmail.com","sentAt":"2009-08-30T14:35:02Z","receivedAt":"2009-08-30T14:35:02Z","isPatch":true,"sender":{"key":"enselic@gmail.com","avatar":"https://gravatar.com/avatar/74df556deac89f8da8c185cdbf811d51d7205eb48770305e84d7c1435755510e?d=mp&s=160"},"body":"It is nice and easy to git-add ignored and unknown files in a\ngit-status buffer. Make it equally easy to add unmerged files which is\na common use case.\n\nSigned-off-by: Martin Nordholts <martinn@src.gnome.org>\n---\n  contrib/emacs/git.el |    2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 8c70ad8..3af5d00 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -1046,7 +1046,7 @@ The FILES list must be sorted.\"\n  (defun git-add-file ()\n    \"Add marked file(s) to the index cache.\"\n    (interactive)\n-  (let ((files (git-get-filenames (git-marked-files-state 'unknown \n'ignored))))\n+  (let ((files (git-get-filenames (git-marked-files-state 'unknown \n'ignored 'unmerged))))\n      ;; FIXME: add support for directories\n      (unless files\n        (push (file-relative-name (read-file-name \"File to add: \" nil \nnil t)) files))\n-- \n1.6.2.5\n"}]}