Lucien Kong 83c750acde wt-status.*: better advices for git status added ...

This patch provides new informative help messages in the display of
'git status' (at the top) during conflicts, rebase, am, bisect or
cherry-pick process.

The new messages are not shown when using options such as -s or
--porcelain. The messages about the current situation of the user are
always displayed but the advices on what the user needs to do in order
to resume a rebase/bisect/am/commit after resolving conflicts can be
hidden by setting advice.statushints to 'false' in the config file.

Thus, information about the updated advice.statushints key are added
in Documentation/config.txt.

Also, the test t7060-wt-status.sh is now working with the new help
messages. Tests about suggestions of "git rm" are also added.

Signed-off-by: Lucien Kong <Lucien.Kong@ensimag.imag.fr>
Signed-off-by: Valentin Duperray <Valentin.Duperray@ensimag.imag.fr>
Signed-off-by: Franck Jonas <Franck.Jonas@ensimag.imag.fr>
Signed-off-by: Thomas Nguy <Thomas.Nguy@ensimag.imag.fr>
Signed-off-by: Huynh Khoi Nguyen Nguyen <Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2012-06-14 10:15:19 -07:00

..

howto

…

pt_BR

…

RelNotes

Git 1.7.11-rc1

2012-06-03 15:56:05 -07:00

technical

Sync with maint

2012-05-14 11:50:20 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

…

blame-options.txt

…

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

…

config.txt

wt-status.*: better advices for git status added

2012-06-14 10:15:19 -07:00

date-formats.txt

…

diff-config.txt

…

diff-format.txt

…

diff-generate-patch.txt

…

diff-options.txt

…

docbook-xsl.css

…

docbook.xsl

…

everyday.txt

…

fetch-options.txt

…

fix-texi.perl

…

git-add.txt

…

git-am.txt

…

git-annotate.txt

…

git-apply.txt

…

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

…

git-blame.txt

…

git-branch.txt

Merge branch 'nd/columns'

2012-05-03 15:13:31 -07:00

git-bundle.txt

…

git-cat-file.txt

…

git-check-attr.txt

…

git-check-ref-format.txt

…

git-checkout-index.txt

…

git-checkout.txt

…

git-cherry-pick.txt

Merge branch 'jk/doc-asciidoc-inline-literal'

2012-05-02 13:51:45 -07:00

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

…

git-clone.txt

…

git-column.txt

…

git-commit-tree.txt

ident: report passwd errors with a more friendly message

2012-05-22 09:08:20 -07:00

git-commit.txt

…

git-config.txt

config doc: remove confusion about relative GIT_DIR from FILES section

2012-05-25 11:22:02 -07:00

git-count-objects.txt

…

git-credential-cache--daemon.txt

…

git-credential-cache.txt

…

git-credential-store.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

…

git-cvsserver.txt

…

git-daemon.txt

…

git-describe.txt

…

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

…

git-difftool.txt

…

git-fast-export.txt

…

git-fast-import.txt

Merge branch 'jk/doc-asciidoc-inline-literal'

2012-05-02 13:51:45 -07:00

git-fetch-pack.txt

…

git-fetch.txt

…

git-filter-branch.txt

…

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

…

git-format-patch.txt

…

git-fsck-objects.txt

…

git-fsck.txt

…

git-gc.txt

…

git-get-tar-commit-id.txt

…

git-grep.txt

Merge branch 'rs/maint-grep-F' into maint

2012-06-01 13:01:41 -07:00

git-gui.txt

…

git-hash-object.txt

…

git-help.txt

…

git-http-backend.txt

…

git-http-fetch.txt

…

git-http-push.txt

…

git-imap-send.txt

…

git-index-pack.txt

index-pack: support multithreaded delta resolving

2012-05-07 15:48:15 -07:00

git-init-db.txt

…

git-init.txt

…

git-instaweb.txt

…

git-log.txt

…

git-lost-found.txt

…

git-ls-files.txt

…

git-ls-remote.txt

…

git-ls-tree.txt

…

git-mailinfo.txt

…

git-mailsplit.txt

…

git-merge-base.txt

…

git-merge-file.txt

…

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

…

git-mergetool--lib.txt

…

