git_diff

Git diff checks for git conflicts markers in files

git_diff documentation

• Version in MegaLinter: 2.38.5
• Visit Official Web Site

Configuration in MegaLinter

• Enable git_diff by adding REPOSITORY_GIT_DIFF in ENABLE_LINTERS variable
• Disable git_diff by adding REPOSITORY_GIT_DIFF in DISABLE_LINTERS variable

MegaLinter Flavours

This linter is available in the following flavours

	Flavor	Description	Embedded linters	Info
	all	Default MegaLinter Flavor	113
	ci_light	Optimized for CI items (Dockerfile, Jenkinsfile, JSON/YAML schemas,XML	19
	cupcake	MegaLinter for the most commonly used languages	81
	documentation	MegaLinter for documentation projects	47
	dotnet	Optimized for C, C++, C# or VB based projects	59
	go	Optimized for GO based projects	49
	java	Optimized for JAVA based projects	51
	javascript	Optimized for JAVASCRIPT or TYPESCRIPT based projects	56
	php	Optimized for PHP based projects	50
	python	Optimized for PYTHON based projects	58
	ruby	Optimized for RUBY based projects	47
	rust	Optimized for RUST based projects	47
	salesforce	Optimized for Salesforce based projects	50
	swift	Optimized for SWIFT based projects	47
	terraform	Optimized for TERRAFORM based projects	51

Behind the scenes

How are identified applicable files

• If this linter is active, all files will always be linted

How the linting is performed

git_diff is called once on the whole project directory (project CLI lint mode)

• filtering can not be done using MegaLinter configuration variables,it must be done using git_diff configuration or ignore file (if existing)
• VALIDATE_ALL_CODEBASE: false doesn't make git_diff analyze only updated files

Example calls

git diff --check

Help content

usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           [--super-prefix=<path>] [--config-env=<name>=<envvar>]
           <command> [<args>]

These are common Git commands used in various situations:

start a working area (see also: git help tutorial)
   clone     Clone a repository into a new directory
   init      Create an empty Git repository or reinitialize an existing one

work on the current change (see also: git help everyday)
   add       Add file contents to the index
   mv        Move or rename a file, a directory, or a symlink
   restore   Restore working tree files
   rm        Remove files from the working tree and from the index

examine the history and state (see also: git help revisions)
   bisect    Use binary search to find the commit that introduced a bug
   diff      Show changes between commits, commit and working tree, etc
   grep      Print lines matching a pattern
   log       Show commit logs
   show      Show various types of objects
   status    Show the working tree status

grow, mark and tweak your common history
   branch    List, create, or delete branches
   commit    Record changes to the repository
   merge     Join two or more development histories together
   rebase    Reapply commits on top of another base tip
   reset     Reset current HEAD to the specified state
   switch    Switch branches
   tag       Create, list, delete or verify a tag object signed with GPG

collaborate (see also: git help workflows)
   fetch     Download objects and refs from another repository
   pull      Fetch from and integrate with another repository or a local branch
   push      Update remote refs along with associated objects

'git help -a' and 'git help -g' list available subcommands and some
concept guides. See 'git help <command>' or 'git help <concept>'
to read about a specific subcommand or concept.
See 'git help git' for an overview of the system.

Installation on mega-linter Docker image

None