Junio C Hamano 8775279891 Merge branch 'jn/mergetool-hideresolved-is-optional' ... Disable the recent mergetool's hideresolved feature by default for backward compatibility and safety. * jn/mergetool-hideresolved-is-optional: doc: describe mergetool configuration in git-mergetool(1) mergetool: do not enable hideResolved by default		2021-03-14 16:01:41 -07:00
..
add.txt
advice.txt
alias.txt
am.txt
apply.txt
blame.txt
branch.txt
browser.txt
checkout.txt
clean.txt
clone.txt
color.txt
column.txt
commit.txt
commitgraph.txt
completion.txt
core.txt	Merge branch 'ew/decline-core-abbrev'	2021-01-15 15:20:28 -08:00
credential.txt
diff.txt	diff: do not show submodule with untracked files as "-dirty"	2020-12-08 14:27:35 -08:00
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
grep.txt
gui.txt
guitool.txt
help.txt	help.c: help.autocorrect=never means "do not compute suggestions"	2020-11-25 13:02:15 -08:00
http.txt	doc: fix some typos	2021-01-04 11:27:48 -08:00
i18n.txt
imap.txt
index.txt
init.txt	clone: respect remote unborn HEAD	2021-02-05 13:49:55 -08:00
instaweb.txt
interactive.txt
log.txt
lsrefs.txt	ls-refs: report unborn targets of symrefs	2021-02-05 13:49:53 -08:00
mailinfo.txt
mailmap.txt
maintenance.txt	maintenance: incremental strategy runs pack-refs weekly	2021-02-09 23:09:29 -08:00
man.txt
merge.txt
mergetool.txt	mergetool: do not enable hideResolved by default	2021-03-13 15:30:29 -08:00
notes.txt
pack.txt	Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'	2021-01-25 18:32:44 -08:00
pager.txt
pretty.txt
protocol.txt
pull.txt
push.txt
rebase.txt	rebase: add a config option for --no-fork-point	2021-02-24 11:49:10 -08:00
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	doc: fix some typos	2021-01-04 11:27:48 -08:00
transfer.txt
uploadarchive.txt
uploadpack.txt
url.txt
user.txt
versionsort.txt
web.txt
worktree.txt