summaryrefslogtreecommitdiff
path: root/src/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Horrible fix for #3173.Arthur Schreiber2016-02-111-4/+4
* diff: include commit message when formatting patchPatrick Steinhardt2015-12-011-1/+10
* checkout: only consider nsecs when built that wayEdward Thomson2015-11-231-46/+3
* Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto2015-11-121-3/+32
|\
| * diff: refactor complex timestamp check into its own functionAxel Rasmussen2015-10-011-5/+27
| * diff/index: respect USE_NSEC for racily clean file detectionAxel Rasmussen2015-09-181-2/+5
| * cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-181-0/+4
* | Add diff progress callback.Jason Haslam2015-11-021-2/+13
* | pool: Simplify implementationVicent Marti2015-10-281-2/+3
* | diff: ignore nsecs when diffingEdward Thomson2015-10-221-1/+3
|/
* diff: check pathspec on non-filesEdward Thomson2015-09-121-8/+17
* diff: use new iterator pathlist handlingEdward Thomson2015-08-301-14/+14
* Move filelist into the iterator handling itself.Edward Thomson2015-08-281-12/+34
* iterator: use an options struct instead of argsEdward Thomson2015-08-281-19/+25
* Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-301-0/+25
* Only write index if updated when passing GIT_DIFF_UPDATE_INDEXPierre-Olivier Latour2015-06-261-2/+4
* Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-231-2/+4
|\
| * Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-231-2/+4
* | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-221-3/+4
|/
* diff: preserve original mode in the indexEdward Thomson2015-06-201-10/+14
* Introduce `GIT_DIFF_FLAG_EXISTS`Edward Thomson2015-05-281-1/+6
* diff: prettify `maybe_modified` a littleEdward Thomson2015-05-281-12/+15
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-7/+8
* diff conflicts: don't include incorrect IDEdward Thomson2015-05-281-16/+21
* diff: for conflicts w/o workdir, blank nitem sideEdward Thomson2015-05-281-13/+26
* diff/status: introduce conflictsEdward Thomson2015-05-281-13/+64
* diff: wrap the iterator functionsEdward Thomson2015-05-281-25/+73
* checkout: break case-changes into delete/addEdward Thomson2015-05-041-0/+13
* Fixed GIT_DIFF_UPDATE_INDEX not being aware of executable bit changesPierre-Olivier Latour2015-04-151-1/+1
* Removed unnecessary conditionPierre-Olivier Latour2015-04-151-9/+6
* Use git_oid_cpy() instead of memcpy()Pierre-Olivier Latour2015-04-151-1/+1
* Avoid retaining / releasing the index more than necessary when GIT_DIFF_UPDAT...Pierre-Olivier Latour2015-03-111-2/+1
* config: borrow refcounted referencescmn/config-borrow-entryCarlos Martín Nieto2015-03-031-1/+2
* git_filter_opt_t -> git_filter_flag_tEdward Thomson2015-02-191-1/+1
* Make our overflow check look more like gcc/clang'sEdward Thomson2015-02-131-2/+3
* allocations: test for overflow of requested sizeEdward Thomson2015-02-121-0/+2
* Added missing error handling pathJacques Germishuys2014-12-301-0/+1
* Plug leaksCarlos Martín Nieto2014-11-231-2/+1
* iterator: submodules are determined by an index or treecmn/submodule-and-dirCarlos Martín Nieto2014-11-071-2/+7
* Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemi...Pierre-Olivier Latour2014-10-271-1/+1
* Merge remote-tracking branch 'origin/development' into fix-git-status-list-ne...Alan Rogers2014-06-041-44/+15
|\
| * Increase use of config snapshotsrb/coverity-fixesRussell Belfer2014-05-131-9/+10
| * Merge pull request #2328 from libgit2/rb/how-broken-can-ignores-beVicent Marti2014-05-131-35/+5
| |\
| | * Improve checks for ignore containmentrb/how-broken-can-ignores-beRussell Belfer2014-05-061-35/+5
* | | Implement GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKEDAlan Rogers2014-06-041-1/+4
* | | Don't need to duplicate this code.Alan Rogers2014-05-231-5/+1
* | | Return GIT_DELTA_UNREADABLE for a file with a mode changeAlan Rogers2014-05-221-0/+5
* | | Remove errant whitespace.Alan Rogers2014-05-211-1/+1
* | | Return GIT_FILEMODE_UNREADABLE for files that fail to stat.Alan Rogers2014-05-211-16/+15
* | | Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.Alan Rogers2014-05-201-10/+28
View Lorry Controller Status