summaryrefslogtreecommitdiff
path: root/diff-lib.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-041-8/+8
| * | | revision: introduce setup_revision_optJunio C Hamano2010-03-091-1/+4
| |/ /
| * | Merge branch 'jl/diff-submodule-ignore'Junio C Hamano2010-01-261-5/+7
| |\ \
| | * | git diff: Don't test submodule dirtiness with --ignore-submodulesJens Lehmann2010-01-241-4/+6
| | * | Make ce_uptodate() trustworthy againJunio C Hamano2010-01-241-1/+1
| * | | Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-241-18/+1
| |\ \ \ | | |/ / | |/| |
| | * | unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-071-0/+1
| | * | unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-071-18/+0
| * | | Performance optimization for detection of modified submodulesJens Lehmann2010-01-181-15/+31
| * | | Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-161-2/+6
| * | | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-2/+3
| |\ \ \
| | * | | Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy2009-08-231-2/+3
| * | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano2009-12-261-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | diff-lib.c: fix misleading comments on oneway_diff()Junio C Hamano2009-10-111-1/+1
| * | | | Merge branch 'jc/shortstatus'Junio C Hamano2009-08-281-20/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | diff-index: keep the original index intactJunio C Hamano2009-08-051-18/+0
| | * | | diff-index: report unmerged new entriesJunio C Hamano2009-08-051-2/+2
| * | | | Prevent diff machinery from examining assume-unchanged entries on worktreeNguyễn Thái Ngọc Duy2009-08-111-2/+4
| |/ / /
* | | | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-311-3/+1
| |_|/ |/| |
* | | diff --quiet: disable optimization when --diff-filter=X is usedJunio C Hamano2011-03-161-1/+2
| |/ |/|
* | diff: Rename QUIET internal option to QUICKJunio C Hamano2009-07-291-2/+2
|/
View Lorry Controller Status