From: Matthieu Moy Date: Tue, 04 Dec 2012 09:17:03 GMT Subject: Re: [PATCH] status: respect advice.statusHints for ahead/behind advice Message-ID: In-Reply-To: <7vr4n7rrgb.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > So let's do a lot simpler patch instead. > > -- >8 -- > From: Jeff King > Date: Mon, 3 Dec 2012 01:16:57 -0500 > > If the user has unset advice.statusHints, we already > suppress the "use git reset to..." hints in each stanza. The > new "use git push to publish..." hint is the same type of > hint. Let's respect statusHints for it, rather than making > the user set yet another advice flag. You may want to squash this on top: -- >8 -- >From 87a438bd06dd689bd37949e762690ab5dbfc5ff8 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Tue, 4 Dec 2012 10:15:03 +0100 Subject: [PATCH] document that statusHints affects git checkout --- Documentation/config.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index e70216d..bf8f911 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -160,9 +160,10 @@ advice.*:: it resulted in a non-fast-forward error. statusHints:: Show directions on how to proceed from the current - state in the output of linkgit:git-status[1] and in + state in the output of linkgit:git-status[1], in the template shown when writing commit messages in - linkgit:git-commit[1]. + linkgit:git-commit[1], and in the help message shown + by linkgit:git-checkout[1] when switching branch. commitBeforeMerge:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. -- 1.8.0.319.g8abfee4 -- Matthieu Moy http://www-verimag.imag.fr/~moy/