Alex Henrie b6f3da5132 wt-status: don't show divergence advice when committing ... When the user is in the middle of making a commit, they are not yet at the point where they are ready to think about integrating their local branch with the corresponding remote branch or force-pushing over the remote branch. Don't include advice on how to deal with divergent branches in the commit template, to avoid giving the impression that the divergence needs to be dealt with immediately. Similar advice will be printed when it is most relevant, that is, if the user does try to push without first reconciling the two branches. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2023-07-13 09:14:58 -07:00
..
add.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
am.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
annotate.c
apply.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
archive.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
bisect.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
blame.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
branch.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
bugreport.c	editor: move editor-related functions and declarations into common file	2023-04-11 08:52:10 -07:00
bundle.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
cat-file.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
check-attr.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
check-ignore.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
check-mailmap.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
check-ref-format.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
checkout--worker.c	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
checkout-index.c	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
checkout.c	wt-status: don't show divergence advice when committing	2023-07-13 09:14:58 -07:00
clean.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
clone.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
column.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
commit-graph.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
commit-tree.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
commit.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
config.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
count-objects.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
credential-cache--daemon.c	credential: erase all matching credentials	2023-06-15 13:26:41 -07:00
credential-cache.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
credential-store.c	credential: avoid erasing distinct password	2023-06-15 13:26:39 -07:00
credential.c	builtins: mark unused prefix parameters	2023-03-28 14:11:24 -07:00
describe.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
diagnose.c	object-file.h: move declarations for object-file.c functions from cache.h	2023-04-11 08:52:10 -07:00
diff-files.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
diff-index.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
diff-tree.c	log-tree: replace include of revision.h with simple forward declaration	2023-06-21 13:39:53 -07:00
diff.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
difftool.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
fast-export.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
fast-import.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
fetch-pack.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
fetch.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
fmt-merge-msg.c	wrapper.h: move declarations for wrapper.c functions from cache.h	2023-03-21 10:56:53 -07:00
for-each-ref.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
for-each-repo.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
fsck.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
fsmonitor--daemon.c	fsmonitor-ll.h: split this header out of fsmonitor.h	2023-06-21 13:39:54 -07:00
gc.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
get-tar-commit-id.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
grep.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
hash-object.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
help.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
hook.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
index-pack.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
init-db.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
interpret-trailers.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
log.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
ls-files.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
ls-remote.c	git-compat-util.h: remove unneccessary include of wildmatch.h	2023-06-21 13:39:54 -07:00
ls-tree.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
mailinfo.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
mailsplit.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
merge-base.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
merge-file.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
merge-index.c	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
merge-ours.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
merge-recursive.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
merge-tree.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
merge.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
mktag.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
mktree.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
multi-pack-index.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
mv.c	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
name-rev.c	git-compat-util.h: remove unneccessary include of wildmatch.h	2023-06-21 13:39:54 -07:00
notes.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
pack-objects.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
pack-redundant.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
pack-refs.c	pack-refs: teach pack-refs --include option	2023-05-12 14:54:14 -07:00
patch-id.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
prune-packed.c	treewide: be explicit about dependence on gettext.h	2023-03-21 10:56:51 -07:00
prune.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
pull.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
push.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
range-diff.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
read-tree.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
rebase.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
receive-pack.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
reflog.c	git-compat-util.h: remove unneccessary include of wildmatch.h	2023-06-21 13:39:54 -07:00
remote-ext.c	builtins: annotate always-empty prefix parameters	2023-03-28 14:11:24 -07:00
remote-fd.c	builtins: annotate always-empty prefix parameters	2023-03-28 14:11:24 -07:00
remote.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
repack.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
replace.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
rerere.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
reset.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
rev-list.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
rev-parse.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
revert.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
rm.c	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
send-pack.c	Merge branch 'en/header-split-cleanup'	2023-04-06 13:38:31 -07:00
shortlog.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
show-branch.c	git-compat-util.h: remove unneccessary include of wildmatch.h	2023-06-21 13:39:54 -07:00
show-index.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
show-ref.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
sparse-checkout.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
stash.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
stripspace.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
submodule--helper.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
symbolic-ref.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
tag.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
unpack-file.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
unpack-objects.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
update-index.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
update-ref.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
update-server-info.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
upload-archive.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
upload-pack.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
var.c	Merge branch 'bc/more-git-var'	2023-07-04 16:08:18 -07:00
verify-commit.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
verify-pack.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
verify-tag.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
worktree.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
write-tree.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00