Junio C Hamano 0669bdf4eb Merge branch 'js/branch-track-inherit' ...

"git -c branch.autosetupmerge=inherit branch new old" makes "new"
to have the same upstream as the "old" branch, instead of marking
"old" itself as its upstream.

* js/branch-track-inherit:
  config: require lowercase for branch.*.autosetupmerge
  branch: add flags and config to inherit tracking
  branch: accept multiple upstream branches for tracking

2022-01-10 11:52:54 -08:00

..

add.txt

…

advice.txt

sequencer: advise if skipping cherry-picked commit

2021-08-30 16:35:36 -07:00

alias.txt

…

am.txt

…

apply.txt

…

blame.txt

blame: correct name of config option in docs

2021-06-28 10:05:13 -07:00

branch.txt

Merge branch 'js/branch-track-inherit'

2022-01-10 11:52:54 -08:00

browser.txt

…

checkout.txt

parallel-checkout: add configuration options

2021-04-19 11:57:05 -07:00

clean.txt

…

clone.txt

builtin/clone.c: add --reject-shallow option

2021-04-01 12:58:58 -07:00

color.txt

Merge branch 'hm/paint-hits-in-log-grep'

2021-11-01 13:48:08 -07:00

column.txt

…

commit.txt

…

commitgraph.txt

…

completion.txt

…

core.txt

…

credential.txt

…

diff.txt

rename: bump limit defaults yet again

2021-07-15 16:54:34 -07:00

difftool.txt

…

extensions.txt

…

fastimport.txt

…

feature.txt

…

fetch.txt

fetch: document the --negotiate-only option

2021-06-30 14:57:22 -07:00

filter.txt

…

fmt-merge-msg.txt

…

format.txt

…

fsck.txt

…

gc.txt

…

gitcvs.txt

…

gitweb.txt

…

gpg.txt

Merge branch 'gh/gpg-doc-markup-fix'

2022-01-05 14:01:30 -08:00

grep.txt

grep: clarify what grep.patternType=default means

2021-12-05 12:26:43 -08:00

gui.txt

docs: use "character encoding" to refer to commit-object encoding

2021-08-27 12:45:45 -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

…

i18n.txt

…

imap.txt

…

index.txt

sparse-index: add index.sparse config option

2021-03-30 12:57:47 -07:00

init.txt

…

instaweb.txt

…

interactive.txt

…

log.txt

diff-merges: introduce log.diffMerges config variable

2021-04-16 23:38:35 -07:00

lsrefs.txt

…

mailinfo.txt

…

mailmap.txt

…

maintenance.txt

…

man.txt

…

merge.txt

update documentation for new zdiff3 conflictStyle

2021-12-01 14:45:59 -08:00

mergetool.txt

mergetool: do not enable hideResolved by default

2021-03-13 15:30:29 -08:00

notes.txt

…

pack.txt

midx.c: respect 'pack.writeBitmapHashcache' when writing bitmaps

2021-09-14 16:34:18 -07:00

pager.txt

…

pretty.txt

…

protocol.txt

…

pull.txt

pull: remove support for --rebase=preserve

2021-09-07 21:45:32 -07:00

push.txt

Merge branch 'fc/push-simple-updates'

2021-07-13 16:52:49 -07:00

rebase.txt

rebase: remove transitory rebase.useBuiltin setting & env

2021-03-23 14:05:58 -07:00

receive.txt

…

remote.txt

…

remotes.txt

…

repack.txt

…

rerere.txt

…

reset.txt

…

sendemail.txt

send-email: remove non-working support for "sendemail.smtpssl"

2021-05-28 18:38:07 +09:00

sequencer.txt

…

showbranch.txt

…

splitindex.txt

…

ssh.txt

…

stash.txt

stash show: use stash.showIncludeUntracked even when diff options given

2021-05-22 17:56:46 +09:00

status.txt

…

submodule.txt

doc: clarify description of 'submodule.recurse'

2021-07-20 14:57:43 -07:00

tag.txt

…

tar.txt

…

trace2.txt

…

transfer.txt

docs: clarify the interaction of transfer.hideRefs and namespaces

2021-09-01 07:54:30 -07:00

uploadarchive.txt

…

uploadpack.txt

list-objects: implement object type filter

2021-04-19 14:09:11 -07:00

url.txt

…

user.txt

ssh signing: support non ssh-* keytypes

2021-11-19 09:05:25 -08:00

versionsort.txt

…

web.txt

…

worktree.txt

…