aboutsummaryrefslogtreecommitdiff
path: root/diff-lib.c
Commit message (Expand)AuthorAge
* Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-25
|\
| * Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano2015-06-23
* | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-05-19
|\ \ | |/
| * diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-23
* | Merge branch 'bc/object-id'Junio C Hamano2015-05-05
|\ \ | |/ |/|
| * diff: convert struct combine_diff_path to object_idbrian m. carlson2015-03-13
* | run_diff_files(): clarify computation of sha1 validityJunio C Hamano2015-02-04
|/
* Merge branch 'jk/diff-files-assume-unchanged'Junio C Hamano2014-06-16
|\
| * run_diff_files: do not look at uninitialized stat dataJeff King2014-05-15
* | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-07
|\ \
| * | diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano2013-07-19
* | | Merge branch 'ks/combine-diff'Junio C Hamano2014-03-05
|\ \ \
| * | | combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-24
| | |/ | |/|
* | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-24
|/ /
* | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-09
|\ \
| * | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-15
| * | parse_pathspec: add special flag for max_depth featureNguyễn Thái Ngọc Duy2013-07-15
* | | Merge branch 'jc/diff-filter-negation'Junio C Hamano2013-09-09
|\ \ \ | |/ / |/| / | |/
| * diff: deprecate -q option to diff-filesJunio C Hamano2013-07-19
* | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-02
* | diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe2013-06-02
|/
* diff: do not use null sha1 as a sentinel valueJeff King2012-07-29
* diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2012-01-16
* Merge branch 'cn/eradicate-working-copy'Junio C Hamano2011-10-05
|\
| * Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-21
* | Merge branch 'jc/diff-index-unpack'Junio C Hamano2011-10-05
|\ \ | |/ |/|
| * diff-index: pass pathspec down to unpack-trees machineryJunio C Hamano2011-08-29
* | Merge branch 'jc/diff-index-refactor'Junio C Hamano2011-08-08
|\ \
| * | diff-lib: refactor run_diff_index() and do_diff_cache()Junio C Hamano2011-07-13
| * | diff-lib: simplify do_diff_cache()Junio C Hamano2011-07-13
* | | Merge branch 'jc/maint-reset-unmerged-path'Junio C Hamano2011-08-01
|\ \ \ | |/ /
| * | reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano2011-07-13
| |/
| * Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-06
| |\
| * \ Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-06
| |\ \
* | | | diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-31
* | | | Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-earlyJunio C Hamano2011-05-31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-13
| |\ \ \ | | |/ / | |/| / | | |/
| | * diff-files: show unmerged entries correctlyJunio C Hamano2011-04-23
| | * diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-23
| * | Merge branch 'jc/maint-diff-q-filter'Junio C Hamano2011-03-23
| |\ \
| * | | Convert ce_path_match() to use struct pathspecNguyễn Thái Ngọc Duy2011-02-03
| * | | struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy2011-02-03
| * | | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-03
| | |/ | |/|
| * | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-09
| * | Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-11
| * | Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-24
| |\ \
| | * | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-13
| | * | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-12
| | * | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-12
| | * | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-08