GIT-DIFF-TREE(1) Git Manual GIT-DIFF-TREE(1) (NAME) git-diff-tree - blob (SYNOPSIS) git diff-tree [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base] [] [] [...] (DESCRIPTION) (mode) blob . ( --stdin ). git diff-tree . (OPTIONS) -p, -u, --patch ( " P- (GENERATING PATCH TEXT WITH -P)"). -s, --no-patch diff. git show --patch --stat (alias) . -U, --unified= diff (context). diff.context . (-U -p ). --patch . --output= (stdout). --output-indicator-new=, --output-indicator-old=, --output-indicator-context= . + - ' ' . --raw diff (raw). --patch-with-raw -p --raw. --indent-heuristic (heuristic) diff . . --no-indent-heuristic (indent heuristic). --minimal diff . --patience diff <>. --histogram diff <>. --anchored= diff <>. . . <> . --diff-algorithm=(patience|minimal|histogram|myers) diff. : default, myers diff. . minimal diff . patience <> . histogram patience << >> . diff.algorithm --diff-algorithm=default . --stat[=[,[,]]] diffstat. . . diff.statNameWidth= . --stat-graph-width= diff.statGraphWidth= . --stat --stat-graph-width (stat graph) diff.statNameWidth diff.statGraphWidth git format-patch . ... . --stat-width= --stat-name-width= --stat-count= . --compact-summary ("new" "gone" +l) (+x -x ) diffstat. . --stat . --numstat --stat . 0 0 - . --shortstat --stat . -X [,...], --dirstat[=,...] . --dirstat . diff.dirstat ( git-config(1) ). : changes dirstat . . . . lines dirstat diff /. ( ). --dirstat changes . --*stat . files dirstat . dirstat . --dirstat . cumulative . cumulative . () noncumulative . ( ) . . : : --dirstat=files,10,cumulative. --cumulative --dirstat=cumulative. --dirstat-by-file[=,...] --dirstat=files,,.... --summary / (mode). --patch-with-stat -p --stat. -z --raw --numstat --name-only --name-status NUL . <<>> core.quotePath (quote) ( git-config(1) ). --name-only (post-image). UTF-8 . git-log(1) . --name-status ( ) . --diff-filter . --name-only UTF-8 . --submodule[=] (submodules). --submodule=short short . . --submodule --submodule=log log . git-submodule(1) summary . --submodule=diff diff . diff . diff.submodule short . --color[=] diff . --color ( =) --color=always . always never auto . color.ui color.diff . --no-color diff. . --color=never . --color-moved[=] . diff.colorMoved . no zebra . : no . default zebra . . plain [-removed-] {added}. . blocks - . color.diff.(old|new)Moved . . zebra blocks . color.diff.(old|new)Moved color.diff.(old|new)MovedAlternative . . dimmed-zebra zebra (dim) . . dimmed_zebra . --no-color-moved . . --color-moved=no . --color-moved-ws=,... --color-moved . diff.colorMovedWS . : no . ignore-space-at-eol (EOL). ignore-space-change . . ignore-all-space . . allow-indentation-change . . --no-color-moved-ws . . --color-moved-ws=no . --word-diff[=] --word-diff-regex . plain : color . --color . plain [-removed-] {added}. . porcelain . // diff (unified diff) +/-/` ` . (newlines) ~ . none (word diff). . --word-diff diff (hunk) . diff word-diff . . --diff-algorithm . --word-diff-regex= . --word-diff . . (!). |[^[:space:]] . (newline) (!) . --word-diff-regex=. . (regex) diff gitattributes(5) git- config(1) . diff . diff . --color-words[=] --word-diff=color ( ) --word-diff-regex=. --no-renames . --rename-empty, --no-rename-empty blob . --check . core.whitespace . ( ) . . --exit-code . --ws-error-highlight= context old new diff. none default new all old,new,context . diff.wsErrorHighlight new . color.diff.whitespace . --full-index (patch) blob pre-image post-image "index" . --binary --full-index diff git-apply . --patch . --abbrev[=] diff-raw diff-tree . diff-patch --full-index --full-index blob --abbrev . --abbrev= . -B[][/], --break-rewrites[=[][/]] . : (context) -B ( ). -B/70% ( ). -M ( -M ) -B ( ). -B20% . -M[], --find-renames[=] . ( / ). -M90% / . % -M5 -M50% . -M05 -M5% . -M100% . . -C[], --find-copies[=] . --find-copies-harder. -M . --find-copies-harder -C changeset . . . -C . -D, --irreversible-delete preimage diff preimage /dev/null . patch git apply . ( ) . -B preimage / . -l -M -C / . ( ). N O(N^2) . / / . diff.renameLimit . 0 . --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]] (A) (C) (D) (M) (R) ( ...) (T) (U) (X) (B). ( ) . * ( ) . --diff-filter=ad . diff . . -S ( /). . ( struct) : preimage -S . . -G / . -S --pickaxe-regex -G diff : + return frotz(nitfol, two->ptr, 1, 0); ... - hit = frotz(nitfol, mf2.ptr, 1, 0); git log -G"frotz\(nitfol" git log -S"frotz\(nitfol" --pickaxe-regex ( ). --text textconv . pickaxe gitdiffcore(7) . --find-object= . -S . blob . -t git-log (trees) . --pickaxe-all -S -G changeset . --pickaxe-regex -S POSIX . -O . diff.orderFile (override) ( git-config(1) ). diff.orderFile -O/dev/null . glob . ( ) . . ( ) . : o . o ("#") () . ("\") . o . fnmatch(3) FNM_PATHNAME . "foo*bar" "fooasdfbar" "foo/bar/baz/asdf" "foobarx" . --skip-to=, --rotate-to= ( skip to) ( rotate to). git difftool . -R (swap) index . --relative[=], --no-relative . ( bare) . --no-relative diff.relative --relative . -a, --text . --ignore-cr-at-eol (carriage-return) . --ignore-space-at-eol (EOL) . -b, --ignore-space-change . . -w, --ignore-all-space . . --ignore-blank-lines . -I, --ignore-matching-lines= . . --inter-hunk-context= (context) (hunks) diff . diff.interHunkContext 0 . -W, --function-context (context) . git diff ( " (Defining a custom hunk-header)" gitattributes(5) ). --exit-code diff(1) . 1 0 . --quiet . --exit-code . diff diff.trustExitCode diff..trustExitCode GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE false . --ext-diff diff . diff gitattributes(5) git-log(1) . --no-ext-diff diff . --textconv, --no-textconv ( ) . gitattributes(5) . textconv diff (apply) . textconv git-diff(1) git- log(1) git- format-patch(1) (plumbing) diff . --ignore-submodules[=(none|untracked|dirty|all)] diff . all . none HEAD (superproject) (modified) ignore git-config(1) gitmodules(5) . untracked (dirty) ( ). dirty ( 1.7.0 ). all . --src-prefix= "a/" . --dst-prefix= "b/" . --no-prefix . --default-prefix ("a/" "b/") . diff.noprefix, diff.srcPrefix, diff.dstPrefix diff.mnemonicPrefix ( git-config(1) ). --line-prefix= . --ita-invisible-in-index git add -N git diff git diff --cached . git diff git diff --cached . --ita-visible-in-index . . --max-depth= (pathspec) . -1 . (wildcards) pathspec . foo/bar/baz : o --max-depth=0 -- foo: foo o --max-depth=1 -- foo: foo/bar o --max-depth=1 -- foo/bar: foo/bar/baz o --max-depth=1 -- foo foo/bar: foo/bar/baz o --max-depth=2 -- foo: foo/bar/baz (pathspec) . --max-depth=0 foo . . diff (tree objects) . gitdiffcore(7) . (tree object). ... . -r . -t . -r . --root --root . (NULL tree) . --merge-base (merge base) <<>> . . --stdin --stdin . . ( ). . . . ( ) . ( ) . ( ) . -m git diff-tree --stdin . . -c . -s git diff-tree --stdin ( -p) ( -p) . . -v . -v git diff-tree --stdin . --pretty[=], --format= oneline, short, medium, full, fuller, reference, email, raw, format: tformat: . % --pretty=tformat: . <> . = medium . ( git-config(1) ). --abbrev-commit . --abbrev= ( diff ) . --pretty=oneline . --no-abbrev-commit . --abbrev-commit --oneline . log.abbrevCommit . --oneline --pretty=oneline --abbrev-commit . --encoding= encoding . (non- plumbing) UTF-8 . X X . iconv(3) . --expand-tabs=, --expand-tabs, --no-expand-tabs ( ). --expand-tabs --expand-tabs=8, --no-expand-tabs --expand-tabs=0 . ( medium full, fuller) . --notes[=] ( git-notes(1) ) . git log, git show git whatchanged --pretty, --format, --oneline . core.notesRef notes.displayRef ( ) . git-config(1) . , . refs/notes/ notes/ refs/ refs/notes/ . --notes . : "--notes=foo" refs/notes/foo "--notes=foo --notes" "refs/notes/foo" () . --no-notes . --notes . "--notes --notes=foo --no-notes --notes=bar" refs/notes/bar . --show-notes-by-default . --show-notes[=], --standard-notes, --no-standard-notes . --notes/--no-notes . --show-signature gpg --verify . --no-commit-id git diff-tree . . -c ( --stdin ). ( -m ). . --cc -c. -c -p (hunks) . << >>. --combined-all-paths ( ) . -c --cc ( ). --always . (PRETTY FORMATS) oneline email raw Author: . "Merge: " . ( ) . pretty. format: ( git-config(1) ). : oneline . short commit Author: medium commit Author: Date: full commit Author: Commit: fuller commit Author: AuthorDate: Commit: CommitDate: reference (, ) --pretty='format:%C(auto)%h (%s, %ad)' . --date=short --date . format: --decorate --walk-reflogs . email From From: Date: Subject: [PATCH] mboxrd email "From " ( ">" ) ">" . raw raw . --abbrev --no-abbrev parents (grafts) . diff ( git log --raw) . diff --no-abbrev . format: format: . printf %n \n . format:"The author of %h was %an, %ar%nThe title was >>%s<<%n" : The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing -p for traditional diff input.<< (placeholders) : o (literal) : %n (newline) %% % %x00 %x ( << >> ). o : %Cred %Cgreen %Cblue %Creset %C() Values "CONFIGURATION FILE" git-config(1). ( color.diff, color.ui, --color, auto ). %C(auto,) ( %C(auto,red)). %C(always,) ( --color=always ). auto ( %C(auto)) . %m (<) (>) (-) %w([[,[,]]]) (line wrapping) -w git-shortlog(1). %<([,(trunc|ltrunc|mtrunc)]) N . (..) (ltrunc) ..ft, (mtrunc) mi..le, (trunc) rig.. . : >= 2 . : ( ) . : . : (padding) . %<|( ) - . . %>(), %>|() %<() %<|() . %>>(), %>>|() %>() %>|() . %><(), %><|() %<() %<|() ( ). o : %H %h %T %t %P %p %an %aN ( .mailmap git-shortlog(1) git-blame(1) ) %ae %aE ( .mailmap git-shortlog(1) git-blame(1) ) %al ( @) %aL ( %al ) .mailmap ( git-shortlog(1) git-blame(1) ) %ad ( --date= ) %aD RFC2822 %ar %at UNIX %ai ISO 8601 %aI ISO 8601 %as (YYYY-MM-DD) %ah ( --date=human git-rev-list(1)) %cn () %cN ( .mailmap git-shortlog(1) git-blame(1) ) %ce %cE ( .mailmap git-shortlog(1) git-blame(1) ) %cl ( @) %cL ( %cl ) .mailmap ( git-shortlog(1) git-blame(1) ) %cd ( --date= ) %cD RFC2822 %cr %ct UNIX %ci ISO 8601 %cI ISO 8601 %cs (YYYY-MM-DD) %ch ( --date=human git-rev-list(1)) %d --decorate git-log(1) %D " (" ")". %(count) . --commit-list-format format-patch . %(total) . --commit-list-format format-patch . %(decorate[: