1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 20:26:08 +02:00
git/Documentation/config
Rubén Justo bec9bb4b39 branch: make the advice to force-deleting a conditional one
The error message we show when the user tries to delete a not fully
merged branch describes the error and gives a hint to the user:

	error: the branch 'foo' is not fully merged.
	If you are sure you want to delete it, run 'git branch -D foo'.

Let's move the hint part so that it is displayed using the advice
machinery:

	error: the branch 'foo' is not fully merged
	hint: If you are sure you want to delete it, run 'git branch -D foo'
	hint: Disable this message with "git config advice.forceDeleteBranch false"

Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-01-11 17:15:54 -08:00
..
add.txt add: remove "add.interactive.useBuiltin" & Perl "git add--interactive" 2023-02-06 15:03:34 -08:00
advice.txt branch: make the advice to force-deleting a conditional one 2024-01-11 17:15:54 -08:00
alias.txt documentation: fix subject/verb agreement 2023-10-09 12:06:29 -07:00
am.txt
apply.txt documentation: whitespace is already generally plural 2023-10-09 12:06:29 -07:00
attr.txt attr: add attr.tree for setting the treeish to read attributes from 2023-10-13 11:43:29 -07:00
blame.txt blame: correct name of config option in docs 2021-06-28 10:05:13 -07:00
branch.txt documentation: use clearer prepositions 2023-10-09 12:06:29 -07:00
browser.txt
bundle.txt bundle-uri: parse bundle.heuristic=creationToken 2023-01-31 08:57:48 -08:00
checkout.txt documentation: fix capitalization 2023-10-09 12:06:29 -07:00
clean.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
clone.txt documentation: fix verb tense 2023-10-09 12:06:29 -07:00
color.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
column.txt documentation: fix singular vs. plural 2023-10-09 12:06:29 -07:00
commit.txt documentation: add missing article 2023-10-09 12:06:29 -07:00
commitgraph.txt commit-graph: use config to specify generation type 2021-02-25 15:10:41 -08:00
completion.txt
core.txt add core.maxTreeDepth config 2023-08-31 15:51:07 -07:00
credential.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
diff.txt documentation: fix singular vs. plural 2023-10-09 12:06:29 -07:00
difftool.txt mergetool: new config guiDefault supports auto-toggling gui by DISPLAY 2023-04-05 21:03:29 -07:00
extensions.txt Documentation: add extensions.worktreeConfig details 2022-02-08 09:49:20 -08:00
fastimport.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
feature.txt pack-bitmap.c: use commit boundary during bitmap traversal 2023-05-08 12:05:55 -07:00
fetch.txt documentation: fix singular vs. plural 2023-10-09 12:06:29 -07:00
filter.txt
fmt-merge-msg.txt config/fmt-merge-msg.txt: drop space in quote 2020-09-27 14:22:41 -07:00
format.txt Merge branch 'jc/doc-misspelt-refs-fix' 2023-12-27 14:52:26 -08:00
fsck.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
fsmonitor--daemon.txt documentation: wording improvements 2023-10-09 12:04:21 -07:00
gc.txt Merge branch 'en/docfixes' 2023-10-23 13:56:37 -07:00
gitcvs.txt
gitweb.txt
gpg.txt documentation: fix subject/verb agreement 2023-10-09 12:06:29 -07:00
grep.txt grep docs: de-duplicate configuration sections 2022-09-07 09:46:05 -07:00
gui.txt documentation: add missing article 2023-10-09 12:06:29 -07:00
guitool.txt
help.txt help.c: help.autocorrect=prompt waits for user action 2021-08-14 11:20:49 -07:00
http.txt documentation: add missing words 2023-10-09 12:06:29 -07:00
i18n.txt documentation: use clearer prepositions 2023-10-09 12:06:29 -07:00
imap.txt documentation: fix verb vs. noun 2023-10-09 12:06:29 -07:00
includeif.txt config.txt: document include, includeIf 2022-07-17 14:23:42 -07:00
index.txt documentation: fix apostrophe usage 2023-10-09 12:06:29 -07:00
init.txt clone: respect remote unborn HEAD 2021-02-05 13:49:55 -08:00
instaweb.txt
interactive.txt
log.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
lsrefs.txt docs: move protocol-related docs to man section 5 2022-08-04 14:12:23 -07:00
mailinfo.txt documentation: fix singular vs. plural 2023-10-09 12:06:29 -07:00
mailmap.txt
maintenance.txt documentation: fix subject/verb agreement 2023-10-09 12:06:29 -07:00
man.txt documentation: add missing article 2023-10-09 12:06:29 -07:00
merge.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
mergetool.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
notes.txt documentation: add missing article 2023-10-09 12:06:29 -07:00
pack.txt documentation: add missing hyphens 2023-10-09 12:06:29 -07:00
pager.txt
pretty.txt
protocol.txt Sync with 2.37.4 2022-10-06 20:00:04 -04:00
pull.txt pull: remove support for `--rebase=preserve` 2021-09-07 21:45:32 -07:00
push.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
rebase.txt rebase: fully ignore rebase.autoSquash without -i 2023-11-16 09:18:21 +09:00
receive.txt documentation: employ consistent verb tense for a list 2023-10-09 12:06:29 -07:00
remote.txt docs: mention --refetch fetch option 2022-03-28 10:25:53 -07:00
remotes.txt
repack.txt builtin/repack.c: allow configuring cruft pack generation 2022-05-26 15:48:26 -07:00
rerere.txt documentation: fix singular vs. plural 2023-10-09 12:06:29 -07:00
revert.txt revert: config documentation fixes 2022-06-27 08:37:36 -07:00
safe.txt documentation: wording improvements 2023-10-09 12:04:21 -07:00
sendemail.txt documentation: add missing article 2023-10-09 12:06:29 -07:00
sequencer.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
showbranch.txt
sparse.txt repo_read_index: add config to expect files outside sparse patterns 2022-03-01 23:37:48 -08:00
splitindex.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
ssh.txt
stash.txt documentation: add missing article 2023-10-09 12:06:29 -07:00
status.txt documentation: add missing hyphens 2023-10-09 12:06:29 -07:00
submodule.txt documentation: fix apostrophe usage 2023-10-09 12:06:29 -07:00
tag.txt separate tar.* config to its own source file 2020-03-18 12:42:09 -07:00
tar.txt separate tar.* config to its own source file 2020-03-18 12:42:09 -07:00
trace2.txt documentation: wording improvements 2023-10-09 12:04:21 -07:00
transfer.txt Merge branch 'sn/typo-grammo-phraso-fixes' 2023-10-30 07:09:55 +09:00
uploadarchive.txt
uploadpack.txt Documentation: define protected configuration 2022-07-14 15:08:29 -07:00
url.txt
user.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
versionsort.txt documentation: add some commas where they are helpful 2023-10-09 12:06:44 -07:00
web.txt
worktree.txt