summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2011-04-23diff: remove often unused parameters from diff_unmerge()Libravatar Junio C Hamano1-4/+1
2011-04-23diff.c: return filepair from diff_unmerge()Libravatar Junio C Hamano1-5/+8
2010-09-09Merge branch 'maint'Libravatar Junio C Hamano1-1/+4
2010-09-09diff.c: call regfree to free memory allocated by regcomp when necessaryLibravatar Brandon Casey1-1/+4
2010-08-31Merge branch 'cb/binary-patch-id'Libravatar Junio C Hamano1-0/+7
2010-08-21Merge branch 'mm/shortopt-detached'Libravatar Junio C Hamano1-43/+124
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Libravatar Junio C Hamano1-14/+13
2010-08-18Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano1-7/+34
2010-08-16hash binary sha1 into patch idLibravatar Clemens Buchacher1-0/+7
2010-08-13diff --follow: do call diffcore_std() as necessaryLibravatar Junio C Hamano1-14/+13
2010-08-11diff: strip extra "/" when stripping prefixLibravatar Jakub Narebski1-2/+8
2010-08-09Add the 'diff.ignoreSubmodules' config settingLibravatar Johannes Schindelin1-1/+5
2010-08-09Submodules: Add the new "ignore" config option for diff and statusLibravatar Jens Lehmann1-6/+29
2010-08-06diff: parse separate options --stat-width n, --stat-name-width nLibravatar Matthieu Moy1-5/+23
2010-08-06diff: split off a function for --stat-* option parsingLibravatar Jonathan Nieder1-27/+35
2010-08-06diff: parse separate options like -S fooLibravatar Matthieu Moy1-16/+71
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintLibravatar Junio C Hamano1-1/+0
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringLibravatar Junio C Hamano1-1/+0
2010-07-08diff.c: fix a graph output bugLibravatar Bo Yang1-2/+1
2010-06-30Merge branch 'jl/status-ignore-submodules'Libravatar Junio C Hamano1-11/+4
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Libravatar Junio C Hamano1-1/+10
2010-06-27Merge branch 'ab/blame-textconv'Libravatar Junio C Hamano1-8/+4
2010-06-25Add the option "--ignore-submodules" to "git status"Libravatar Jens Lehmann1-11/+4
2010-06-22Merge branch 'maint'Libravatar Junio C Hamano1-1/+0
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintLibravatar Junio C Hamano1-5/+16
2010-06-21Merge branch 'bw/diff-metainfo-color' into maintLibravatar Junio C Hamano1-26/+35
2010-06-21Merge branch 'rs/diff-no-minimal' into maintLibravatar Junio C Hamano1-5/+5
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Libravatar Junio C Hamano1-5/+16
2010-06-18Merge branch 'by/diff-graph'Libravatar Junio C Hamano1-97/+312
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Libravatar Junio C Hamano1-3/+3
2010-06-18Merge branch 'ec/diff-noprefix-config'Libravatar Junio C Hamano1-1/+8
2010-06-13Merge branch 'bw/diff-metainfo-color'Libravatar Junio C Hamano1-26/+35
2010-06-13Merge branch 'rs/diff-no-minimal'Libravatar Junio C Hamano1-5/+5
2010-06-11Add optional parameters to the diff option "--ignore-submodules"Libravatar Jens Lehmann1-1/+10
2010-06-11textconv: make the API publicLibravatar Axel Bonnet1-8/+4
2010-06-06diff: fix "git show -C -C" output when renaming a binary fileLibravatar Christian Couder1-6/+17
2010-05-31Make --color-words work well with --graphLibravatar Bo Yang1-17/+104
2010-05-31Emit a whole line in one goLibravatar Bo Yang1-5/+27
2010-05-31diff.c: Output the text graph padding before each diff lineLibravatar Bo Yang1-53/+147
2010-05-31Add a prefix output callback to diff outputLibravatar Bo Yang1-27/+35
2010-05-31diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sLibravatar Johan Herland1-3/+3
2010-05-21Merge branch 'by/log-follow'Libravatar Junio C Hamano1-8/+13
2010-05-21Merge branch 'tr/word-diff'Libravatar Junio C Hamano1-19/+120
2010-05-19diff: fix coloring of extended diff headersLibravatar Bert Wesarg1-26/+35
2010-05-18diff-options: make --patch a synonym for -pLibravatar Will Palmer1-1/+1
2010-05-18diff: add configuration option for disabling diff prefixes.Libravatar Eli Collins1-1/+8
2010-05-08Merge branch 'jk/cached-textconv'Libravatar Junio C Hamano1-46/+73
2010-05-07Make diffcore_std only can run once before a diff_flushLibravatar Bo Yang1-0/+8
2010-05-07Add a macro DIFF_QUEUE_CLEAR.Libravatar Bo Yang1-8/+5
2010-05-04Merge branch 'maint-1.7.0' into maintLibravatar Junio C Hamano1-10/+5