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

…

alias.txt

…

am.txt

…

apply.txt

…

blame.txt

…

branch.txt

Merge branch 'js/branch-track-inherit'

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

browser.txt

…

checkout.txt

…

clean.txt

…

clone.txt

…

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

…

difftool.txt

…

extensions.txt

…

fastimport.txt

…

feature.txt

…

fetch.txt

…

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

…

guitool.txt

…

help.txt

…

http.txt

…

i18n.txt

…

imap.txt

…

index.txt

…

init.txt

…

instaweb.txt

…

interactive.txt

…

log.txt

…

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

…

notes.txt

…

pack.txt

…

pager.txt

…

pretty.txt

…

protocol.txt

…

pull.txt

…

push.txt

…

rebase.txt

…

receive.txt

…

remote.txt

…

remotes.txt

…

repack.txt

…

rerere.txt

…

reset.txt

…

sendemail.txt

…

sequencer.txt

…

showbranch.txt

…

splitindex.txt

…

ssh.txt

…

stash.txt

…

status.txt

…

submodule.txt

…

tag.txt

…

tar.txt

…

trace2.txt

…

transfer.txt

…

uploadarchive.txt

…

uploadpack.txt

…

url.txt

…

user.txt

ssh signing: support non ssh-* keytypes

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

versionsort.txt

…

web.txt

…

worktree.txt

…