Junio C Hamano ac16f55697 Merge branch 'pb/advice-merge-conflict' ...

Hints that suggest what to do after resolving conflicts can now be
squelched by disabling advice.mergeConflict.

Acked-by: Phillip Wood <phillip.wood123@gmail.com>
cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>

* pb/advice-merge-conflict:
  builtin/am: allow disabling conflict advice
  sequencer: allow disabling conflict advice

2024-04-01 13:21:34 -07:00

..

add.txt

add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"

2023-02-06 15:03:34 -08:00

advice.txt

sequencer: allow disabling conflict advice

2024-03-18 09:28:40 -07: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

clean: further clean-up of implementation around "--force"

2024-03-04 14:05:13 -08: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

Merge branch 'kh/doc-commentchar-is-a-byte'

2024-03-14 14:05:24 -07:00

credential.txt

documentation: add some commas where they are helpful

2023-10-09 12:06:44 -07:00

diff.txt

diff.*Prefix: use camelCase in the doc and test titles

2024-03-18 08:47:18 -07:00

difftool.txt

mergetool: new config guiDefault supports auto-toggling gui by DISPLAY

2023-04-05 21:03:29 -07:00

extensions.txt

Merge branch 'eb/hash-transition'

2024-03-28 14:13:50 -07:00

fastimport.txt

documentation: add some commas where they are helpful

2023-10-09 12:06:44 -07:00

feature.txt

pack-objects: enable multi-pack reuse via feature.experimental

2024-02-05 15:27:01 -08:00

fetch.txt

fetch: add new config option fetch.all

2024-01-08 13:36:23 -08: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

doc: git-init: rework config item init.templateDir

2024-03-11 09:58:11 -07:00

instaweb.txt

…

interactive.txt

doc: remove outdated information about interactive.singleKey

2024-02-19 15:12:41 -08:00

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

mergetools: vimdiff: use correct tool's name when reading mergetool config

2024-02-19 08:45:14 -08:00

notes.txt

documentation: add missing article

2023-10-09 12:06:29 -07:00

pack.txt

Documentation/config/pack.txt: fix broken AsciiDoc mark-up

2024-02-23 13:47:16 -08: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

Merge branch 'ms/rebase-insnformat-doc-fix'

2024-01-12 16:09:57 -08: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: send-email: use camel case consistently

2024-02-20 14:37:44 -08: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

status: allow --untracked=false and friends

2024-03-13 10:43:32 -07:00

submodule.txt

documentation: fix apostrophe usage

2023-10-09 12:06:29 -07:00

tag.txt

…

tar.txt

…

trace2.txt

documentation: wording improvements

2023-10-09 12:04:21 -07:00

transfer.txt

upload-pack: disallow object-info capability by default

2024-02-28 14:42:01 -08: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

…