summaryrefslogtreecommitdiff
path: root/builtin/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-4/+4
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-4/+4
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-3/+3
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-1/+1
* | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-4/+3
|\ \ | |/ |/|
| * treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-4/+3
* | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-071-0/+3
|\ \ | |/ |/|
| * builtin/: add UNLEAKsma/builtin-unleakMartin Ågren2017-10-021-0/+3
* | submodule: remove gitmodules_configBrandon Williams2017-08-031-2/+0
|/
* Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-4/+4
|\ \
| * | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-1/+1
| * | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-021-1/+1
| * | diff: convert fill_filespec to struct object_idBrandon Williams2017-06-021-2/+2
* | | Merge branch 'jk/diff-blob'Junio C Hamano2017-06-021-31/+29
|\ \ \ | |/ / |/| |
| * | diff: use blob path for blob/file diffsJeff King2017-05-241-1/+2
| * | diff: use pending "path" if it is availableJeff King2017-05-241-1/+6
| * | diff: use the word "path" instead of "name" for blobsJeff King2017-05-241-7/+7
| * | diff: pass whole pending entry in blobinfoJeff King2017-05-241-23/+15
| |/
* | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-081-1/+1
* | Convert lookup_tree to struct object_idbrian m. carlson2017-05-081-1/+1
* | Clean up outstanding object_id transforms.brian m. carlson2017-05-021-1/+1
|/
* Rename sha1_array to oid_arraybrian m. carlson2017-03-311-3/+3
* Make sha1_array_append take a struct object_id *brian m. carlson2017-03-311-1/+1
* builtin/diff: convert to struct object_idbrian m. carlson2017-03-261-17/+17
* use SWAP macroRené Scharfe2017-01-301-6/+3
* Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-211-13/+14
|\
| * diff: always try to set up the repositoryJeff King2016-09-131-2/+2
| * diff: skip implicit no-index check when given --no-indexJeff King2016-09-131-12/+13
| * Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-061-0/+1
| |\
* | \ Merge branch 'ar/diff-args-osx-precompose'Junio C Hamano2016-05-231-0/+1
|\ \ \ | | |/ | |/|
| * | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-131-0/+1
* | | diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-251-0/+1
| |/ |/|
* | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-031-1/+1
|\ \
| * | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-211-1/+1
| |/
* | Remove get_object_hash.brian m. carlson2015-11-201-6/+6
* | Add several uses of get_object_hash.brian m. carlson2015-11-201-6/+6
|/
* 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
View Lorry Controller Status