Home Explore Blog CI



git

2nd chunk of `Documentation/config/advice.adoc`
ae3418c5a78a1f018a90bbca129f59ab141af3f210d56d6100000001000008c8
 to tell the user how to
		set their identity configuration.
	mergeConflict::
		Shown when various commands stop because of conflicts.
	nestedTag::
		Shown when a user attempts to recursively tag a tag object.
	pushAlreadyExists::
		Shown when linkgit:git-push[1] rejects an update that
		does not qualify for fast-forwarding (e.g., a tag.)
	pushFetchFirst::
		Shown when linkgit:git-push[1] rejects an update that
		tries to overwrite a remote ref that points at an
		object we do not have.
	pushNeedsForce::
		Shown when linkgit:git-push[1] rejects an update that
		tries to overwrite a remote ref that points at an
		object that is not a commit-ish, or make the remote
		ref point at an object that is not a commit-ish.
	pushNonFFCurrent::
		Shown when linkgit:git-push[1] fails due to a
		non-fast-forward update to the current branch.
	pushNonFFMatching::
		Shown when the user ran linkgit:git-push[1] and pushed
		"matching refs" explicitly (i.e. used `:`, or
		specified a refspec that isn't the current branch) and
		it resulted in a non-fast-forward error.
	pushRefNeedsUpdate::
		Shown when linkgit:git-push[1] rejects a forced update of
		a branch when its remote-tracking ref has updates that we
		do not have locally.
	pushUnqualifiedRefname::
		Shown when linkgit:git-push[1] gives up trying to
		guess based on the source and destination refs what
		remote ref namespace the source belongs in, but where
		we can still suggest that the user push to either
		`refs/heads/*` or `refs/tags/*` based on the type of the
		source object.
	pushUpdateRejected::
		Set this variable to `false` if you want to disable
		`pushNonFFCurrent`, `pushNonFFMatching`, `pushAlreadyExists`,
		`pushFetchFirst`, `pushNeedsForce`, and `pushRefNeedsUpdate`
		simultaneously.
	rebaseTodoError::
		Shown when there is an error after editing the rebase todo list.
	refSyntax::
		Shown when the user provides an illegal ref name, to
		tell the user about the ref syntax documentation.
	resetNoRefresh::
		Shown when linkgit:git-reset[1] takes more than 2
		seconds to refresh the index after reset, to tell the user
		that they can use the `--no-refresh` option.
	resolveConflict::
		Shown by various commands when conflicts
		prevent the operation from being

Title: Git Advice Variables for Push and Conflict Resolution
Summary
Git provides additional advice variables to inform users about potential issues during push operations, such as non-fast-forward updates, rejected updates, and refname errors, as well as variables to aid in conflict resolution, including merge conflicts, rebase errors, and ref syntax issues.