git-mergetool.txt

…

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

…

git-p4.txt

Sync with maint

2012-05-07 13:28:34 -07:00

git-pack-objects.txt

…

git-pack-redundant.txt

…

git-pack-refs.txt

…

git-parse-remote.txt

…

git-patch-id.txt

…

git-peek-remote.txt

…

git-prune-packed.txt

…

git-prune.txt

…

git-pull.txt

…

git-push.txt

Merge branch 'jk/doc-asciidoc-inline-literal'

2012-05-02 13:51:45 -07:00

git-quiltimport.txt

…

git-read-tree.txt

…

git-rebase.txt

Merge branch 'jk/doc-asciidoc-inline-literal'

2012-05-02 13:51:45 -07:00

git-receive-pack.txt

…

git-reflog.txt

…

git-relink.txt

…

git-remote-ext.txt

…

git-remote-fd.txt

…

git-remote-helpers.txt

…

git-remote-testgit.txt

…

git-remote.txt

…

git-repack.txt

…

git-replace.txt

…

git-repo-config.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

…

git-rev-list.txt

…

git-rev-parse.txt

Merge branch 'js/rev-parse-doc-fix'

2012-05-23 13:35:19 -07:00

git-revert.txt

…

git-rm.txt

…

git-send-email.txt

…

git-send-pack.txt

…

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

…

git-sh-setup.txt

…

git-shell.txt

…

git-shortlog.txt

…

git-show-branch.txt

…

git-show-index.txt

…

git-show-ref.txt

…

git-show.txt

…

git-stage.txt

…

git-stash.txt

…

git-status.txt

Merge branch 'jk/maint-status-porcelain-z-b' into maint

2012-05-24 17:32:30 -07:00

git-stripspace.txt

…

git-submodule.txt

link to gitmodules page at the beginning of git-submodule documentation

2012-05-14 11:14:07 -07:00

git-svn.txt

git-svn: clarify the referent of dcommit's optional argument

2012-05-17 09:35:18 +00:00

git-symbolic-ref.txt

…

git-tag.txt

…

git-tar-tree.txt

…

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

…

git-update-ref.txt

…

git-update-server-info.txt

…

git-upload-archive.txt

…

git-upload-pack.txt

…

git-var.txt

ident: report passwd errors with a more friendly message

2012-05-22 09:08:20 -07:00

git-verify-pack.txt

…

git-verify-tag.txt

…

git-web--browse.txt

…

git-whatchanged.txt

…

git-write-tree.txt

…

git.txt

Git 1.7.10.4

2012-06-03 15:53:58 -07:00

gitattributes.txt

…

gitcli.txt

…

gitcore-tutorial.txt

Merge branch 'zj/diff-stat-smaller-num-columns'

2012-05-02 13:53:28 -07:00

gitcredentials.txt

…

gitcvs-migration.txt

…

gitdiffcore.txt

…

gitglossary.txt

…

githooks.txt

…

gitignore.txt

…

gitk.txt

…

gitmodules.txt

document submdule.$name.update=none option for gitmodules

2012-05-11 08:39:33 -07:00

gitnamespaces.txt

…

gitrepository-layout.txt

…

gitrevisions.txt

…

gittutorial-2.txt

…

gittutorial.txt

…

gitweb.conf.txt

Merge branch 'jk/doc-asciidoc-inline-literal'

2012-05-02 13:51:45 -07:00

gitweb.txt

…

gitworkflows.txt

…

glossary-content.txt

…

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

…

mailmap.txt

…

Makefile

Merge branch 'jk/doc-asciidoc-inline-literal'

2012-05-02 13:51:45 -07:00

manpage-1.72.xsl

…

manpage-base-url.xsl.in

…

manpage-base.xsl

…

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage-quote-apos.xsl

…

manpage-suppress-sp.xsl

…

merge-config.txt

…

merge-options.txt

…

merge-strategies.txt

…

pretty-formats.txt

…

pretty-options.txt

…

pull-fetch-param.txt

…

rev-list-options.txt

…

revisions.txt

…

sequencer.txt

…

SubmittingPatches

…

urls-remotes.txt

…

urls.txt

…

user-manual.conf

…

user-manual.txt

…