Commit f963d552 authored by Eric Prud'hommeaux's avatar Eric Prud'hommeaux Committed by Jonas Bernoulli

magit-commit-{ask-to-stage,assert}: Clarify description

Don't claim that "everything" will be staged since only "all unstaged
changes" (to already tracked files) will actually be staged.
parent f987534e
......@@ -7,7 +7,7 @@
#+TEXINFO_DIR_CATEGORY: Emacs
#+TEXINFO_DIR_TITLE: Magit: (magit).
#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
#+SUBTITLE: for version 2.13.0 (2.13.0-37-g48000cde+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-42-gf987534e+1)
#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
#+TEXINFO_DEFFN: t
......@@ -22,7 +22,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
#+TEXINFO: @noindent
This manual is for Magit version 2.13.0 (2.13.0-37-g48000cde+1).
This manual is for Magit version 2.13.0 (2.13.0-42-gf987534e+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -3858,7 +3858,7 @@ Also see [[man:git-commit]]
- User Option: magit-commit-ask-to-stage
Whether to ask to stage everything when committing and nothing is
Whether to ask to stage all unstaged changes when committing and nothing is
staged.
- User Option: magit-commit-extend-override-date
......
......@@ -30,7 +30,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
@subtitle for version 2.13.0 (2.13.0-37-g48000cde+1)
@subtitle for version 2.13.0 (2.13.0-42-gf987534e+1)
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
......@@ -52,7 +52,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
@noindent
This manual is for Magit version 2.13.0 (2.13.0-37-g48000cde+1).
This manual is for Magit version 2.13.0 (2.13.0-42-gf987534e+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -5258,7 +5258,7 @@ depending on the value of option @code{magit-commit-squash-confirm}.
@defopt magit-commit-ask-to-stage
Whether to ask to stage everything when committing and nothing is
Whether to ask to stage all unstaged changes when committing and nothing is
staged.
@end defopt
......
......@@ -43,7 +43,7 @@
:type '(repeat (string :tag "Argument")))
(defcustom magit-commit-ask-to-stage 'verbose
"Whether to ask to stage everything when committing and nothing is staged."
"Whether to ask to stage all unstaged changes when committing and nothing is staged."
:package-version '(magit . "2.3.0")
:group 'magit-commands
:type '(choice (const :tag "Ask showing diff" verbose)
......@@ -334,7 +334,7 @@ depending on the value of option `magit-commit-squash-confirm'."
(magit-commit-ask-to-stage
(when (eq magit-commit-ask-to-stage 'verbose)
(magit-diff-unstaged))
(prog1 (when (y-or-n-p "Nothing staged. Stage and commit everything? ")
(prog1 (when (y-or-n-p "Nothing staged. Stage and commit all unstaged changes? ")
(magit-run-git "add" "-u" ".")
(or args (list "--")))
(when (and (eq magit-commit-ask-to-stage 'verbose)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment