summaryrefslogtreecommitdiff
path: root/builtin/diff.c
Commit message (Expand)AuthorAgeFilesLines
* lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-271-5/+53
|\
| * diff: avoid some nestingtg/diff-no-index-refactorThomas Gummerer2013-12-161-18/+17
| * diff: don't read index when --no-index is givenThomas Gummerer2013-12-121-2/+5
| * diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-121-3/+49
* | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-061-10/+7
|\ \ | |/ |/|
| * diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-201-10/+7
* | diff: trivial style fixFelipe Contreras2013-10-311-1/+1
|/
* pathspec: support :(literal) syntax for noglob pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
* convert read_cache_preload() to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-2/+2
* guard against new pathspec magic in pathspec matching codeNguyễn Thái Ngọc Duy2013-07-151-0/+2
* cmd_diff(): make it obvious which cases are exclusive of each otherMichael Haggerty2013-05-281-5/+4
* cmd_diff(): rename local variable "list" -> "entry"Michael Haggerty2013-05-281-4/+4
* cmd_diff(): use an object_array for holding treesMichael Haggerty2013-05-281-19/+18
* builtin_diff_tree(): make it obvious that function wants two entriesMichael Haggerty2013-05-281-9/+10
* Merge branch 'kb/preload-index-more'Junio C Hamano2012-11-201-4/+8
|\
| * update-index/diff-index: use core.preloadindex to improve performanceKarsten Blees2012-11-021-4/+8
| * Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-2/+1
| |\
| * \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-2/+6
| |\ \
* | | | Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-291-16/+0
* | | | Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-271-2/+6
|\ \ \ \ | | |/ / | |/| |
| * | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-2/+6
* | | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-2/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
| |/
* | fix pager.diff with diff --no-indexJeff King2012-06-151-7/+17
* | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-231-1/+1
* | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-1/+2
* | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-0/+3
|/
* use struct sha1_array in diff_tree_combined()René Scharfe2011-12-171-6/+6
* cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-061-1/+1
* want_color: automatically fallback to color.uiJeff King2011-08-191-3/+0
* plug a few coverity-spotted leaksJim Meyering2011-06-201-0/+1
* Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-281-3/+1
|\
| * builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-221-3/+1
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-9/+9
|\ \
| * | i18n: git-diff basic messagesÆvar Arnfjörð Bjarmason2011-03-091-9/+9
* | | Merge branch 'jc/index-update-if-able'Junio C Hamano2011-03-261-6/+1
|\ \ \ | |_|/ |/| |
| * | diff/status: refactor opportunistic index updateJunio C Hamano2011-03-211-6/+1
* | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-02-271-10/+6
|\ \ \ | |_|/ |/| |
| * | struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy2011-02-031-8/+4
| * | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-2/+2
* | | diff: support --cached on unborn branchesNguyễn Thái Ngọc Duy2011-02-071-2/+5
|/ /
* | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-051-1/+1
|/
* Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-091-0/+2
* Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-161-13/+0
* Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-151-8/+23
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+425
View Lorry Controller Status