summaryrefslogtreecommitdiff
path: root/diff-lib.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-251-12/+0
|\
| * Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-231-12/+0
* | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-05-191-0/+12
|\ \ | |/
| * diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-231-0/+12
* | Merge branch 'bc/object-id'Junio C Hamano2015-05-051-5/+5
|\ \ | |/ |/|
| * diff: convert struct combine_diff_path to object_idbrian m. carlson2015-03-131-5/+5
* | run_diff_files(): clarify computation of sha1 validityjc/diff-files-itaJunio C Hamano2015-02-041-2/+6
|/
* Merge branch 'jk/diff-files-assume-unchanged'Junio C Hamano2014-06-161-12/+21
|\
| * run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchangedJeff King2014-05-151-12/+21
* | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-071-3/+0
|\ \
| * | diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletionJunio C Hamano2013-07-191-3/+0
* | | Merge branch 'ks/combine-diff'Junio C Hamano2014-03-051-2/+0
|\ \ \
| * | | combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-241-2/+0
| | |/ | |/|
* | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-241-2/+3
|/ /
* | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-2/+1
|\ \
| * | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-151-1/+1
| * | parse_pathspec: add special flag for max_depth featureNguyễn Thái Ngọc Duy2013-07-151-1/+0
* | | Merge branch 'jc/diff-filter-negation'Junio C Hamano2013-09-091-5/+3
|\ \ \ | |/ / |/| / | |/
| * diff: deprecate -q option to diff-filesjc/diff-filter-negationJunio C Hamano2013-07-191-5/+3
* | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-021-1/+2
* | diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe2013-06-021-11/+12
|/
* diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-8/+12
* diff-index: enable recursive pathspec matching in unpack_treesnd/pathspec-recursion-cleanupNguyen Thai Ngoc Duy2012-01-161-0/+2
* Merge branch 'cn/eradicate-working-copy'Junio C Hamano2011-10-051-1/+1
|\
| * Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-211-1/+1
* | Merge branch 'jc/diff-index-unpack'Junio C Hamano2011-10-051-0/+1
|\ \ | |/ |/|
| * diff-index: pass pathspec down to unpack-trees machineryJunio C Hamano2011-08-291-0/+1
* | Merge branch 'jc/diff-index-refactor'Junio C Hamano2011-08-081-52/+19
|\ \
| * | diff-lib: refactor run_diff_index() and do_diff_cache()Junio C Hamano2011-07-131-28/+19
| * | diff-lib: simplify do_diff_cache()Junio C Hamano2011-07-131-25/+1
* | | Merge branch 'jc/maint-reset-unmerged-path'Junio C Hamano2011-08-011-1/+2
|\ \ \ | |/ /
| * | reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano2011-07-131-1/+2
| |/
| * Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-061-3/+1
| |\
| * \ Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-061-4/+11
| |\ \
* | | | diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-311-1/+6
* | | | Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-earlyJunio C Hamano2011-05-311-63/+78
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-131-4/+11
| |\ \ \ | | |/ / | |/| / | | |/
| | * diff-files: show unmerged entries correctlyJunio C Hamano2011-04-231-2/+8
| | * diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-231-3/+4
| * | Merge branch 'jc/maint-diff-q-filter'Junio C Hamano2011-03-231-1/+2
| |\ \
| * | | Convert ce_path_match() to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-2/+2
| * | | struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy2011-02-031-3/+3
| * | | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-1/+1
| | |/ | |/|
| * | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-091-5/+10
| * | Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-111-0/+1
| * | Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-241-18/+27
| |\ \
| | * | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-131-1/+1
| | * | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-121-4/+2
| | * | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-121-18/+27
| | * | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-081-2/+4