aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano1-2/+0
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov1-1/+0
2013-12-27Merge branch 'tg/diff-no-index-refactor'Junio C Hamano1-1/+1
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano1-0/+2
2013-12-12diff: move no-index detection to builtin/diff.cThomas Gummerer1-1/+1
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger1-0/+2
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier1-1/+1
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano1-2/+6
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-2/+1
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano1-2/+0
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano1-0/+2
2013-07-17diff: preparse --diff-filter string argumentJunio C Hamano1-1/+4
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy1-2/+0
2013-07-15move struct pathspec and related functions to pathspec.[ch]Nguyễn Thái Ngọc Duy1-0/+1
2013-05-10diff_opt: track whether flags have been set explicitlyJunio C Hamano1-2/+6
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano1-0/+2
2013-02-12diff: add diff_line_prefix functionJohn Keeping1-0/+3
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik1-0/+2
2012-10-29Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy1-0/+1
2012-09-15diff.c: mark a private file-scope symbol as staticJunio C Hamano1-1/+0
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano1-0/+5
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-1/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-1/+1
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-0/+5
2012-05-02Merge branch 'lp/diffstat-with-graph'Junio C Hamano1-0/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano1-1/+1
2012-04-16Add output_prefix_length to diff_optionsLucian Poston1-0/+1
2012-04-15Merge branch 'jc/diff-algo-cleanup'Junio C Hamano1-0/+2
2012-03-23teach diffcore-rename to optionally ignore empty contentJeff King1-1/+1
2012-03-07Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano1-0/+1
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano1-0/+1
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek1-0/+1
2012-02-28pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano1-0/+1
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano1-0/+2
2012-02-03Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy1-0/+3
2011-12-17pass struct commit to diff_tree_combined_merge()René Scharfe1-1/+2
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-1/+2
2011-10-10diff: add option to show whole functions as contextRené Scharfe1-0/+1
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-2/+3
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-2/+3
2011-06-29Merge branch 'mg/diff-stat-count'Junio C Hamano1-0/+1
2011-06-06Merge branch 'jk/diff-not-so-quick'Junio C Hamano1-0/+2
2011-05-31diff: futureproof "stop feeding the backend early" logicJunio C Hamano1-0/+2
2011-05-27diff: introduce --stat-lines to limit the stat linesMichael J Gruber1-0/+1
2011-05-13Merge branch 'jh/dirstat-lines'Junio C Hamano1-1/+2
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano1-4/+1
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland1-0/+1
2011-04-29Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland1-1/+1
2011-04-28Merge branch 'jc/diff-irreversible-delete'Junio C Hamano1-0/+1
2011-04-23diff: remove often unused parameters from diff_unmerge()Junio C Hamano1-4/+1
2011-04-23diff.c: return filepair from diff_unmerge()Junio C Hamano1-1/+1
2011-04-02git diff -D: omit the preimage of deletesJunio C Hamano1-0/+1
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano1-0/+2
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano1-1/+2
2011-02-21add inexact rename detection progress infrastructureJeff King1-0/+1
2011-02-21merge: improve inexact rename limit warningJeff King1-1/+1
2011-02-03Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy1-3/+1
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano1-0/+2
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard1-0/+2
2010-08-31git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano1-0/+3
2010-08-21Merge branch 'mm/shortopt-detached'Junio C Hamano1-0/+7
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano1-0/+3
2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano1-0/+3
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann1-0/+1
2010-08-06diff: parse separate options like -S fooMatthieu Moy1-0/+7
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano1-0/+9
2010-06-21Merge branch 'gv/portable'Junio C Hamano1-1/+1
2010-06-11textconv: make the API publicAxel Bonnet1-0/+8
2010-05-31Add a prefix output callback to diff outputBo Yang1-0/+5
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan1-1/+1
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast1-1/+9
2010-03-13git status: ignoring untracked files must apply to submodules tooJens Lehmann1-0/+1
2010-03-08git status: Show detailed dirty status of submodules in long formatJens Lehmann1-0/+1
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano1-0/+1
2010-01-18Performance optimization for detection of modified submodulesJens Lehmann1-4/+6
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano1-0/+1
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano1-2/+2
2009-11-28Give the hunk comment its own colorBert Wesarg1-0/+1
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin1-0/+3
2009-07-29diff: Rename QUIET internal option to QUICKJunio C Hamano1-1/+1
2009-07-29diff: change semantics of "ignore whitespace" optionsJunio C Hamano1-0/+1
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio1-0/+3
2009-02-10Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer1-0/+2
2009-01-17color-words: take an optional regular expression describing wordsJohannes Schindelin1-0/+1
2008-12-29diff: add option to show context between close hunksRené Scharfe1-0/+1
2008-10-26userdiff: require explicitly allowing textconvJeff King1-0/+1
2008-09-25Merge branch 'ho/dirstat-by-file'Shawn O. Pearce1-0/+1
2008-09-18Merge branch 'jc/diff-prefix'Junio C Hamano1-0/+2
2008-09-05diff --dirstat-by-file: count changed files, not linesHeikki Orsila1-0/+1
2008-09-03diff --cumulative is a sub-option of --dirstatJunio C Hamano1-1/+1
2008-08-30diff: vary default prefix depending on what are comparedJunio C Hamano1-0/+2
2008-07-16Fix buffer overflow in git diffDmitry Potapov1-5/+4
2008-05-26Merge branch 'jc/diff-no-no-index'Junio C Hamano1-4/+2
2008-05-25Merge branch 'js/config-cb'Junio C Hamano1-2/+2
2008-05-24"git diff": do not ignore index without --no-indexJunio C Hamano1-4/+2
2008-05-15diff options: Introduce --ignore-submodulesJohannes Schindelin1-0/+1
2008-05-14Merge branch 'jk/renamelimit' (early part)Junio C Hamano1-0/+1
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin1-2/+2
2008-05-03diff: make "too many files" rename warning optionalJeff King1-0/+1
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins1-1/+0
2008-03-14Write diff output to a file in struct diff_optionsDaniel Barkalow1-0/+3
2008-02-27Merge branch 'jc/diff-relative'Junio C Hamano1-0/+3
2008-02-24Merge branch 'lt/dirstat'Junio C Hamano1-0/+3
2008-02-18Add color.ui variable which globally enables colorization if setMatthias Kestenholz1-0/+1
2008-02-13diff --relative: output paths as relative to the current subdirectoryJunio C Hamano1-0/+3
2008-02-12Add "--dirstat" for some directory statisticsLinus Torvalds1-0/+3
2008-01-04add a "basic" diff config callbackJeff King1-0/+1
2007-12-20Teach diff machinery to display other prefixes than "a/" and "b/"Johannes Schindelin1-0/+1
2007-12-13diff --check: minor fixupsJunio C Hamano1-0/+2
2007-12-13"diff --check" should affect exit statusWincent Colaiuta1-0/+1
2007-11-18Merge branch 'ph/diffopts'Junio C Hamano1-16/+24
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit1-16/+24
2007-11-10git-add: make the entry stat-clean after re-adding the same contentsJunio C Hamano1-0/+2
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano1-1/+3
2007-08-14diff: squelch empty diffs even moreRené Scharfe1-0/+1
2007-08-14git-diff: squelch "empty" diffsJunio C Hamano1-0/+1
2007-06-22Finally implement "git log --follow"Linus Torvalds1-0/+1
2007-06-08Even more missing staticJunio C Hamano1-2/+0
2007-04-22Support 'diff=pgm' attributeJunio C Hamano1-0/+1
2007-03-14diff --quietJunio C Hamano1-2/+2
2007-03-14Remove unused diffcore_std_no_resolveJunio C Hamano1-2/+0
2007-03-14Allow git-diff exit with codes similar to diff(1)Alex Riesen1-1/+4
2007-02-28diff: make more cases implicit --no-indexJohannes Schindelin1-0/+2
2007-02-26diff --no-index: also imitate the exit status of diff(1)Johannes Schindelin1-0/+3
2007-02-22Teach git-diff-files the new option `--no-index`Johannes Schindelin1-0/+1
2007-02-05git-blame: no rev means start from the working tree file.Junio C Hamano1-0/+1
2007-01-06diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Junio C Hamano1-1/+3
2006-12-15make commit message a little more consistent and confortingNicolas Pitre1-0/+1
2006-11-07Merge branch 'jc/pickaxe'Junio C Hamano1-0/+1
2006-11-04git-pickaxe: rename detection optimizationJunio C Hamano1-0/+1
2006-10-26Make git-cherry handle root treesRene Scharfe1-0/+2
2006-10-13diff --numstatJunio C Hamano1-7/+9
2006-09-30Merge branch 'jc/diff-stat'Junio C Hamano1-0/+3
2006-09-27diff --stat: allow custom diffstat output width.Junio C Hamano1-0/+3
2006-09-24diff.c: second war on whitespace.Junio C Hamano1-0/+1
2006-09-07diff: support custom callbacks for outputJeff King1-0/+8
2006-08-10Add the --color-words option to the diff options familyJohannes Schindelin1-1/+2
2006-07-24Colorize 'commit' lines in log uiJeff King1-0/+11
2006-07-08diff: do not use configuration magic at the core-levelJunio C Hamano1-1/+1
2006-07-07Add -a and --text to common diff options helpStephan Feder1-1/+2
2006-07-07Teach --text option to diffStephan Feder1-0/+1
2006-07-05Merge branch 'th/diff'Junio C Hamano1-12/+16
2006-06-26Add msg_sep to diff_optionsTimo Hirvonen1-0/+1
2006-06-26Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen1-12/+15
2006-06-26add diff_flush_patch_id() to calculate the patch idJohannes Schindelin1-0/+2
2006-06-23Teach diff about -b and -w flagsJohannes Schindelin1-0/+1
2006-06-17diff options: add --colorJohannes Schindelin1-1/+2
2006-05-21fmt-patch: Support --attachJohannes Schindelin1-0/+3
2006-05-21diff family: add --check optionJohannes Schindelin1-0/+1
2006-05-15Merge branch 'se/diff'Junio C Hamano1-1/+2
2006-05-14Add "--summary" option to git diff.Sean1-1/+2
2006-05-14git diff: support "-U" and "--unified" options properlyLinus Torvalds1-0/+1
2006-05-05binary diff: further updates.Junio C Hamano1-0/+1
2006-04-29built-in diff: assorted updates.Junio C Hamano1-0/+2
2006-04-22Libified diff-index: backward compatibility fix.Junio C Hamano1-1/+1
2006-04-22Libify diff-index.Junio C Hamano1-0/+2
2006-04-22Libify diff-files.Junio C Hamano1-2/+5
2006-04-17Log message printout cleanupsLinus Torvalds1-4/+4
2006-04-15diff-options: add --patch-with-statJohannes Schindelin1-0/+3
2006-04-13diff-options: add --stat (take 2)Johannes Schindelin1-0/+2
2006-04-11Merge branch 'jc/diff' into nextJunio C Hamano1-1/+5
2006-04-11Document --patch-with-rawPetr Baudis1-0/+2
2006-04-10diff-* --patch-with-rawJunio C Hamano1-0/+1
2006-04-10tree-diff: do not assume we use only one pathspecJunio C Hamano1-1/+5
2006-04-10Retire diffcore-pathspec.Junio C Hamano1-1/+0
2006-04-04Support for pickaxe matching regular expressionsPetr Baudis1-0/+1
2006-03-29tree/diff header cleanup.Junio C Hamano1-11/+1
2006-02-10combine-diff: Record diff status a bit more faithfullyJunio C Hamano1-0/+1
2006-02-09combine-diff: move formatting logic to show_combined_diff()Junio C Hamano1-1/+2
2006-02-09diff-tree -c raw outputLinus Torvalds1-3/+3
2006-02-06combine-diff: show mode changes as well.Junio C Hamano1-1/+8
2006-02-05combine-diff: remove misguided --show-empty hack.Junio C Hamano1-2/+2
2006-01-31Make the "struct tree_desc" operations available to othersLinus Torvalds1-0/+3
2006-01-28Merge lt/revlist,jc/diff,jc/revparse,jc/abbrevJunio C Hamano1-3/+13
2006-01-28abbrev cleanup: use symbolic constantsJunio C Hamano1-3/+0
2006-01-28diff-files: -c and --cc options.Junio C Hamano1-0/+11
2006-01-28diff-tree --cc: denser combined diff output for a merge commit.Junio C Hamano1-1/+1
2006-01-28diff-tree -c: show a merge commit a bit more sensibly.Junio C Hamano1-0/+2
2005-12-19diff --abbrev: document --abbrev=<n> form.Junio C Hamano1-1/+1
2005-12-19diff: --abbrev optionJunio C Hamano1-1/+8
2005-11-21Move diff.renamelimit out of default configuration.Junio C Hamano1-0/+1
2005-11-16diff: --full-indexJunio C Hamano1-1/+3
2005-10-28Documentation changes to recursive option for git-diff-treeChris Shoemaker1-1/+0
2005-10-22Split up tree diff functions into tree-diff.c libraryLinus Torvalds1-0/+29
2005-10-04Fix diff-filter All-Or-None mark.Junio C Hamano1-1/+1
2005-09-24Diff: --name-status output format.Junio C Hamano1-0/+2
2005-09-24Diff: -l<num> to limit rename/copy detection.Junio C Hamano1-15/+15
2005-09-24Diff clean-up.Junio C Hamano1-16/+31
2005-09-22Retire diff-helper.Junio C Hamano1-9/+0
2005-07-25diff-raw: Use 'A' instead of 'N' for added files.Junio C Hamano1-1/+1
2005-07-25Use symbolic constants for diff-raw status indicators.Junio C Hamano1-0/+16
2005-07-14Split up "diff_format" into "format" and "line_termination".Linus Torvalds1-4/+2
2005-07-13[PATCH] Clean up diff option descriptions.Junio C Hamano1-0/+20
2005-07-13[PATCH] git-diff-*: --name-only and --name-only-z.Junio C Hamano1-0/+2
2005-06-12[PATCH] Add --diff-filter= output restriction to diff-* family.Junio C Hamano1-2/+6
2005-06-03[PATCH] diff: Fix docs and add -O to diff-helper.Junio C Hamano1-9/+1
2005-06-01[PATCH] diff: mode bits fixesJunio C Hamano1-0/+4
2005-05-30[PATCH] Add -O<orderfile> option to diff-* brothers.Junio C Hamano1-2/+5
2005-05-30[PATCH] Add -B flag to diff-* brothers.Junio C Hamano1-1/+4
2005-05-30[PATCH] diff: consolidate various calls into diffcore.Junio C Hamano1-0/+4